Skip to content

Commit 7d2f2bd

Browse files
sergdeussergdeus
authored
Merge pull request #297 from AgoraDesk-LocalMonero/iteration_72
Iteration 72
2 parents 435f09d + 2075749 commit 7d2f2bd

12 files changed

+94
-141
lines changed

‎ios/Podfile.lock

+5-5
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ PODS:
9393
- Flutter
9494
- in_app_review (0.2.0):
9595
- Flutter
96-
- local_auth_ios (0.0.1):
96+
- local_auth_darwin (0.0.1):
9797
- Flutter
9898
- MTBBarcodeScanner (5.0.11)
9999
- nanopb (2.30910.0):
@@ -150,7 +150,7 @@ DEPENDENCIES:
150150
- flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
151151
- image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
152152
- in_app_review (from `.symlinks/plugins/in_app_review/ios`)
153-
- local_auth_ios (from `.symlinks/plugins/local_auth_ios/ios`)
153+
- local_auth_darwin (from `.symlinks/plugins/local_auth_darwin/darwin`)
154154
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
155155
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
156156
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
@@ -211,8 +211,8 @@ EXTERNAL SOURCES:
211211
:path: ".symlinks/plugins/image_picker_ios/ios"
212212
in_app_review:
213213
:path: ".symlinks/plugins/in_app_review/ios"
214-
local_auth_ios:
215-
:path: ".symlinks/plugins/local_auth_ios/ios"
214+
local_auth_darwin:
215+
:path: ".symlinks/plugins/local_auth_darwin/darwin"
216216
package_info_plus:
217217
:path: ".symlinks/plugins/package_info_plus/ios"
218218
path_provider_foundation:
@@ -257,7 +257,7 @@ SPEC CHECKSUMS:
257257
GoogleUtilities: d053d902a8edaa9904e1bd00c37535385b8ed152
258258
image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425
259259
in_app_review: 318597b3a06c22bb46dc454d56828c85f444f99d
260-
local_auth_ios: 5046a18c018dd973247a0564496c8898dbb5adf9
260+
local_auth_darwin: 4d56c90c2683319835a61274b57620df9c4520ab
261261
MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
262262
nanopb: 438bc412db1928dac798aa6fd75726007be04262
263263
OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c

