diff --git a/assets/default_themes/dark.zip b/assets/default_themes/dark.zip index eb20d7e6e..f69e936f2 100644 Binary files a/assets/default_themes/dark.zip and b/assets/default_themes/dark.zip differ diff --git a/assets/default_themes/light.zip b/assets/default_themes/light.zip index 0048f661c..672fe6d49 100644 Binary files a/assets/default_themes/light.zip and b/assets/default_themes/light.zip differ diff --git a/crypto_plugins/flutter_liblelantus b/crypto_plugins/flutter_liblelantus index 032407f0f..b654bf448 160000 --- a/crypto_plugins/flutter_liblelantus +++ b/crypto_plugins/flutter_liblelantus @@ -1 +1 @@ -Subproject commit 032407f0f7734f3cec3eefba76c5dc587b9a252d +Subproject commit b654bf4488357c8a104900e11f9468d54a39f22b diff --git a/lib/models/isar/models/blockchain_data/address.dart b/lib/models/isar/models/blockchain_data/address.dart index 76d69f104..e3314d754 100644 --- a/lib/models/isar/models/blockchain_data/address.dart +++ b/lib/models/isar/models/blockchain_data/address.dart @@ -170,11 +170,11 @@ enum AddressType { String get readableName { switch (this) { case AddressType.p2pkh: - return "Legacy"; + return "P2PKH"; case AddressType.p2sh: return "Wrapped segwit"; case AddressType.p2wpkh: - return "Segwit"; + return "P2WPKH (segwit)"; case AddressType.cryptonote: return "Cryptonote"; case AddressType.mimbleWimble: @@ -200,7 +200,7 @@ enum AddressType { case AddressType.solana: return "Solana"; case AddressType.p2tr: - return "Taproot"; // Why not use P2TR, P2PKH, etc.? + return "P2TR (taproot)"; } } } diff --git a/lib/pages/receive_view/receive_view.dart b/lib/pages/receive_view/receive_view.dart index d1f9e23c4..f96e83274 100644 --- a/lib/pages/receive_view/receive_view.dart +++ b/lib/pages/receive_view/receive_view.dart @@ -33,6 +33,7 @@ import 'package:stackwallet/utilities/enums/coin_enum.dart'; import 'package:stackwallet/utilities/enums/derive_path_type_enum.dart'; import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/wallets/isar/providers/wallet_info_provider.dart'; +import 'package:stackwallet/wallets/wallet/impl/bitcoin_wallet.dart'; import 'package:stackwallet/wallets/wallet/intermediate/bip39_hd_wallet.dart'; import 'package:stackwallet/wallets/wallet/wallet_mixin_interfaces/bcash_interface.dart'; import 'package:stackwallet/wallets/wallet/wallet_mixin_interfaces/multi_address_interface.dart'; @@ -198,6 +199,10 @@ class _ReceiveViewState extends ConsumerState { } } + if (_walletAddressTypes.length > 1 && wallet is BitcoinWallet) { + _walletAddressTypes.removeWhere((e) => e == AddressType.p2pkh); + } + _addressMap[_walletAddressTypes[_currentIndex]] = ref.read(pWalletReceivingAddress(walletId)); @@ -389,7 +394,11 @@ class _ReceiveViewState extends ConsumerState { DropdownMenuItem( value: i, child: Text( - "${_walletAddressTypes[i].readableName} address", + _supportsSpark && + _walletAddressTypes[i] == + AddressType.p2pkh + ? "Transparent address" + : "${_walletAddressTypes[i].readableName} address", style: STextStyles.w500_14(context), ), ), diff --git a/lib/pages/send_view/sub_widgets/firo_balance_selection_sheet.dart b/lib/pages/send_view/sub_widgets/firo_balance_selection_sheet.dart index 8c01cac9a..6206f13f7 100644 --- a/lib/pages/send_view/sub_widgets/firo_balance_selection_sheet.dart +++ b/lib/pages/send_view/sub_widgets/firo_balance_selection_sheet.dart @@ -173,85 +173,91 @@ class _FiroBalanceSelectionSheetState ), ), ), - const SizedBox( - height: 16, - ), - GestureDetector( - onTap: () { - final state = - ref.read(publicPrivateBalanceStateProvider.state).state; - if (state != FiroType.lelantus) { - ref.read(publicPrivateBalanceStateProvider.state).state = - FiroType.lelantus; - } - Navigator.of(context).pop(); - }, - child: Container( - color: Colors.transparent, - child: Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Column( - mainAxisAlignment: MainAxisAlignment.start, - children: [ - SizedBox( - width: 20, - height: 20, - child: Radio( - activeColor: Theme.of(context) - .extension()! - .radioButtonIconEnabled, - value: FiroType.lelantus, - groupValue: ref - .watch( - publicPrivateBalanceStateProvider.state) - .state, - onChanged: (x) { - ref - .read(publicPrivateBalanceStateProvider - .state) - .state = FiroType.lelantus; - - Navigator.of(context).pop(); - }, - ), - ), - ], - ), - const SizedBox( - width: 12, - ), - Flexible( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, + if (firoWallet.info.cachedBalanceSecondary.spendable.raw > + BigInt.zero) + const SizedBox( + height: 16, + ), + if (firoWallet.info.cachedBalanceSecondary.spendable.raw > + BigInt.zero) + GestureDetector( + onTap: () { + final state = ref + .read(publicPrivateBalanceStateProvider.state) + .state; + if (state != FiroType.lelantus) { + ref + .read(publicPrivateBalanceStateProvider.state) + .state = FiroType.lelantus; + } + Navigator.of(context).pop(); + }, + child: Container( + color: Colors.transparent, + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Column( + mainAxisAlignment: MainAxisAlignment.start, children: [ - // Row( - // children: [ - Text( - "Lelantus balance", - style: STextStyles.titleBold12(context), - textAlign: TextAlign.left, - ), - const SizedBox( - width: 2, - ), - Text( - ref.watch(pAmountFormatter(coin)).format( - firoWallet.info.cachedBalanceSecondary - .spendable, - ), - style: STextStyles.itemSubtitle(context), - textAlign: TextAlign.left, + SizedBox( + width: 20, + height: 20, + child: Radio( + activeColor: Theme.of(context) + .extension()! + .radioButtonIconEnabled, + value: FiroType.lelantus, + groupValue: ref + .watch(publicPrivateBalanceStateProvider + .state) + .state, + onChanged: (x) { + ref + .read(publicPrivateBalanceStateProvider + .state) + .state = FiroType.lelantus; + + Navigator.of(context).pop(); + }, + ), ), ], ), - // ], - // ), - ) - ], + const SizedBox( + width: 12, + ), + Flexible( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + // Row( + // children: [ + Text( + "Lelantus balance", + style: STextStyles.titleBold12(context), + textAlign: TextAlign.left, + ), + const SizedBox( + width: 2, + ), + Text( + ref.watch(pAmountFormatter(coin)).format( + firoWallet.info.cachedBalanceSecondary + .spendable, + ), + style: STextStyles.itemSubtitle(context), + textAlign: TextAlign.left, + ), + ], + ), + // ], + // ), + ) + ], + ), ), ), - ), const SizedBox( height: 16, ), diff --git a/lib/pages/wallet_view/sub_widgets/wallet_balance_toggle_sheet.dart b/lib/pages/wallet_view/sub_widgets/wallet_balance_toggle_sheet.dart index 45483e9d0..af0eca1c6 100644 --- a/lib/pages/wallet_view/sub_widgets/wallet_balance_toggle_sheet.dart +++ b/lib/pages/wallet_view/sub_widgets/wallet_balance_toggle_sheet.dart @@ -33,9 +33,9 @@ enum _BalanceType { class WalletBalanceToggleSheet extends ConsumerWidget { const WalletBalanceToggleSheet({ - Key? key, + super.key, required this.walletId, - }) : super(key: key); + }); final String walletId; @@ -46,7 +46,7 @@ class WalletBalanceToggleSheet extends ConsumerWidget { final coin = ref.watch(pWalletCoin(walletId)); final isFiro = coin == Coin.firo || coin == Coin.firoTestNet; - Balance balance = ref.watch(pWalletBalance(walletId)); + final balance = ref.watch(pWalletBalance(walletId)); _BalanceType _bal = ref.watch(walletBalanceToggleStateProvider.state).state == @@ -77,6 +77,11 @@ class WalletBalanceToggleSheet extends ConsumerWidget { // already set above break; } + + // hack to not show lelantus balance in ui if zero + if (balanceSecondary?.spendable.raw == BigInt.zero) { + balanceSecondary = null; + } } return Container( @@ -289,7 +294,7 @@ class WalletBalanceToggleSheet extends ConsumerWidget { class BalanceSelector extends ConsumerWidget { const BalanceSelector({ - Key? key, + super.key, required this.title, required this.coin, required this.balance, @@ -297,7 +302,7 @@ class BalanceSelector extends ConsumerWidget { required this.onChanged, required this.value, required this.groupValue, - }) : super(key: key); + }); final String title; final Coin coin; diff --git a/lib/pages/wallet_view/wallet_view.dart b/lib/pages/wallet_view/wallet_view.dart index a211cddd8..20bd28575 100644 --- a/lib/pages/wallet_view/wallet_view.dart +++ b/lib/pages/wallet_view/wallet_view.dart @@ -170,7 +170,9 @@ class _WalletViewState extends ConsumerState { final wallet = ref.read(pWallets).getWallet(walletId); coin = wallet.info.coin; - ref.read(currentWalletIdProvider.notifier).state = wallet.walletId; + WidgetsBinding.instance.addPostFrameCallback((_) { + ref.read(currentWalletIdProvider.notifier).state = wallet.walletId; + }); if (!wallet.shouldAutoSync) { // enable auto sync if it wasn't enabled when loading wallet diff --git a/lib/themes/theme_service.dart b/lib/themes/theme_service.dart index 01134da66..b41775ee6 100644 --- a/lib/themes/theme_service.dart +++ b/lib/themes/theme_service.dart @@ -29,7 +29,7 @@ final pThemeService = Provider((ref) { }); class ThemeService { - static const _currentDefaultThemeVersion = 4; + static const _currentDefaultThemeVersion = 8; ThemeService._(); static ThemeService? _instance; static ThemeService get instance => _instance ??= ThemeService._(); diff --git a/lib/widgets/rounded_date_picker/LICENSE b/lib/widgets/rounded_date_picker/LICENSE deleted file mode 100644 index 58665fbd2..000000000 --- a/lib/widgets/rounded_date_picker/LICENSE +++ /dev/null @@ -1,5 +0,0 @@ -Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in compliance with the License. You may obtain a copy of the License in the LICENSE file, or at: - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. \ No newline at end of file diff --git a/lib/widgets/rounded_date_picker/flutter_rounded_date_picker_dialog.dart b/lib/widgets/rounded_date_picker/flutter_rounded_date_picker_dialog.dart deleted file mode 100644 index 3c8ff39bb..000000000 --- a/lib/widgets/rounded_date_picker/flutter_rounded_date_picker_dialog.dart +++ /dev/null @@ -1,342 +0,0 @@ -/* - * This file is part of Stack Wallet. - * - * Copyright (c) 2023 Cypher Stack - * All Rights Reserved. - * The code is distributed under GPLv3 license, see LICENSE file for details. - * Generated by Cypher Stack on 2023-05-26 - * - */ - -import 'package:flutter/material.dart'; -import 'package:flutter/semantics.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter_rounded_date_picker/flutter_rounded_date_picker.dart'; -import 'package:flutter_rounded_date_picker/src/flutter_rounded_button_action.dart'; -import 'package:flutter_rounded_date_picker/src/material_rounded_date_picker_style.dart'; -import 'package:flutter_rounded_date_picker/src/material_rounded_year_picker_style.dart'; -import 'package:flutter_rounded_date_picker/src/widgets/flutter_rounded_date_picker_header.dart'; -import 'package:flutter_rounded_date_picker/src/widgets/flutter_rounded_day_picker.dart'; -import 'package:flutter_rounded_date_picker/src/widgets/flutter_rounded_month_picker.dart'; -import 'package:flutter_rounded_date_picker/src/widgets/flutter_rounded_year_picker.dart'; -import 'package:stackwallet/utilities/util.dart'; - -/// -/// This file uses code taken from https://github.com/benznest/flutter_rounded_date_picker -/// - -class FlutterRoundedDatePickerDialog extends StatefulWidget { - const FlutterRoundedDatePickerDialog( - {Key? key, - this.height, - required this.initialDate, - required this.firstDate, - required this.lastDate, - this.selectableDayPredicate, - required this.initialDatePickerMode, - required this.era, - this.locale, - required this.borderRadius, - this.imageHeader, - this.description = "", - this.fontFamily, - this.textNegativeButton, - this.textPositiveButton, - this.textActionButton, - this.onTapActionButton, - this.styleDatePicker, - this.styleYearPicker, - this.customWeekDays, - this.builderDay, - this.listDateDisabled, - this.onTapDay, - this.onMonthChange}) - : super(key: key); - - final DateTime initialDate; - final DateTime firstDate; - final DateTime lastDate; - final SelectableDayPredicate? selectableDayPredicate; - final DatePickerMode initialDatePickerMode; - - /// double height. - final double? height; - - /// Custom era year. - final EraMode era; - final Locale? locale; - - /// Border - final double borderRadius; - - /// Header; - final ImageProvider? imageHeader; - final String description; - - /// Font - final String? fontFamily; - - /// Button - final String? textNegativeButton; - final String? textPositiveButton; - final String? textActionButton; - - final VoidCallback? onTapActionButton; - - /// Style - final MaterialRoundedDatePickerStyle? styleDatePicker; - final MaterialRoundedYearPickerStyle? styleYearPicker; - - /// Custom Weekday - final List? customWeekDays; - - final BuilderDayOfDatePicker? builderDay; - - final List? listDateDisabled; - final OnTapDay? onTapDay; - - final Function? onMonthChange; - - @override - _FlutterRoundedDatePickerDialogState createState() => - _FlutterRoundedDatePickerDialogState(); -} - -class _FlutterRoundedDatePickerDialogState - extends State { - @override - void initState() { - super.initState(); - _selectedDate = widget.initialDate; - _mode = widget.initialDatePickerMode; - } - - bool _announcedInitialDate = false; - - late MaterialLocalizations localizations; - late TextDirection textDirection; - - @override - void didChangeDependencies() { - super.didChangeDependencies(); - localizations = MaterialLocalizations.of(context); - textDirection = Directionality.of(context); - if (!_announcedInitialDate) { - _announcedInitialDate = true; - SemanticsService.announce( - localizations.formatFullDate(_selectedDate), - textDirection, - ); - } - } - - late DateTime _selectedDate; - late DatePickerMode _mode; - final GlobalKey _pickerKey = GlobalKey(); - - void _vibrate() { - switch (Theme.of(context).platform) { - case TargetPlatform.android: - case TargetPlatform.fuchsia: - HapticFeedback.vibrate(); - break; - case TargetPlatform.iOS: - default: - break; - } - } - - void _handleModeChanged(DatePickerMode mode) { - _vibrate(); - setState(() { - _mode = mode; - if (_mode == DatePickerMode.day) { - SemanticsService.announce( - localizations.formatMonthYear(_selectedDate), - textDirection, - ); - } else { - SemanticsService.announce( - localizations.formatYear(_selectedDate), - textDirection, - ); - } - }); - } - - Future _handleYearChanged(DateTime value) async { - if (value.isBefore(widget.firstDate)) { - value = widget.firstDate; - } else if (value.isAfter(widget.lastDate)) { - value = widget.lastDate; - } - if (value == _selectedDate) return; - - if (widget.onMonthChange != null) await widget.onMonthChange!(value); - - _vibrate(); - setState(() { - _mode = DatePickerMode.day; - _selectedDate = value; - }); - } - - void _handleDayChanged(DateTime value) { - _vibrate(); - setState(() { - _selectedDate = value; - }); - } - - void _handleCancel() { - Navigator.of(context).pop(); - } - - void _handleOk() { - Navigator.of(context).pop(_selectedDate); - } - - Widget _buildPicker() { - switch (_mode) { - case DatePickerMode.year: - return FlutterRoundedYearPicker( - key: _pickerKey, - selectedDate: _selectedDate, - onChanged: (DateTime date) async => await _handleYearChanged(date), - firstDate: widget.firstDate, - lastDate: widget.lastDate, - era: widget.era, - fontFamily: widget.fontFamily, - style: widget.styleYearPicker, - ); - case DatePickerMode.day: - default: - return FlutterRoundedMonthPicker( - key: _pickerKey, - selectedDate: _selectedDate, - onChanged: _handleDayChanged, - firstDate: widget.firstDate, - lastDate: widget.lastDate, - era: widget.era, - locale: widget.locale, - selectableDayPredicate: widget.selectableDayPredicate, - fontFamily: widget.fontFamily, - style: widget.styleDatePicker, - borderRadius: widget.borderRadius, - customWeekDays: widget.customWeekDays, - builderDay: widget.builderDay, - listDateDisabled: widget.listDateDisabled, - onTapDay: widget.onTapDay, - onMonthChange: widget.onMonthChange); - } - } - - @override - Widget build(BuildContext context) { - final ThemeData theme = Theme.of(context); - final Widget picker = _buildPicker(); - final isDesktop = Util.isDesktop; - - final Widget actions = FlutterRoundedButtonAction( - textButtonNegative: widget.textNegativeButton, - textButtonPositive: widget.textPositiveButton, - onTapButtonNegative: _handleCancel, - onTapButtonPositive: _handleOk, - textActionButton: widget.textActionButton, - onTapButtonAction: widget.onTapActionButton, - localizations: localizations, - textStyleButtonNegative: widget.styleDatePicker?.textStyleButtonNegative, - textStyleButtonPositive: widget.styleDatePicker?.textStyleButtonPositive, - textStyleButtonAction: widget.styleDatePicker?.textStyleButtonAction, - borderRadius: widget.borderRadius, - paddingActionBar: widget.styleDatePicker?.paddingActionBar, - background: widget.styleDatePicker?.backgroundActionBar, - ); - - Color backgroundPicker = theme.dialogBackgroundColor; - if (_mode == DatePickerMode.day) { - backgroundPicker = widget.styleDatePicker?.backgroundPicker ?? - theme.dialogBackgroundColor; - } else { - backgroundPicker = widget.styleYearPicker?.backgroundPicker ?? - theme.dialogBackgroundColor; - } - - final Dialog dialog = Dialog( - child: OrientationBuilder( - builder: (BuildContext context, Orientation orientation) { - final Widget header = FlutterRoundedDatePickerHeader( - selectedDate: _selectedDate, - mode: _mode, - onModeChanged: _handleModeChanged, - orientation: orientation, - era: widget.era, - borderRadius: widget.borderRadius, - imageHeader: widget.imageHeader, - description: widget.description, - fontFamily: widget.fontFamily, - style: widget.styleDatePicker); - switch (orientation) { - case Orientation.landscape: - return Container( - height: isDesktop ? 600 : null, - width: isDesktop ? 700 : null, - decoration: BoxDecoration( - color: backgroundPicker, - borderRadius: BorderRadius.circular(widget.borderRadius), - ), - child: Row( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Flexible(flex: 1, child: header), - Flexible( - flex: 2, // have the picker take up 2/3 of the dialog width - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - SizedBox( - height: isDesktop ? 530 : null, - width: isDesktop ? 700 : null, - child: picker), - actions, - ], - ), - ), - ], - ), - ); - case Orientation.portrait: - default: - return Container( - decoration: BoxDecoration( - color: backgroundPicker, - borderRadius: BorderRadius.circular(widget.borderRadius), - ), - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - header, - if (widget.height == null) - Flexible(child: picker) - else - SizedBox( - height: widget.height, - child: picker, - ), - actions, - ], - ), - ); - } - }), - ); - - return Theme( - data: theme.copyWith(dialogBackgroundColor: Colors.transparent), - child: dialog, - ); - } -} diff --git a/lib/widgets/rounded_date_picker/flutter_rounded_date_picker_widget.dart b/lib/widgets/rounded_date_picker/flutter_rounded_date_picker_widget.dart deleted file mode 100644 index 6f6db0580..000000000 --- a/lib/widgets/rounded_date_picker/flutter_rounded_date_picker_widget.dart +++ /dev/null @@ -1,226 +0,0 @@ -/* - * This file is part of Stack Wallet. - * - * Copyright (c) 2023 Cypher Stack - * All Rights Reserved. - * The code is distributed under GPLv3 license, see LICENSE file for details. - * Generated by Cypher Stack on 2023-05-26 - * - */ - -// Copyright 2015 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -import 'dart:async'; - -import 'package:flutter/material.dart'; -import 'package:flutter/rendering.dart'; -import 'package:flutter/widgets.dart'; -// import 'package:flutter_rounded_date_picker/src/dialogs/flutter_rounded_date_picker_dialog.dart'; -import 'package:flutter_rounded_date_picker/src/era_mode.dart'; -import 'package:flutter_rounded_date_picker/src/material_rounded_date_picker_style.dart'; -import 'package:flutter_rounded_date_picker/src/material_rounded_year_picker_style.dart'; -import 'package:flutter_rounded_date_picker/src/widgets/flutter_rounded_day_picker.dart'; -import 'package:stackwallet/widgets/rounded_date_picker/flutter_rounded_date_picker_dialog.dart'; - -/// -/// This file uses code taken from https://github.com/benznest/flutter_rounded_date_picker -/// - -// Examples can assume: -// BuildContext context; - -/// Initial display mode of the date picker dialog. -/// -/// Date picker UI mode for either showing a list of available years or a -/// monthly calendar initially in the dialog shown by calling [showDatePicker]. -/// - -// Shows the selected date in large font and toggles between year and day mode - -/// Signature for predicating dates for enabled date selections. -/// -/// See [showDatePicker]. -typedef SelectableDayPredicate = bool Function(DateTime day); - -/// Shows a dialog containing a material design date picker. -/// -/// The returned [Future] resolves to the date selected by the user when the -/// user closes the dialog. If the user cancels the dialog, null is returned. -/// -/// An optional [selectableDayPredicate] function can be passed in to customize -/// the days to enable for selection. If provided, only the days that -/// [selectableDayPredicate] returned true for will be selectable. -/// -/// An optional [initialDatePickerMode] argument can be used to display the -/// date picker initially in the year or month+day picker mode. It defaults -/// to month+day, and must not be null. -/// -/// An optional [locale] argument can be used to set the locale for the date -/// picker. It defaults to the ambient locale provided by [Localizations]. -/// -/// An optional [textDirection] argument can be used to set the text direction -/// (RTL or LTR) for the date picker. It defaults to the ambient text direction -/// provided by [Directionality]. If both [locale] and [textDirection] are not -/// null, [textDirection] overrides the direction chosen for the [locale]. -/// -/// The [context] argument is passed to [showDialog], the documentation for -/// which discusses how it is used. -/// -/// The [builder] parameter can be used to wrap the dialog widget -/// to add inherited widgets like [Theme]. -/// -/// {@tool sample} -/// Show a date picker with the dark theme. -/// -/// ```dart -/// Future selectedDate = showDatePicker( -/// context: context, -/// initialDate: DateTime.now(), -/// firstDate: DateTime(2018), -/// lastDate: DateTime(2030), -/// builder: (BuildContext context, Widget child) { -/// return Theme( -/// data: ThemeData.dark(), -/// child: child, -/// ); -/// }, -/// ); -/// ``` -/// {@end-tool} -/// -/// The [context], [initialDate], [firstDate], and [lastDate] parameters must -/// not be null. -/// -/// See also: -/// -/// * [showTimePicker], which shows a dialog that contains a material design -/// time picker. -/// * [DayPicker], which displays the days of a given month and allows -/// choosing a day. -/// * [MonthPicker], which displays a scrollable list of months to allow -/// picking a month. -/// * [YearPicker], which displays a scrollable list of years to allow picking -/// a year. -/// - -Future showRoundedDatePicker( - {required BuildContext context, - double? height, - DateTime? initialDate, - DateTime? firstDate, - DateTime? lastDate, - SelectableDayPredicate? selectableDayPredicate, - DatePickerMode initialDatePickerMode = DatePickerMode.day, - Locale? locale, - TextDirection? textDirection, - ThemeData? theme, - double borderRadius = 16, - EraMode era = EraMode.CHRIST_YEAR, - ImageProvider? imageHeader, - String description = "", - String? fontFamily, - bool barrierDismissible = false, - Color background = Colors.transparent, - String? textNegativeButton, - String? textPositiveButton, - String? textActionButton, - VoidCallback? onTapActionButton, - MaterialRoundedDatePickerStyle? styleDatePicker, - MaterialRoundedYearPickerStyle? styleYearPicker, - List? customWeekDays, - BuilderDayOfDatePicker? builderDay, - List? listDateDisabled, - OnTapDay? onTapDay, - Function? onMonthChange}) async { - initialDate ??= DateTime.now(); - firstDate ??= DateTime(initialDate.year - 1); - lastDate ??= DateTime(initialDate.year + 1); - theme ??= ThemeData(); - - assert( - !initialDate.isBefore(firstDate), - 'initialDate must be on or after firstDate', - ); - assert( - !initialDate.isAfter(lastDate), - 'initialDate must be on or before lastDate', - ); - assert( - !firstDate.isAfter(lastDate), - 'lastDate must be on or after firstDate', - ); - assert( - selectableDayPredicate == null || selectableDayPredicate(initialDate), - 'Provided initialDate must satisfy provided selectableDayPredicate', - ); - assert( - (onTapActionButton != null && textActionButton != null) || - onTapActionButton == null, - "If you provide onLeftBtn, you must provide leftBtn", - ); - assert(debugCheckHasMaterialLocalizations(context)); - - Widget child = GestureDetector( - onTap: () { - if (!barrierDismissible) { - Navigator.pop(context); - } - }, - child: Container( - color: background, - child: GestureDetector( - onTap: () { - // - }, - child: FlutterRoundedDatePickerDialog( - height: height, - initialDate: initialDate, - firstDate: firstDate, - lastDate: lastDate, - selectableDayPredicate: selectableDayPredicate, - initialDatePickerMode: initialDatePickerMode, - era: era, - locale: locale, - borderRadius: borderRadius, - imageHeader: imageHeader, - description: description, - fontFamily: fontFamily, - textNegativeButton: textNegativeButton, - textPositiveButton: textPositiveButton, - textActionButton: textActionButton, - onTapActionButton: onTapActionButton, - styleDatePicker: styleDatePicker, - styleYearPicker: styleYearPicker, - customWeekDays: customWeekDays, - builderDay: builderDay, - listDateDisabled: listDateDisabled, - onTapDay: onTapDay, - onMonthChange: onMonthChange, - ), - ), - ), - ); - - if (textDirection != null) { - child = Directionality( - textDirection: textDirection, - child: child, - ); - } - - if (locale != null) { - child = Localizations.override( - context: context, - locale: locale, - child: child, - ); - } - - return await showDialog( - context: context, - barrierDismissible: barrierDismissible, - builder: (_) => Theme(data: theme!, child: child), - ); -} diff --git a/pubspec.lock b/pubspec.lock index e937fb4d4..c4e4adb85 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -696,8 +696,8 @@ packages: dependency: "direct main" description: path: "." - ref: "65a6676e37f1bcaf2e293afbd50e50c81394276c" - resolved-ref: "65a6676e37f1bcaf2e293afbd50e50c81394276c" + ref: "439727b278250c61a291f5335c298c0f2d952517" + resolved-ref: "439727b278250c61a291f5335c298c0f2d952517" url: "https://github.com/cypherstack/flutter_libsparkmobile.git" source: git version: "0.0.1" diff --git a/pubspec.yaml b/pubspec.yaml index b3bb574a2..54c52e8f9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -33,7 +33,7 @@ dependencies: flutter_libsparkmobile: git: url: https://github.com/cypherstack/flutter_libsparkmobile.git - ref: 65a6676e37f1bcaf2e293afbd50e50c81394276c + ref: 439727b278250c61a291f5335c298c0f2d952517 flutter_libmonero: path: ./crypto_plugins/flutter_libmonero