minor fixes
Serhii committed
Dec 28, 2022 at 14:00 UTC
daa9fc4acc77e38f9919e9877cb78f7483a6b742
12 files changed
+28
-61
lib/src/screens/dashboard/widgets/filter_widget.dart
+3
-37
@@ -20,7 +20,7 @@ class FilterWidget extends StatelessWidget {
20
21
@override
22
Widget build(BuildContext context) {
23
- const sectionDivider = SectionDivider();
23
+ const sectionDivider = const SectionDivider();
24
return AlertBackground(
25
child: Stack(
26
alignment: Alignment.center,
@@ -79,8 +79,7 @@ class FilterWidget extends StatelessWidget {
79
itemCount: section.length,
80
itemBuilder: (_, index2) {
81
final item = section[index2];
82
- final content = item.onChanged != null
83
- ? Observer(
82
+ final content = Observer(
83
builder: (_) => StandardCheckbox(
84
value: item.value(),
85
caption: item.caption,
@@ -88,40 +87,7 @@ class FilterWidget extends StatelessWidget {
87
borderColor: Theme.of(context).dividerColor,
88
iconColor: Colors.white,
89
onChanged: (value) => item.onChanged(),
91
- ))
92
- : GestureDetector(
93
- onTap: () async {
94
- //final List<DateTime> picked =
95
- //await date_rage_picker.showDatePicker(
96
- // context: context,
97
- // initialFirstDate: DateTime.now()
98
- // .subtract(Duration(days: 1)),
99
- // initialLastDate: (DateTime.now()),
100
- // firstDate: DateTime(2015),
101
- // lastDate: DateTime.now()
102
- // .add(Duration(days: 1)));
103
-
104
- //if (picked != null && picked.length == 2) {
105
- // dashboardViewModel.transactionFilterStore
106
- // .changeStartDate(picked.first);
107
- // dashboardViewModel.transactionFilterStore
108
- // .changeEndDate(picked.last);
109
- //}
110
- },
111
- // child: Padding(
112
- // padding: EdgeInsets.only(left: 32),
113
- // child: Text(
114
- // item.caption,
115
- // style: TextStyle(
116
- // color: Theme.of(context).primaryTextTheme.title.color,
117
- // fontSize: 18,
118
- // fontFamily: 'Lato',
119
- // fontWeight: FontWeight.w500,
120
- // decoration: TextDecoration.none),
121
- // ),
122
- // ),
123
- );
124
-
90
+ ));
91
return FilterTile(child: content);
92
},
93
)
lib/src/screens/exchange_trade/exchange_trade_page.dart
+2
-2
@@ -8,7 +8,7 @@ import 'package:cake_wallet/generated/i18n.dart';
8
import 'package:cake_wallet/core/execution_state.dart';
9
import 'package:cake_wallet/src/screens/exchange_trade/information_page.dart';
10
import 'package:cake_wallet/src/screens/send/widgets/confirm_sending_alert.dart';
11
-import 'package:cake_wallet/src/widgets/standard_list_row.dart';
11
+import 'package:cake_wallet/src/widgets/list_row.dart';
12
import 'package:cake_wallet/utils/show_bar.dart';
13
import 'package:cake_wallet/utils/show_pop_up.dart';
14
import 'package:cake_wallet/view_model/exchange/exchange_trade_view_model.dart';
@@ -194,7 +194,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
194
final item = widget.exchangeTradeViewModel.items[index];
195
final value = item.data ?? fetchingLabel;
196
197
- final content = AnotherStandardListRow(
197
+ final content = ListRow(
198
title: item.title,
199
value: value,
200
valueFontSize: 14,
lib/src/screens/monero_accounts/monero_account_list_page.dart
+2
-1
@@ -84,7 +84,8 @@ class MoneroAccountListPage extends StatelessWidget {
84
ListView.separated(
85
padding: EdgeInsets.zero,
86
controller: controller,
87
- separatorBuilder: (context, index) => SectionDivider(),
87
+ separatorBuilder: (context, index) =>
88
+ const SectionDivider(),
89
itemCount: accounts.length ?? 0,
90
itemBuilder: (context, index) {
91
final account = accounts[index];
lib/src/screens/order_details/order_details_page.dart
+3
-3
@@ -7,7 +7,7 @@ import 'package:flutter/services.dart';
7
import 'package:flutter_mobx/flutter_mobx.dart';
8
import 'package:cake_wallet/generated/i18n.dart';
9
import 'package:cake_wallet/src/screens/base_page.dart';
10
-import 'package:cake_wallet/src/widgets/standard_list_row.dart';
10
+import 'package:cake_wallet/src/widgets/list_row.dart';
11
import 'package:cake_wallet/src/screens/trade_details/track_trade_list_item.dart';
12
13
class OrderDetailsPage extends BasePage {
@@ -57,7 +57,7 @@ class OrderDetailsPageBodyState extends State<OrderDetailsPageBody> {
57
if (item is TrackTradeListItem) {
58
return GestureDetector(
59
onTap: item.onTap,
60
- child: AnotherStandardListRow(
60
+ child: ListRow(
61
title: '${item.title}', value: '${item.value}'));
62
} else {
63
return GestureDetector(
@@ -65,7 +65,7 @@ class OrderDetailsPageBodyState extends State<OrderDetailsPageBody> {
65
Clipboard.setData(ClipboardData(text: '${item.value}'));
66
showBar<void>(context, S.of(context).copied_to_clipboard);
67
},
68
- child: AnotherStandardListRow(
68
+ child: ListRow(
69
title: '${item.title}', value: '${item.value}'));
70
}
71
});
lib/src/screens/receive/receive_page.dart
+1
-1
@@ -136,7 +136,7 @@ class ReceivePage extends BasePage {
136
Observer(
137
builder: (_) => ListView.separated(
138
padding: EdgeInsets.all(0),
139
- separatorBuilder: (context, _) => SectionDivider(),
139
+ separatorBuilder: (context, _) => const SectionDivider(),
140
shrinkWrap: true,
141
physics: NeverScrollableScrollPhysics(),
142
itemCount: addressListViewModel.items.length,
lib/src/screens/send/widgets/choose_yat_address_alert.dart
+1
-1
@@ -71,7 +71,7 @@ class ChooseYatAddressButtonsState extends State<ChooseYatAddressButtons> {
71
controller: controller,
72
padding: EdgeInsets.all(0),
73
itemCount: itemCount,
74
- separatorBuilder: (_, __) => SectionDivider(),
74
+ separatorBuilder: (_, __) => const SectionDivider(),
75
itemBuilder: (context, index) {
76
final address = addresses[index];
77
lib/src/screens/trade_details/trade_details_page.dart
+3
-3
@@ -9,7 +9,7 @@ import 'package:flutter/services.dart';
9
import 'package:flutter_mobx/flutter_mobx.dart';
10
import 'package:cake_wallet/generated/i18n.dart';
11
import 'package:cake_wallet/src/screens/base_page.dart';
12
-import 'package:cake_wallet/src/widgets/standard_list_row.dart';
12
+import 'package:cake_wallet/src/widgets/list_row.dart';
13
import 'package:cake_wallet/src/screens/trade_details/track_trade_list_item.dart';
14
import 'package:cake_wallet/src/screens/trade_details/trade_details_list_card.dart';
15
import 'package:cake_wallet/src/screens/trade_details/trade_details_status_item.dart';
@@ -62,7 +62,7 @@ class TradeDetailsPageBodyState extends State<TradeDetailsPageBody> {
62
if (item is TrackTradeListItem) {
63
return GestureDetector(
64
onTap: item.onTap,
65
- child: AnotherStandardListRow(
65
+ child: ListRow(
66
title: '${item.title}', value: '${item.value}'));
67
}
68
@@ -86,7 +86,7 @@ class TradeDetailsPageBodyState extends State<TradeDetailsPageBody> {
86
Clipboard.setData(ClipboardData(text: '${item.value}'));
87
showBar<void>(context, S.of(context).copied_to_clipboard);
88
},
89
- child: AnotherStandardListRow(
89
+ child: ListRow(
90
title: '${item.title}', value: '${item.value}'));
91
});
92
});
lib/src/screens/transaction_details/transaction_details_page.dart
+3
-3
@@ -6,7 +6,7 @@ import 'package:cake_wallet/view_model/transaction_details_view_model.dart';
6
import 'package:flutter/material.dart';
7
import 'package:flutter/services.dart';
8
import 'package:cake_wallet/generated/i18n.dart';
9
-import 'package:cake_wallet/src/widgets/standard_list_row.dart';
9
+import 'package:cake_wallet/src/widgets/list_row.dart';
10
import 'package:cake_wallet/src/screens/transaction_details/blockexplorer_list_item.dart';
11
import 'package:cake_wallet/src/screens/transaction_details/standart_list_item.dart';
12
import 'package:cake_wallet/src/screens/base_page.dart';
@@ -42,7 +42,7 @@ class TransactionDetailsPage extends BasePage {
42
S.of(context).transaction_details_copied(item.title));
43
},
44
child:
45
- AnotherStandardListRow(title: '${item.title}:', value: item.value),
45
+ ListRow(title: '${item.title}:', value: item.value),
46
);
47
}
48
@@ -50,7 +50,7 @@ class TransactionDetailsPage extends BasePage {
50
return GestureDetector(
51
onTap: item.onTap,
52
child:
53
- AnotherStandardListRow(title: '${item.title}:', value: item.value),
53
+ ListRow(title: '${item.title}:', value: item.value),
54
);
55
}
56
lib/src/screens/unspent_coins/unspent_coins_details_page.dart
+2
-2
@@ -5,7 +5,7 @@ import 'package:cake_wallet/src/widgets/standard_list.dart';
5
import 'package:cake_wallet/view_model/unspent_coins/unspent_coins_details_view_model.dart';
6
import 'package:cake_wallet/view_model/unspent_coins/unspent_coins_switch_item.dart';
7
import 'package:flutter/material.dart';
8
-import 'package:cake_wallet/src/widgets/standard_list_row.dart';
8
+import 'package:cake_wallet/src/widgets/list_row.dart';
9
import 'package:cake_wallet/src/screens/transaction_details/standart_list_item.dart';
10
import 'package:cake_wallet/src/screens/base_page.dart';
11
import 'package:flutter_mobx/flutter_mobx.dart';
@@ -30,7 +30,7 @@ class UnspentCoinsDetailsPage extends BasePage {
30
final item = unspentCoinsDetailsViewModel.items[index];
31
32
if (item is StandartListItem) {
33
- return AnotherStandardListRow(
33
+ return ListRow(
34
title: '${item.title}:',
35
value: item.value);
36
}
lib/src/screens/wallet_keys/wallet_keys_page.dart
+3
-3
@@ -7,7 +7,7 @@ import 'package:flutter/services.dart';
7
import 'package:flutter_mobx/flutter_mobx.dart';
8
import 'package:cake_wallet/generated/i18n.dart';
9
import 'package:cake_wallet/src/screens/base_page.dart';
10
-import 'package:cake_wallet/src/widgets/standard_list_row.dart';
10
+import 'package:cake_wallet/src/widgets/list_row.dart';
11
import 'package:cake_wallet/view_model/wallet_keys_view_model.dart';
12
13
class WalletKeysPage extends BasePage {
@@ -58,7 +58,7 @@ class WalletKeysPage extends BasePage {
58
height: 1,
59
padding: EdgeInsets.only(left: 24),
60
color: Theme.of(context).accentTextTheme!.headline6!.backgroundColor!,
61
- child: SectionDivider(),
61
+ child: const SectionDivider(),
62
),
63
itemCount: walletKeysViewModel.items.length,
64
itemBuilder: (BuildContext context, int index) {
@@ -69,7 +69,7 @@ class WalletKeysPage extends BasePage {
69
Clipboard.setData(ClipboardData(text: item.value));
70
showBar<void>(context, S.of(context).copied_key_to_clipboard(item.title));
71
},
72
- child: AnotherStandardListRow(
72
+ child: ListRow(
73
title: item.title + ':',
74
value: item.value,
75
),
lib/src/widgets/base_alert_dialog.dart
+3
-3
@@ -77,7 +77,7 @@ class BaseAlertDialog extends StatelessWidget {
77
),
78
)),
79
),
80
- SectionDivider(),
80
+ const SectionDivider(),
81
Expanded(
82
child: TextButton(
83
onPressed: actionRight,
@@ -138,7 +138,7 @@ class BaseAlertDialog extends StatelessWidget {
138
isDividerExists
139
? Padding(
140
padding: EdgeInsets.only(top: 16, bottom: 8),
141
- child: SectionDivider(),
141
+ child: const SectionDivider(),
142
)
143
: Offstage(),
144
Padding(
@@ -147,7 +147,7 @@ class BaseAlertDialog extends StatelessWidget {
147
)
148
],
149
),
150
- SectionDivider(),
150
+ const SectionDivider(),
151
actionButtons(context)
152
],
153
),
lib/src/widgets/list_row.dart
renamed
+2
-2
@@ -1,8 +1,8 @@
1
import 'package:flutter/cupertino.dart';
2
import 'package:flutter/material.dart';
3
4
-class AnotherStandardListRow extends StatelessWidget {
5
- AnotherStandardListRow(
4
+class ListRow extends StatelessWidget {
5
+ ListRow(
6
{required this.title,
7
required this.value,
8
this.titleFontSize = 14,