‎lib/core/packages/agora_popup_menu/overlay_popup_menu_item.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class OverlayPopupMenuItem extends StatelessWidget {
2828
Widget build(BuildContext context) {
2929
final ThemeData theme = Theme.of(context);
3030
final PopupMenuThemeData popupMenuTheme = PopupMenuTheme.of(context);
31-
TextStyle style = textStyle ?? popupMenuTheme.textStyle ?? theme.textTheme.subtitle1!;
31+
TextStyle style = textStyle ?? popupMenuTheme.textStyle ?? theme.textTheme.titleSmall!;
3232

3333
if (onTap == null) style = style.copyWith(color: theme.disabledColor);
3434

‎lib/core/widgets/checkbox_form_field.dart

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'package:flutter/material.dart';
2+
import 'package:agoradesk/core/theme/theme.dart';
23

34
class CheckboxFormField extends FormField<bool> {
45
CheckboxFormField(
@@ -23,7 +24,7 @@ class CheckboxFormField extends FormField<bool> {
2324
? Builder(
2425
builder: (BuildContext context) => Text(
2526
state.errorText ?? '',
26-
style: TextStyle(color: Theme.of(context).errorColor),
27+
style: TextStyle(color: Theme.of(context).colorScheme.errorColor),
2728
),
2829
)
2930
: null,

‎lib/features/market/models/market_view_model.dart

+22
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import 'package:agoradesk/features/auth/data/services/auth_service.dart';
3030
import 'package:collection/collection.dart';
3131
import 'package:dropdown_search/dropdown_search.dart';
3232
import 'package:flutter/material.dart';
33+
import 'package:flutter/src/services/predictive_back_event.dart';
3334
import 'package:vm/vm.dart';
3435

3536
const kDefaultCountry = CountryModel(name: 'United States of America', code: 'US');
@@ -596,4 +597,25 @@ class MarketViewModel extends ViewModel
596597
// TODO: implement didRequestAppExit
597598
throw UnimplementedError();
598599
}
600+
601+
@override
602+
void handleCancelBackGesture() {
603+
// TODO: implement handleCancelBackGesture
604+
}
605+
606+
@override
607+
void handleCommitBackGesture() {
608+
// TODO: implement handleCommitBackGesture
609+
}
610+
611+
@override
612+
bool handleStartBackGesture(PredictiveBackEvent backEvent) {
613+
// TODO: implement handleStartBackGesture
614+
throw UnimplementedError();
615+
}
616+
617+
@override
618+
void handleUpdateBackGestureProgress(PredictiveBackEvent backEvent) {
619+
// TODO: implement handleUpdateBackGestureProgress
620+
}
599621
}

‎lib/features/trades/models/trade_view_model.dart

+22
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import 'package:agoradesk/router.gr.dart';
4141
import 'package:auto_route/auto_route.dart';
4242
import 'package:collection/collection.dart';
4343
import 'package:flutter/material.dart';
44+
import 'package:flutter/src/services/predictive_back_event.dart';
4445
import 'package:flutter_app_badger/flutter_app_badger.dart';
4546
import 'package:image_picker/image_picker.dart';
4647
import 'package:vm/vm.dart';
@@ -1340,4 +1341,25 @@ class TradeViewModel extends ViewModel
13401341
// TODO: implement didRequestAppExit
13411342
throw UnimplementedError();
13421343
}
1344+
1345+
@override
1346+
void handleCancelBackGesture() {
1347+
// TODO: implement handleCancelBackGesture
1348+
}
1349+
1350+
@override
1351+
void handleCommitBackGesture() {
1352+
// TODO: implement handleCommitBackGesture
1353+
}
1354+
1355+
@override
1356+
bool handleStartBackGesture(PredictiveBackEvent backEvent) {
1357+
// TODO: implement handleStartBackGesture
1358+
throw UnimplementedError();
1359+
}
1360+
1361+
@override
1362+
void handleUpdateBackGestureProgress(PredictiveBackEvent backEvent) {
1363+
// TODO: implement handleUpdateBackGestureProgress
1364+
}
13431365
}

‎lib/features/wallet/data/models/wallet_balance_model.dart

+1-27
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ class WalletBalanceModel with _$WalletBalanceModel {
1616
@JsonSerializable(explicitToJson: true)
1717
const factory WalletBalanceModel({
1818
@_NestedBalanceConverter() @JsonKey(name: 'total') required Decimal balance,
19-
@JsonKey(name: 'receiving_address') required String receivingAddress,
2019
@JsonKey(name: 'received_transactions_30d') List<TransactionModel>? receivedTransactions,
2120
@JsonKey(name: 'sent_transactions_30d') List<TransactionModel>? sentTransactions,
2221
}) = _WalletBalanceModel;
@@ -37,29 +36,4 @@ class _NestedBalanceConverter extends JsonConverter<Decimal, Map<String, dynamic
3736
Map<String, dynamic> toJson(Decimal object) => {
3837
'total': {'balance': object}
3938
};
40-
}
41-
42-
// class _ReceiveConverter extends JsonConverter<List<TransactionModel>?, Map<String, dynamic>> {
43-
// const _ReceiveConverter();
44-
//
45-
// @override
46-
// List<TransactionModel>? fromJson(Map<String, dynamic> json) {
47-
// if (json['received_transactions_30d'] != null) {
48-
// List<TransactionModel> resList = [];
49-
// if (json['received_transactions_30d'] is List && json['received_transactions_30d'].isNotEmpty()) {
50-
// for (final val in json['received_transactions_30d']) {
51-
// Map<String, dynamic> jsonIn = val;
52-
// jsonIn['isSent'] = false;
53-
// TransactionModel transactionModel = TransactionModel.fromJson(jsonIn);
54-
// resList.add(transactionModel);
55-
// }
56-
// }
57-
// return resList;
58-
// } else {
59-
// return null;
60-
// }
61-
// }
62-
//
63-
// @override
64-
// Map<String, dynamic> toJson(List<TransactionModel>? object) => {};
65-
// }
39+
}

‎lib/features/wallet/data/models/wallet_balance_model.freezed.dart

