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

CAKE-222 | applied adaptive picker to send and settings pages

Browse source
This commit is contained in:
OleksandrSobol 2021-01-08 18:49:28 +02:00
parent 0e721b7795
commit 39e91c74cd
6 changed files with 7 additions and 17 deletions

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

@ -751,7 +751,6 @@ class SendPage extends BasePage {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
onItemSelected: (TransactionPriority priority) => onItemSelected: (TransactionPriority priority) =>
sendViewModel.setTransactionPriority(priority), sendViewModel.setTransactionPriority(priority),
isAlwaysShowScrollThumb: isShowScrollThumb,
), ),
context: context); context: context);
} }

1
lib/src/screens/settings/settings.dart
View file

@ -43,7 +43,6 @@ class SettingsPage extends BasePage {
return SettingsPickerCell<dynamic>( return SettingsPickerCell<dynamic>(
title: item.title, title: item.title,
selectedItem: item.selectedItem(), selectedItem: item.selectedItem(),
isAlwaysShowScrollThumb: item.isAlwaysShowScrollThumb,
items: item.items, items: item.items,
onItemSelected: (dynamic value) => item.onItemSelected(value), onItemSelected: (dynamic value) => item.onItemSelected(value),
); );

5
lib/src/screens/settings/widgets/settings_picker_cell.dart
View file

@ -9,8 +9,7 @@ class SettingsPickerCell<ItemType> extends StandardListRow {
{@required String title, {@required String title,
this.selectedItem, this.selectedItem,
this.items, this.items,
this.onItemSelected, this.onItemSelected})
this.isAlwaysShowScrollThumb})
: super( : super(
title: title, title: title,
isSelected: false, isSelected: false,
@ -24,7 +23,6 @@ class SettingsPickerCell<ItemType> extends StandardListRow {
selectedAtIndex: selectedAtIndex, selectedAtIndex: selectedAtIndex,
title: S.current.please_select, title: S.current.please_select,
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
isAlwaysShowScrollThumb: isAlwaysShowScrollThumb,
onItemSelected: (ItemType item) => onItemSelected: (ItemType item) =>
onItemSelected?.call(item))); onItemSelected?.call(item)));
}); });
@ -32,7 +30,6 @@ class SettingsPickerCell<ItemType> extends StandardListRow {
final ItemType selectedItem; final ItemType selectedItem;
final List<ItemType> items; final List<ItemType> items;
final void Function(ItemType item) onItemSelected; final void Function(ItemType item) onItemSelected;
final bool isAlwaysShowScrollThumb;
@override @override
Widget buildTrailing(BuildContext context) { Widget buildTrailing(BuildContext context) {

10
lib/src/widgets/picker.dart
View file

@ -15,7 +15,6 @@ class Picker<Item extends Object> extends StatefulWidget {
this.description, this.description,
@required this.onItemSelected, @required this.onItemSelected,
this.mainAxisAlignment = MainAxisAlignment.start, this.mainAxisAlignment = MainAxisAlignment.start,
this.isAlwaysShowScrollThumb = false
}); });
final int selectedAtIndex; final int selectedAtIndex;
@ -25,7 +24,6 @@ class Picker<Item extends Object> extends StatefulWidget {
final String description; final String description;
final Function(Item) onItemSelected; final Function(Item) onItemSelected;
final MainAxisAlignment mainAxisAlignment; final MainAxisAlignment mainAxisAlignment;
final bool isAlwaysShowScrollThumb;
@override @override
PickerState createState() => PickerState<Item>(items, images, onItemSelected); PickerState createState() => PickerState<Item>(items, images, onItemSelected);
@ -56,6 +54,8 @@ class PickerState<Item> extends State<Picker> {
setState(() {}); setState(() {});
}); });
final isShowScrollThumb = items != null ? items.length > 3 : false;
return AlertBackground( return AlertBackground(
child: Stack( child: Stack(
alignment: Alignment.center, alignment: Alignment.center,
@ -168,13 +168,13 @@ class PickerState<Item> extends State<Picker> {
) )
) )
: Offstage(), : Offstage(),
widget.isAlwaysShowScrollThumb isShowScrollThumb
? CakeScrollbar( ? CakeScrollbar(
backgroundHeight: backgroundHeight, backgroundHeight: backgroundHeight,
thumbHeight: thumbHeight, thumbHeight: thumbHeight,
fromTop: fromTop fromTop: fromTop
) )
: Offstage(), : Offstage(),
], ],
) )
), ),

4
lib/view_model/settings/picker_list_item.dart
View file

@ -6,15 +6,13 @@ class PickerListItem<ItemType> extends SettingsListItem {
{@required String title, {@required String title,
@required this.selectedItem, @required this.selectedItem,
@required this.items, @required this.items,
void Function(ItemType item) onItemSelected, void Function(ItemType item) onItemSelected})
this.isAlwaysShowScrollThumb = false})
: _onItemSelected = onItemSelected, : _onItemSelected = onItemSelected,
super(title); super(title);
final ItemType Function() selectedItem; final ItemType Function() selectedItem;
final List<ItemType> items; final List<ItemType> items;
final void Function(ItemType item) _onItemSelected; final void Function(ItemType item) _onItemSelected;
final bool isAlwaysShowScrollThumb;
void onItemSelected(dynamic item) { void onItemSelected(dynamic item) {
if (item is ItemType) { if (item is ItemType) {

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

@ -55,7 +55,6 @@ abstract class SettingsViewModelBase with Store {
PickerListItem( PickerListItem(
title: S.current.settings_currency, title: S.current.settings_currency,
items: FiatCurrency.all, items: FiatCurrency.all,
isAlwaysShowScrollThumb: true,
selectedItem: () => fiatCurrency, selectedItem: () => fiatCurrency,
onItemSelected: (FiatCurrency currency) => onItemSelected: (FiatCurrency currency) =>
setFiatCurrency(currency)), setFiatCurrency(currency)),
@ -63,8 +62,6 @@ abstract class SettingsViewModelBase with Store {
title: S.current.settings_fee_priority, title: S.current.settings_fee_priority,
items: TransactionPriority.forWalletType(wallet.type), items: TransactionPriority.forWalletType(wallet.type),
selectedItem: () => transactionPriority, selectedItem: () => transactionPriority,
isAlwaysShowScrollThumb:
TransactionPriority.forWalletType(wallet.type).length > 3,
onItemSelected: (TransactionPriority priority) => onItemSelected: (TransactionPriority priority) =>
_settingsStore.transactionPriority = priority), _settingsStore.transactionPriority = priority),
SwitcherListItem( SwitcherListItem(