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

Merge branch 'new-world' into CAKE-116-all-button-validation-bug

Browse source 
# Conflicts:
#	lib/src/screens/send/send_page.dart
This commit is contained in:
OleksandrSobol 2020-10-09 22:45:04 +03:00
commit 8495122bcd
10 changed files with 207 additions and 183 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/di.dart
View file

@ -222,10 +222,10 @@ Future setup(
addressEditOrCreateViewModel:
getIt.get<WalletAddressEditOrCreateViewModel>(param1: item)));
// getIt.get<SendTemplateStore>()
getIt.registerFactory<SendViewModel>(() => SendViewModel(
getIt.get<AppStore>().wallet,
getIt.get<AppStore>().settingsStore,
getIt.get<SendTemplateStore>(),
getIt.get<FiatConversionStore>()));
getIt.registerFactory(
@ -318,10 +318,10 @@ Future setup(
() => NodeCreateOrEditPage(getIt.get<NodeCreateOrEditViewModel>()));
getIt.registerFactory(() => ExchangeViewModel(
wallet: getIt.get<AppStore>().wallet,
exchangeTemplateStore: getIt.get<ExchangeTemplateStore>(),
trades: tradesSource,
tradesStore: getIt.get<TradesStore>()));
getIt.get<AppStore>().wallet,
tradesSource,
getIt.get<ExchangeTemplateStore>(),
getIt.get<TradesStore>()));
getIt.registerFactory(() => ExchangeTradeViewModel(
wallet: getIt.get<AppStore>().wallet,

2
lib/main.dart
View file

@ -120,7 +120,7 @@ class App extends StatelessWidget {
settingsStore.isDarkTheme ? Brightness.light : Brightness.dark;
final authenticationStore = getIt.get<AuthenticationStore>();
final initialRoute = authenticationStore.state == AuthenticationState.denied
? Routes.welcome
? Routes.disclaimer
: Routes.login;
SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle(

62
lib/src/screens/disclaimer/disclaimer_page.dart
View file

@ -1,5 +1,6 @@
import 'dart:ui';
import 'package:cake_wallet/palette.dart';
import 'package:cake_wallet/routes.dart';
import 'package:cake_wallet/utils/show_pop_up.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
@ -19,26 +20,28 @@ class DisclaimerPage extends BasePage {
String get title => 'Terms of Use';
@override
Widget body(BuildContext context) => DisclaimerPageBody(isReadOnly: true);
Widget leading(BuildContext context) =>
isReadOnly ? super.leading(context) : null;
@override
Widget body(BuildContext context) => DisclaimerPageBody(isReadOnly: isReadOnly);
}
class DisclaimerPageBody extends StatefulWidget {
DisclaimerPageBody({this.isReadOnly = true});
DisclaimerPageBody({this.isReadOnly});
final bool isReadOnly;
@override
DisclaimerBodyState createState() => DisclaimerBodyState(false);
DisclaimerBodyState createState() => DisclaimerBodyState();
}
class DisclaimerBodyState extends State<DisclaimerPageBody> {
DisclaimerBodyState(this._isAccepted);
static const xmrtoUrl = 'https://xmr.to/terms-of-service';
static const changenowUrl = 'https://changenow.io/terms-of-use';
static const morphUrl = 'http://morphtoken.com/terms';
final bool _isAccepted;
bool _checked = false;
String _fileText = '';
@ -51,26 +54,10 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
setState(() {});
}
Future<void> _showAlertDialog(BuildContext context) async {
await showPopUp<void>(
context: context,
builder: (BuildContext context) {
return AlertWithOneAction(
alertTitle: 'Terms and conditions',
alertContent: 'By using this app, you agree to the Terms of Agreement set forth to below',
buttonText: S.of(context).ok,
buttonAction: () => Navigator.of(context).pop()
);
});
}
void _afterLayout(Duration _) => _showAlertDialog(context);
@override
void initState() {
super.initState();
getFileLines();
if (_isAccepted) WidgetsBinding.instance.addPostFrameCallback(_afterLayout);
}
@override
@ -87,8 +74,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
padding: EdgeInsets.only(left: 24.0, right: 24.0),
child: Column(
children: <Widget>[
!_isAccepted
? Row(
Row(
children: <Widget>[
Expanded(
child: Text(
@ -102,13 +88,10 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
),
)
],
)
: Offstage(),
!_isAccepted
? SizedBox(
),
SizedBox(
height: 20.0,
)
: Offstage(),
),
Row(
children: <Widget>[
Expanded(
@ -254,8 +237,7 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
],
)),
if (!widget.isReadOnly) ...[
!_isAccepted
? Row(
Row(
children: <Widget>[
Expanded(
child: Container(
@ -303,25 +285,19 @@ class DisclaimerBodyState extends State<DisclaimerPageBody> {
)),
),
],
)
: Offstage(),
!_isAccepted
? Container(
),
Container(
padding:
EdgeInsets.only(left: 24.0, right: 24.0, bottom: 24.0),
child: PrimaryButton(
onPressed: _checked ? () {} : null,
onPressed: _checked ? () =>
Navigator.of(context).popAndPushNamed(Routes.welcome)
: null,
text: 'Accept',
color: Colors.green,
textColor: Colors.white,
),
)
: Offstage(),
_isAccepted
? SizedBox(
height: 24.0,
)
: Offstage()
),
],
],
),

17
lib/src/screens/exchange/exchange_page.dart
View file

@ -307,8 +307,7 @@ class ExchangePage extends BasePage {
),
Observer(builder: (_) {
final templates = exchangeViewModel.templates;
final itemCount =
exchangeViewModel.templates.length;
final itemCount = templates.length;
return ListView.builder(
scrollDirection: Axis.horizontal,
@ -338,24 +337,22 @@ class ExchangePage extends BasePage {
alertContent: S
.of(context)
.confirm_delete_template,
leftButtonText:
S.of(context).delete,
rightButtonText:
S.of(context).delete,
leftButtonText:
S.of(context).cancel,
actionLeftButton: () {
actionRightButton: () {
Navigator.of(
dialogContext)
.pop();
exchangeViewModel
.exchangeTemplateStore
.remove(
.removeTemplate(
template:
template);
exchangeViewModel
.exchangeTemplateStore
.update();
.updateTemplate();
},
actionRightButton: () =>
actionLeftButton: () =>
Navigator.of(
dialogContext)
.pop());

5
lib/src/screens/exchange/exchange_template_page.dart
View file

@ -134,6 +134,7 @@ class ExchangeTemplatePage extends BasePage {
initialIsAddressEditable: exchangeViewModel
.isDepositAddressEnabled,
isAmountEstimated: false,
hasRefundAddress: true,
currencies: CryptoCurrency.all,
onCurrencySelected: (currency) =>
exchangeViewModel.changeDepositCurrency(
@ -220,7 +221,7 @@ class ExchangeTemplatePage extends BasePage {
PrimaryButton(
onPressed: () {
if (_formKey.currentState.validate()) {
exchangeViewModel.exchangeTemplateStore.addTemplate(
exchangeViewModel.addTemplate(
amount: exchangeViewModel.depositAmount,
depositCurrency:
exchangeViewModel.depositCurrency.toString(),
@ -229,7 +230,7 @@ class ExchangeTemplatePage extends BasePage {
provider: exchangeViewModel.provider.toString(),
depositAddress: exchangeViewModel.depositAddress,
receiveAddress: exchangeViewModel.receiveAddress);
exchangeViewModel.exchangeTemplateStore.update();
exchangeViewModel.updateTemplate();
Navigator.of(context).pop();
}
},

100
lib/src/screens/send/send_page.dart
View file

@ -1,7 +1,9 @@
import 'dart:ui';
import 'package:cake_wallet/entities/transaction_priority.dart';
import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
import 'package:cake_wallet/src/widgets/picker.dart';
import 'package:cake_wallet/src/widgets/template_tile.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@ -161,8 +163,7 @@ class SendPage extends BasePage {
.decorationColor),
validator: sendViewModel.addressValidator,
),
Observer(
builder: (_) => Padding(
Padding(
padding: const EdgeInsets.only(top: 20),
child: BaseTextFormField(
focusNode: _cryptoAmountFocus,
@ -225,9 +226,7 @@ class SendPage extends BasePage {
fontWeight: FontWeight.w500,
fontSize: 14),
validator:
sendViewModel.sendAll
? sendViewModel.allAmountValidator
: sendViewModel.amountValidator))),
sendViewModel.amountValidator)),
Observer(
builder: (_) => Padding(
padding: EdgeInsets.only(top: 10),
@ -419,53 +418,53 @@ class SendPage extends BasePage {
)),
),
),
// Observer(
// builder: (_) {
// final templates = sendViewModel.templates;
// final itemCount = templates.length;
Observer(
builder: (_) {
final templates = sendViewModel.templates;
final itemCount = templates.length;
// return ListView.builder(
// scrollDirection: Axis.horizontal,
// shrinkWrap: true,
// physics: NeverScrollableScrollPhysics(),
// itemCount: itemCount,
// itemBuilder: (context, index) {
// final template = templates[index];
return ListView.builder(
scrollDirection: Axis.horizontal,
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
itemCount: itemCount,
itemBuilder: (context, index) {
final template = templates[index];
// return TemplateTile(
// key: UniqueKey(),
// to: template.name,
// amount: template.amount,
// from: template.cryptoCurrency,
// onTap: () {
// _addressController.text = template.address;
// _cryptoAmountController.text = template.amount;
// getOpenaliasRecord(context);
// },
// onRemove: () {
// showPopUp<void>(
// context: context,
// builder: (dialogContext) {
// return AlertWithTwoActions(
// alertTitle: S.of(context).template,
// alertContent: S.of(context).confirm_delete_template,
// leftButtonText: S.of(context).delete,
// rightButtonText: S.of(context).cancel,
// actionLeftButton: () {
// Navigator.of(dialogContext).pop();
// sendViewModel.sendTemplateStore.remove(template: template);
// sendViewModel.sendTemplateStore.update();
// },
// actionRightButton: () => Navigator.of(dialogContext).pop()
// );
// }
// );
// },
// );
// }
// );
// }
// )
return TemplateTile(
key: UniqueKey(),
to: template.name,
amount: template.amount,
from: template.cryptoCurrency,
onTap: () {
_addressController.text = template.address;
_cryptoAmountController.text = template.amount;
getOpenaliasRecord(context);
},
onRemove: () {
showPopUp<void>(
context: context,
builder: (dialogContext) {
return AlertWithTwoActions(
alertTitle: S.of(context).template,
alertContent: S.of(context).confirm_delete_template,
rightButtonText: S.of(context).delete,
leftButtonText: S.of(context).cancel,
actionRightButton: () {
Navigator.of(dialogContext).pop();
sendViewModel.removeTemplate(template: template);
sendViewModel.updateTemplate();
},
actionLeftButton: () => Navigator.of(dialogContext).pop()
);
}
);
},
);
}
);
}
)
],
),
),
@ -514,7 +513,6 @@ class SendPage extends BasePage {
final amount = _fiatAmountController.text;
if (amount != sendViewModel.fiatAmount) {
sendViewModel.sendAll = false;
sendViewModel.setFiatAmount(amount);
}
});

32
lib/src/screens/send/send_template_page.dart
View file

@ -134,7 +134,7 @@ class SendTemplatePage extends BasePage {
signed: false, decimal: true),
inputFormatters: [
BlacklistingTextInputFormatter(
RegExp('[\\-|\\ |\\,]'))
RegExp('[\\-|\\ ]'))
],
prefixIcon: Padding(
padding: EdgeInsets.only(top: 9),
@ -172,7 +172,7 @@ class SendTemplatePage extends BasePage {
signed: false, decimal: true),
inputFormatters: [
BlacklistingTextInputFormatter(
RegExp('[\\-|\\ |\\,]'))
RegExp('[\\-|\\ ]'))
],
prefixIcon: Padding(
padding: EdgeInsets.only(top: 9),
@ -210,12 +210,12 @@ class SendTemplatePage extends BasePage {
bottomSection: PrimaryButton(
onPressed: () {
if (_formKey.currentState.validate()) {
// sendViewModel.sendTemplateStore.addTemplate(
// name: _nameController.text,
// address: _addressController.text,
// cryptoCurrency: sendViewModel.currency.title,
// amount: _cryptoAmountController.text);
// sendViewModel.sendTemplateStore.update();
sendViewModel.addTemplate(
name: _nameController.text,
address: _addressController.text,
cryptoCurrency: sendViewModel.currency.title,
amount: _cryptoAmountController.text);
sendViewModel.updateTemplate();
Navigator.of(context).pop();
}
},
@ -249,6 +249,22 @@ class SendTemplatePage extends BasePage {
}
});
_cryptoAmountController.addListener(() {
final amount = _cryptoAmountController.text;
if (amount != sendViewModel.cryptoAmount) {
sendViewModel.setCryptoAmount(amount);
}
});
_fiatAmountController.addListener(() {
final amount = _fiatAmountController.text;
if (amount != sendViewModel.fiatAmount) {
sendViewModel.setFiatAmount(amount);
}
});
_addressController.addListener(() {
final address = _addressController.text;

26
lib/view_model/exchange/exchange_view_model.dart
View file

@ -27,10 +27,10 @@ class ExchangeViewModel = ExchangeViewModelBase with _$ExchangeViewModel;
abstract class ExchangeViewModelBase with Store {
ExchangeViewModelBase(
{this.wallet,
this.wallet,
this.trades,
this.exchangeTemplateStore,
this.tradesStore}) {
this._exchangeTemplateStore,
this.tradesStore) {
providerList = [
XMRTOExchangeProvider(),
ChangeNowExchangeProvider(),
@ -54,7 +54,7 @@ abstract class ExchangeViewModelBase with Store {
final WalletBase wallet;
final Box<Trade> trades;
final ExchangeTemplateStore exchangeTemplateStore;
final ExchangeTemplateStore _exchangeTemplateStore;
final TradesStore tradesStore;
@observable
@ -101,7 +101,7 @@ abstract class ExchangeViewModelBase with Store {
@computed
ObservableList<ExchangeTemplate> get templates =>
exchangeTemplateStore.templates;
_exchangeTemplateStore.templates;
@action
void changeProvider({ExchangeProvider provider}) {
@ -267,6 +267,22 @@ abstract class ExchangeViewModelBase with Store {
_onPairChange();
}
void updateTemplate() => _exchangeTemplateStore.update();
void addTemplate({String amount, String depositCurrency, String receiveCurrency,
String provider, String depositAddress, String receiveAddress}) =>
_exchangeTemplateStore.addTemplate(
amount: amount,
depositCurrency: depositCurrency,
receiveCurrency: receiveCurrency,
provider: provider,
depositAddress: depositAddress,
receiveAddress: receiveAddress
);
void removeTemplate({ExchangeTemplate template}) =>
_exchangeTemplateStore.remove(template: template);
List<ExchangeProvider> providersForCurrentPair() {
return _providersForPair(from: depositCurrency, to: receiveCurrency);
}

22
lib/view_model/send/send_view_model.dart
View file

@ -1,4 +1,6 @@
import 'package:cake_wallet/entities/openalias_record.dart';
import 'package:cake_wallet/entities/template.dart';
import 'package:cake_wallet/store/templates/send_template_store.dart';
import 'package:intl/intl.dart';
import 'package:mobx/mobx.dart';
import 'package:cake_wallet/core/template_validator.dart';
@ -29,7 +31,8 @@ class SendViewModel = SendViewModelBase with _$SendViewModel;
abstract class SendViewModelBase with Store {
SendViewModelBase(
this._wallet, this._settingsStore, this._fiatConversationStore)
this._wallet, this._settingsStore, this._sendTemplateStore,
this._fiatConversationStore)
: state = InitialExecutionState(),
_cryptoNumberFormat = NumberFormat(),
sendAll = false {
@ -90,8 +93,12 @@ abstract class SendViewModelBase with Store {
@computed
bool get isReadyForSend => _wallet.syncStatus is SyncedSyncStatus;
@computed
ObservableList<Template> get templates => _sendTemplateStore.templates;
final WalletBase _wallet;
final SettingsStore _settingsStore;
final SendTemplateStore _sendTemplateStore;
final FiatConversionStore _fiatConversationStore;
final NumberFormat _cryptoNumberFormat;
@ -221,4 +228,17 @@ abstract class SendViewModelBase with Store {
_cryptoNumberFormat.maximumFractionDigits = maximumFractionDigits;
}
void updateTemplate() => _sendTemplateStore.update();
void addTemplate({String name, String address, String cryptoCurrency,
String amount}) => _sendTemplateStore
.addTemplate(
name: name,
address: address,
cryptoCurrency: cryptoCurrency,
amount: amount);
void removeTemplate({Template template}) =>
_sendTemplateStore.remove(template: template);
}

2
lib/view_model/settings/settings_view_model.dart
View file

@ -144,7 +144,7 @@ abstract class SettingsViewModelBase with Store {
RegularListItem(
title: S.current.settings_terms_and_conditions,
handler: (BuildContext context) =>
Navigator.of(context).pushNamed(Routes.disclaimer),
Navigator.of(context).pushNamed(Routes.readDisclaimer),
),
RegularListItem(
title: S.current.faq,