From daa9fc4acc77e38f9919e9877cb78f7483a6b742 Mon Sep 17 00:00:00 2001
From: Serhii <borodenko.sv@gmail.com>
Date: Wed, 28 Dec 2022 14:00:59 +0200
Subject: [PATCH] minor fixes
---
.../dashboard/widgets/filter_widget.dart | 40 ++-----------------
.../exchange_trade/exchange_trade_page.dart | 4 +-
.../monero_account_list_page.dart | 3 +-
.../order_details/order_details_page.dart | 6 +--
lib/src/screens/receive/receive_page.dart | 2 +-
.../widgets/choose_yat_address_alert.dart | 2 +-
.../trade_details/trade_details_page.dart | 6 +--
.../transaction_details_page.dart | 6 +--
.../unspent_coins_details_page.dart | 4 +-
.../screens/wallet_keys/wallet_keys_page.dart | 6 +--
lib/src/widgets/base_alert_dialog.dart | 6 +--
.../{standard_list_row.dart => list_row.dart} | 4 +-
12 files changed, 28 insertions(+), 61 deletions(-)
rename lib/src/widgets/{standard_list_row.dart => list_row.dart} (96%)
diff --git a/lib/src/screens/dashboard/widgets/filter_widget.dart b/lib/src/screens/dashboard/widgets/filter_widget.dart
index 8dcc1b5c3..17df0bc5e 100644
--- a/lib/src/screens/dashboard/widgets/filter_widget.dart
+++ b/lib/src/screens/dashboard/widgets/filter_widget.dart
@@ -20,7 +20,7 @@ class FilterWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
- const sectionDivider = SectionDivider();
+ const sectionDivider = const SectionDivider();
return AlertBackground(
child: Stack(
alignment: Alignment.center,
@@ -79,8 +79,7 @@ class FilterWidget extends StatelessWidget {
itemCount: section.length,
itemBuilder: (_, index2) {
final item = section[index2];
- final content = item.onChanged != null
- ? Observer(
+ final content = Observer(
builder: (_) => StandardCheckbox(
value: item.value(),
caption: item.caption,
@@ -88,40 +87,7 @@ class FilterWidget extends StatelessWidget {
borderColor: Theme.of(context).dividerColor,
iconColor: Colors.white,
onChanged: (value) => item.onChanged(),
- ))
- : GestureDetector(
- onTap: () async {
- //final List<DateTime> picked =
- //await date_rage_picker.showDatePicker(
- // context: context,
- // initialFirstDate: DateTime.now()
- // .subtract(Duration(days: 1)),
- // initialLastDate: (DateTime.now()),
- // firstDate: DateTime(2015),
- // lastDate: DateTime.now()
- // .add(Duration(days: 1)));
-
- //if (picked != null && picked.length == 2) {
- // dashboardViewModel.transactionFilterStore
- // .changeStartDate(picked.first);
- // dashboardViewModel.transactionFilterStore
- // .changeEndDate(picked.last);
- //}
- },
- // child: Padding(
- // padding: EdgeInsets.only(left: 32),
- // child: Text(
- // item.caption,
- // style: TextStyle(
- // color: Theme.of(context).primaryTextTheme.title.color,
- // fontSize: 18,
- // fontFamily: 'Lato',
- // fontWeight: FontWeight.w500,
- // decoration: TextDecoration.none),
- // ),
- // ),
- );
-
+ ));
return FilterTile(child: content);
},
)
diff --git a/lib/src/screens/exchange_trade/exchange_trade_page.dart b/lib/src/screens/exchange_trade/exchange_trade_page.dart
index e3eb8db96..5aacf3f1f 100644
--- a/lib/src/screens/exchange_trade/exchange_trade_page.dart
+++ b/lib/src/screens/exchange_trade/exchange_trade_page.dart
@@ -8,7 +8,7 @@ import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/core/execution_state.dart';
import 'package:cake_wallet/src/screens/exchange_trade/information_page.dart';
import 'package:cake_wallet/src/screens/send/widgets/confirm_sending_alert.dart';
-import 'package:cake_wallet/src/widgets/standard_list_row.dart';
+import 'package:cake_wallet/src/widgets/list_row.dart';
import 'package:cake_wallet/utils/show_bar.dart';
import 'package:cake_wallet/utils/show_pop_up.dart';
import 'package:cake_wallet/view_model/exchange/exchange_trade_view_model.dart';
@@ -194,7 +194,7 @@ class ExchangeTradeState extends State<ExchangeTradeForm> {
final item = widget.exchangeTradeViewModel.items[index];
final value = item.data ?? fetchingLabel;
- final content = AnotherStandardListRow(
+ final content = ListRow(
title: item.title,
value: value,
valueFontSize: 14,
diff --git a/lib/src/screens/monero_accounts/monero_account_list_page.dart b/lib/src/screens/monero_accounts/monero_account_list_page.dart
index c565332a0..7fe15948f 100644
--- a/lib/src/screens/monero_accounts/monero_account_list_page.dart
+++ b/lib/src/screens/monero_accounts/monero_account_list_page.dart
@@ -84,7 +84,8 @@ class MoneroAccountListPage extends StatelessWidget {
ListView.separated(
padding: EdgeInsets.zero,
controller: controller,
- separatorBuilder: (context, index) => SectionDivider(),
+ separatorBuilder: (context, index) =>
+ const SectionDivider(),
itemCount: accounts.length ?? 0,
itemBuilder: (context, index) {
final account = accounts[index];
diff --git a/lib/src/screens/order_details/order_details_page.dart b/lib/src/screens/order_details/order_details_page.dart
index a7eff99b8..0784c7008 100644
--- a/lib/src/screens/order_details/order_details_page.dart
+++ b/lib/src/screens/order_details/order_details_page.dart
@@ -7,7 +7,7 @@ import 'package:flutter/services.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/src/widgets/standard_list_row.dart';
+import 'package:cake_wallet/src/widgets/list_row.dart';
import 'package:cake_wallet/src/screens/trade_details/track_trade_list_item.dart';
class OrderDetailsPage extends BasePage {
@@ -57,7 +57,7 @@ class OrderDetailsPageBodyState extends State<OrderDetailsPageBody> {
if (item is TrackTradeListItem) {
return GestureDetector(
onTap: item.onTap,
- child: AnotherStandardListRow(
+ child: ListRow(
title: '${item.title}', value: '${item.value}'));
} else {
return GestureDetector(
@@ -65,7 +65,7 @@ class OrderDetailsPageBodyState extends State<OrderDetailsPageBody> {
Clipboard.setData(ClipboardData(text: '${item.value}'));
showBar<void>(context, S.of(context).copied_to_clipboard);
},
- child: AnotherStandardListRow(
+ child: ListRow(
title: '${item.title}', value: '${item.value}'));
}
});
diff --git a/lib/src/screens/receive/receive_page.dart b/lib/src/screens/receive/receive_page.dart
index 4344139ac..71ee578a0 100644
--- a/lib/src/screens/receive/receive_page.dart
+++ b/lib/src/screens/receive/receive_page.dart
@@ -136,7 +136,7 @@ class ReceivePage extends BasePage {
Observer(
builder: (_) => ListView.separated(
padding: EdgeInsets.all(0),
- separatorBuilder: (context, _) => SectionDivider(),
+ separatorBuilder: (context, _) => const SectionDivider(),
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
itemCount: addressListViewModel.items.length,
diff --git a/lib/src/screens/send/widgets/choose_yat_address_alert.dart b/lib/src/screens/send/widgets/choose_yat_address_alert.dart
index dae6c5ad7..5d937a571 100644
--- a/lib/src/screens/send/widgets/choose_yat_address_alert.dart
+++ b/lib/src/screens/send/widgets/choose_yat_address_alert.dart
@@ -71,7 +71,7 @@ class ChooseYatAddressButtonsState extends State<ChooseYatAddressButtons> {
controller: controller,
padding: EdgeInsets.all(0),
itemCount: itemCount,
- separatorBuilder: (_, __) => SectionDivider(),
+ separatorBuilder: (_, __) => const SectionDivider(),
itemBuilder: (context, index) {
final address = addresses[index];
diff --git a/lib/src/screens/trade_details/trade_details_page.dart b/lib/src/screens/trade_details/trade_details_page.dart
index 1bb5d3ec8..1958a7d58 100644
--- a/lib/src/screens/trade_details/trade_details_page.dart
+++ b/lib/src/screens/trade_details/trade_details_page.dart
@@ -9,7 +9,7 @@ import 'package:flutter/services.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/src/widgets/standard_list_row.dart';
+import 'package:cake_wallet/src/widgets/list_row.dart';
import 'package:cake_wallet/src/screens/trade_details/track_trade_list_item.dart';
import 'package:cake_wallet/src/screens/trade_details/trade_details_list_card.dart';
import 'package:cake_wallet/src/screens/trade_details/trade_details_status_item.dart';
@@ -62,7 +62,7 @@ class TradeDetailsPageBodyState extends State<TradeDetailsPageBody> {
if (item is TrackTradeListItem) {
return GestureDetector(
onTap: item.onTap,
- child: AnotherStandardListRow(
+ child: ListRow(
title: '${item.title}', value: '${item.value}'));
}
@@ -86,7 +86,7 @@ class TradeDetailsPageBodyState extends State<TradeDetailsPageBody> {
Clipboard.setData(ClipboardData(text: '${item.value}'));
showBar<void>(context, S.of(context).copied_to_clipboard);
},
- child: AnotherStandardListRow(
+ child: ListRow(
title: '${item.title}', value: '${item.value}'));
});
});
diff --git a/lib/src/screens/transaction_details/transaction_details_page.dart b/lib/src/screens/transaction_details/transaction_details_page.dart
index 8d3ae8c9e..1b79ceeb0 100644
--- a/lib/src/screens/transaction_details/transaction_details_page.dart
+++ b/lib/src/screens/transaction_details/transaction_details_page.dart
@@ -6,7 +6,7 @@ import 'package:cake_wallet/view_model/transaction_details_view_model.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/widgets/standard_list_row.dart';
+import 'package:cake_wallet/src/widgets/list_row.dart';
import 'package:cake_wallet/src/screens/transaction_details/blockexplorer_list_item.dart';
import 'package:cake_wallet/src/screens/transaction_details/standart_list_item.dart';
import 'package:cake_wallet/src/screens/base_page.dart';
@@ -42,7 +42,7 @@ class TransactionDetailsPage extends BasePage {
S.of(context).transaction_details_copied(item.title));
},
child:
- AnotherStandardListRow(title: '${item.title}:', value: item.value),
+ ListRow(title: '${item.title}:', value: item.value),
);
}
@@ -50,7 +50,7 @@ class TransactionDetailsPage extends BasePage {
return GestureDetector(
onTap: item.onTap,
child:
- AnotherStandardListRow(title: '${item.title}:', value: item.value),
+ ListRow(title: '${item.title}:', value: item.value),
);
}
diff --git a/lib/src/screens/unspent_coins/unspent_coins_details_page.dart b/lib/src/screens/unspent_coins/unspent_coins_details_page.dart
index 74fbcfdd9..d8ce24d88 100644
--- a/lib/src/screens/unspent_coins/unspent_coins_details_page.dart
+++ b/lib/src/screens/unspent_coins/unspent_coins_details_page.dart
@@ -5,7 +5,7 @@ import 'package:cake_wallet/src/widgets/standard_list.dart';
import 'package:cake_wallet/view_model/unspent_coins/unspent_coins_details_view_model.dart';
import 'package:cake_wallet/view_model/unspent_coins/unspent_coins_switch_item.dart';
import 'package:flutter/material.dart';
-import 'package:cake_wallet/src/widgets/standard_list_row.dart';
+import 'package:cake_wallet/src/widgets/list_row.dart';
import 'package:cake_wallet/src/screens/transaction_details/standart_list_item.dart';
import 'package:cake_wallet/src/screens/base_page.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
@@ -30,7 +30,7 @@ class UnspentCoinsDetailsPage extends BasePage {
final item = unspentCoinsDetailsViewModel.items[index];
if (item is StandartListItem) {
- return AnotherStandardListRow(
+ return ListRow(
title: '${item.title}:',
value: item.value);
}
diff --git a/lib/src/screens/wallet_keys/wallet_keys_page.dart b/lib/src/screens/wallet_keys/wallet_keys_page.dart
index b690cadda..e81ec7d2a 100644
--- a/lib/src/screens/wallet_keys/wallet_keys_page.dart
+++ b/lib/src/screens/wallet_keys/wallet_keys_page.dart
@@ -7,7 +7,7 @@ import 'package:flutter/services.dart';
import 'package:flutter_mobx/flutter_mobx.dart';
import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/src/widgets/standard_list_row.dart';
+import 'package:cake_wallet/src/widgets/list_row.dart';
import 'package:cake_wallet/view_model/wallet_keys_view_model.dart';
class WalletKeysPage extends BasePage {
@@ -58,7 +58,7 @@ class WalletKeysPage extends BasePage {
height: 1,
padding: EdgeInsets.only(left: 24),
color: Theme.of(context).accentTextTheme!.headline6!.backgroundColor!,
- child: SectionDivider(),
+ child: const SectionDivider(),
),
itemCount: walletKeysViewModel.items.length,
itemBuilder: (BuildContext context, int index) {
@@ -69,7 +69,7 @@ class WalletKeysPage extends BasePage {
Clipboard.setData(ClipboardData(text: item.value));
showBar<void>(context, S.of(context).copied_key_to_clipboard(item.title));
},
- child: AnotherStandardListRow(
+ child: ListRow(
title: item.title + ':',
value: item.value,
),
diff --git a/lib/src/widgets/base_alert_dialog.dart b/lib/src/widgets/base_alert_dialog.dart
index 861d1ba9d..effbbc562 100644
--- a/lib/src/widgets/base_alert_dialog.dart
+++ b/lib/src/widgets/base_alert_dialog.dart
@@ -77,7 +77,7 @@ class BaseAlertDialog extends StatelessWidget {
),
)),
),
- SectionDivider(),
+ const SectionDivider(),
Expanded(
child: TextButton(
onPressed: actionRight,
@@ -138,7 +138,7 @@ class BaseAlertDialog extends StatelessWidget {
isDividerExists
? Padding(
padding: EdgeInsets.only(top: 16, bottom: 8),
- child: SectionDivider(),
+ child: const SectionDivider(),
)
: Offstage(),
Padding(
@@ -147,7 +147,7 @@ class BaseAlertDialog extends StatelessWidget {
)
],
),
- SectionDivider(),
+ const SectionDivider(),
actionButtons(context)
],
),
diff --git a/lib/src/widgets/standard_list_row.dart b/lib/src/widgets/list_row.dart
similarity index 96%
rename from lib/src/widgets/standard_list_row.dart
rename to lib/src/widgets/list_row.dart
index e174acc50..40824fe59 100644
--- a/lib/src/widgets/standard_list_row.dart
+++ b/lib/src/widgets/list_row.dart
@@ -1,8 +1,8 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
-class AnotherStandardListRow extends StatelessWidget {
- AnotherStandardListRow(
+class ListRow extends StatelessWidget {
+ ListRow(
{required this.title,
required this.value,
this.titleFontSize = 14,