+6-29
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ WalletBalanceModel _$WalletBalanceModelFromJson(Map<String, dynamic> json) {
2222
mixin _$WalletBalanceModel {
2323
@_NestedBalanceConverter()
2424
@JsonKey(name: 'total')
25-
Decimal get balance => throw _privateConstructorUsedError;
26-
@JsonKey(name: 'receiving_address')
27-
String get receivingAddress => throw _privateConstructorUsedError;
25+
Decimal get balance =>
26+
throw _privateConstructorUsedError; // @JsonKey(name: 'receiving_address') required String receivingAddress,
2827
@JsonKey(name: 'received_transactions_30d')
2928
List<TransactionModel>? get receivedTransactions =>
3029
throw _privateConstructorUsedError;
@@ -46,7 +45,6 @@ abstract class $WalletBalanceModelCopyWith<$Res> {
4645
@useResult
4746
$Res call(
4847
{@_NestedBalanceConverter() @JsonKey(name: 'total') Decimal balance,
49-
@JsonKey(name: 'receiving_address') String receivingAddress,
5048
@JsonKey(name: 'received_transactions_30d')
5149
List<TransactionModel>? receivedTransactions,
5250
@JsonKey(name: 'sent_transactions_30d')
@@ -67,7 +65,6 @@ class _$WalletBalanceModelCopyWithImpl<$Res, $Val extends WalletBalanceModel>
6765
@override
6866
$Res call({
6967
Object? balance = null,
70-
Object? receivingAddress = null,
7168
Object? receivedTransactions = freezed,
7269
Object? sentTransactions = freezed,
7370
}) {
@@ -76,10 +73,6 @@ class _$WalletBalanceModelCopyWithImpl<$Res, $Val extends WalletBalanceModel>
7673
? _value.balance
7774
: balance // ignore: cast_nullable_to_non_nullable
7875
as Decimal,
79-
receivingAddress: null == receivingAddress
80-
? _value.receivingAddress
81-
: receivingAddress // ignore: cast_nullable_to_non_nullable
82-
as String,
8376
receivedTransactions: freezed == receivedTransactions
8477
? _value.receivedTransactions
8578
: receivedTransactions // ignore: cast_nullable_to_non_nullable
@@ -102,7 +95,6 @@ abstract class _$$WalletBalanceModelImplCopyWith<$Res>
10295
@useResult
10396
$Res call(
10497
{@_NestedBalanceConverter() @JsonKey(name: 'total') Decimal balance,
105-
@JsonKey(name: 'receiving_address') String receivingAddress,
10698
@JsonKey(name: 'received_transactions_30d')
10799
List<TransactionModel>? receivedTransactions,
108100
@JsonKey(name: 'sent_transactions_30d')
@@ -121,7 +113,6 @@ class __$$WalletBalanceModelImplCopyWithImpl<$Res>
121113
@override
122114
$Res call({
123115
Object? balance = null,
124-
Object? receivingAddress = null,
125116
Object? receivedTransactions = freezed,
126117
Object? sentTransactions = freezed,
127118
}) {
@@ -130,10 +121,6 @@ class __$$WalletBalanceModelImplCopyWithImpl<$Res>
130121
? _value.balance
131122
: balance // ignore: cast_nullable_to_non_nullable
132123
as Decimal,
133-
receivingAddress: null == receivingAddress
134-
? _value.receivingAddress
135-
: receivingAddress // ignore: cast_nullable_to_non_nullable
136-
as String,
137124
receivedTransactions: freezed == receivedTransactions
138125
? _value._receivedTransactions
139126
: receivedTransactions // ignore: cast_nullable_to_non_nullable
@@ -152,7 +139,6 @@ class __$$WalletBalanceModelImplCopyWithImpl<$Res>
152139
class _$WalletBalanceModelImpl implements _WalletBalanceModel {
153140
const _$WalletBalanceModelImpl(
154141
{@_NestedBalanceConverter() @JsonKey(name: 'total') required this.balance,
155-
@JsonKey(name: 'receiving_address') required this.receivingAddress,
156142
@JsonKey(name: 'received_transactions_30d')
157143
final List<TransactionModel>? receivedTransactions,
158144
@JsonKey(name: 'sent_transactions_30d')
@@ -167,10 +153,9 @@ class _$WalletBalanceModelImpl implements _WalletBalanceModel {
167153
@_NestedBalanceConverter()
168154
@JsonKey(name: 'total')
169155
final Decimal balance;
170-
@override
171-
@JsonKey(name: 'receiving_address')
172-
final String receivingAddress;
156+
// @JsonKey(name: 'receiving_address') required String receivingAddress,
173157
final List<TransactionModel>? _receivedTransactions;
158+
// @JsonKey(name: 'receiving_address') required String receivingAddress,
174159
@override
175160
@JsonKey(name: 'received_transactions_30d')
176161
List<TransactionModel>? get receivedTransactions {
@@ -196,7 +181,7 @@ class _$WalletBalanceModelImpl implements _WalletBalanceModel {
196181

197182
@override
198183
String toString() {
199-
return 'WalletBalanceModel(balance: $balance, receivingAddress: $receivingAddress, receivedTransactions: $receivedTransactions, sentTransactions: $sentTransactions)';
184+
return 'WalletBalanceModel(balance: $balance, receivedTransactions: $receivedTransactions, sentTransactions: $sentTransactions)';
200185
}
201186

202187
@override
@@ -205,8 +190,6 @@ class _$WalletBalanceModelImpl implements _WalletBalanceModel {
205190
(other.runtimeType == runtimeType &&
206191
other is _$WalletBalanceModelImpl &&
207192
(identical(other.balance, balance) || other.balance == balance) &&
208-
(identical(other.receivingAddress, receivingAddress) ||
209-
other.receivingAddress == receivingAddress) &&
210193
const DeepCollectionEquality()
211194
.equals(other._receivedTransactions, _receivedTransactions) &&
212195
const DeepCollectionEquality()
@@ -218,7 +201,6 @@ class _$WalletBalanceModelImpl implements _WalletBalanceModel {
218201
int get hashCode => Object.hash(
219202
runtimeType,
220203
balance,
221-
receivingAddress,
222204
const DeepCollectionEquality().hash(_receivedTransactions),
223205
const DeepCollectionEquality().hash(_sentTransactions));
224206

@@ -242,8 +224,6 @@ abstract class _WalletBalanceModel implements WalletBalanceModel {
242224
{@_NestedBalanceConverter()
243225
@JsonKey(name: 'total')
244226
required final Decimal balance,
245-
@JsonKey(name: 'receiving_address')
246-
required final String receivingAddress,
247227
@JsonKey(name: 'received_transactions_30d')
248228
final List<TransactionModel>? receivedTransactions,
249229
@JsonKey(name: 'sent_transactions_30d')
@@ -257,10 +237,7 @@ abstract class _WalletBalanceModel implements WalletBalanceModel {
257237
@_NestedBalanceConverter()
258238
@JsonKey(name: 'total')
259239
Decimal get balance;
260-
@override
261-
@JsonKey(name: 'receiving_address')
262-
String get receivingAddress;
263-
@override
240+
@override // @JsonKey(name: 'receiving_address') required String receivingAddress,
264241
@JsonKey(name: 'received_transactions_30d')
265242
List<TransactionModel>? get receivedTransactions;
266243
@override

‎lib/features/wallet/data/models/wallet_balance_model.g.dart

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/features/wallet/models/wallet_view_model.dart

+5-5
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ class WalletViewModel extends ViewModel with StringMixin {
149149
// final int digitsXmr = getBankersDigits(Asset.XMR.name);
150150
// _balanceXmr = _appState.balance[0].balance.toDouble().bankerRound(digitsXmr).toString();
151151
_balanceXmr = _appState.balance[0].balance.toString();
152-
_addressXmr = _appState.balance[0].receivingAddress;
152+
// _addressXmr = _appState.balance[0].receivingAddress;
153153
if (_appState.assetPrice.isNotEmpty) {
154154
xmrPrice = _appState.assetPrice[0];
155155
}
@@ -158,7 +158,7 @@ class WalletViewModel extends ViewModel with StringMixin {
158158
// final int digitsBtc = getBankersDigits(Asset.BTC.name);
159159
// _balanceBtc = _appState.balance[1].balance.toDouble().bankerRound(digitsBtc).toString();
160160
_balanceBtc = _appState.balance[1].balance.toString();
161-
_addressBtc = _appState.balance[1].receivingAddress;
161+
// _addressBtc = _appState.balance[1].receivingAddress;
162162
if (_appState.assetPrice.length > 1) {
163163
btcPrice = _appState.assetPrice[1];
164164
}
@@ -180,9 +180,9 @@ class WalletViewModel extends ViewModel with StringMixin {
180180
loadingBalance = false;
181181
if (resBtc.isRight && resXmr.isRight) {
182182
_balanceBtc = resBtc.right.balance.toString();
183-
_addressBtc = resBtc.right.receivingAddress;
183+
// _addressBtc = resBtc.right.receivingAddress;
184184
_balanceXmr = resXmr.right.balance.toString();
185-
_addressXmr = resXmr.right.receivingAddress;
185+
// _addressXmr = resXmr.right.receivingAddress;
186186
joinAllTransactions(resXmr.right, resBtc.right);
187187
} else {
188188
if (resBtc.isLeft) {
@@ -204,7 +204,7 @@ class WalletViewModel extends ViewModel with StringMixin {
204204
loadingBalance = false;
205205
if (resXmr.isRight) {
206206
_balanceXmr = resXmr.right.balance.toString();
207-
_addressXmr = resXmr.right.receivingAddress;
207+
// _addressXmr = resXmr.right.receivingAddress;
208208
joinAllTransactions(resXmr.right, null);
209209
} else {
210210
if (resXmr.left.message.containsKey('error_code')) {

0 commit comments

Comments
 (0)