Merge branch 'main' into CW-621-Open-external-sites-in-default-browser

lib/src/widgets/blockchain_height_widget.dart

@@ -1,3 +1,5 @@
+import 'package:cake_wallet/bitcoin/bitcoin.dart';
+import 'package:cake_wallet/src/widgets/standard_switch.dart';
 import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/utils/date_picker.dart';
 import 'package:flutter/material.dart';
@@ -12,13 +14,19 @@ class BlockchainHeightWidget extends StatefulWidget {
     this.onHeightChange,
     this.focusNode,
     this.onHeightOrDateEntered,
-    this.hasDatePicker = true})
-      : super(key: key);
+    this.hasDatePicker = true,
+    this.isSilentPaymentsScan = false,
+    this.toggleSingleScan,
+    this.doSingleScan = false,
+  }) : super(key: key);
 
   final Function(int)? onHeightChange;
   final Function(bool)? onHeightOrDateEntered;
   final FocusNode? focusNode;
   final bool hasDatePicker;
+  final bool isSilentPaymentsScan;
+  final bool doSingleScan;
+  final Function()? toggleSingleScan;
 
   @override
   State<StatefulWidget> createState() => BlockchainHeightState();
@@ -64,9 +72,10 @@ class BlockchainHeightState extends State<BlockchainHeightWidget> {
                     child: BaseTextFormField(
                       focusNode: widget.focusNode,
                       controller: restoreHeightController,
-                      keyboardType: TextInputType.numberWithOptions(
-                          signed: false, decimal: false),
-                      hintText: S.of(context).widgets_restore_from_blockheight,
+                      keyboardType: TextInputType.numberWithOptions(signed: false, decimal: false),
+                      hintText: widget.isSilentPaymentsScan
+                          ? S.of(context).silent_payments_scan_from_height
+                          : S.of(context).widgets_restore_from_blockheight,
                     )))
           ],
         ),
@@ -78,8 +87,7 @@ class BlockchainHeightState extends State<BlockchainHeightWidget> {
               style: TextStyle(
                   fontSize: 16.0,
                   fontWeight: FontWeight.w500,
-                  color:
-                      Theme.of(context).extension<CakeTextTheme>()!.titleColor),
+                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor),
             ),
           ),
           Row(
@@ -91,22 +99,47 @@ class BlockchainHeightState extends State<BlockchainHeightWidget> {
                   child: IgnorePointer(
                       child: BaseTextFormField(
                     controller: dateController,
-                    hintText: S.of(context).widgets_restore_from_date,
+                    hintText: widget.isSilentPaymentsScan
+                        ? S.of(context).silent_payments_scan_from_date
+                        : S.of(context).widgets_restore_from_date,
                   )),
                 ),
               ))
             ],
           ),
+          if (widget.isSilentPaymentsScan)
+            Padding(
+              padding: EdgeInsets.only(top: 24),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  Text(
+                    S.of(context).scan_one_block,
+                    style: TextStyle(
+                      fontSize: 14,
+                      fontWeight: FontWeight.normal,
+                      color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                    ),
+                  ),
+                  Padding(
+                    padding: const EdgeInsets.only(right: 8),
+                    child: StandardSwitch(
+                      value: widget.doSingleScan,
+                      onTaped: () => widget.toggleSingleScan?.call(),
+                    ),
+                  )
+                ],
+              ),
+            ),
           Padding(
             padding: EdgeInsets.only(left: 40, right: 40, top: 24),
             child: Text(
-              S.of(context).restore_from_date_or_blockheight,
+              widget.isSilentPaymentsScan
+                  ? S.of(context).silent_payments_scan_from_date_or_blockheight
+                  : S.of(context).restore_from_date_or_blockheight,
               textAlign: TextAlign.center,
               style: TextStyle(
-                  fontSize: 12,
-                  fontWeight: FontWeight.normal,
-                  color: Theme.of(context).hintColor
-              ),
+                  fontSize: 12, fontWeight: FontWeight.normal, color: Theme.of(context).hintColor),
             ),
           )
         ]
@@ -123,7 +156,12 @@ class BlockchainHeightState extends State<BlockchainHeightWidget> {
         lastDate: now);
 
     if (date != null) {
-      final height = monero!.getHeightByDate(date: date);
+      int height;
+      if (widget.isSilentPaymentsScan) {
+        height = bitcoin!.getHeightByDate(date: date);
+      } else {
+        height = monero!.getHeightByDate(date: date);
+      }
       setState(() {
         dateController.text = DateFormat('yyyy-MM-dd').format(date);
         restoreHeightController.text = '$height';

lib/src/widgets/dashboard_card_widget.dart

@@ -2,19 +2,28 @@ import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
 import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:flutter_svg/flutter_svg.dart';
 
 class DashBoardRoundedCardWidget extends StatelessWidget {
   DashBoardRoundedCardWidget({
     required this.onTap,
     required this.title,
     required this.subTitle,
+    this.hint,
+    this.svgPicture,
+    this.icon,
     this.onClose,
+    this.customBorder,
   });
 
   final VoidCallback onTap;
   final VoidCallback? onClose;
   final String title;
   final String subTitle;
+  final Widget? hint;
+  final SvgPicture? svgPicture;
+  final Icon? icon;
+  final double? customBorder;
 
   @override
   Widget build(BuildContext context) {
@@ -26,34 +35,56 @@ class DashBoardRoundedCardWidget extends StatelessWidget {
       child: Stack(
         children: [
           Container(
-            padding: EdgeInsets.fromLTRB(20, 20, 40, 20),
+            padding: EdgeInsets.all(20),
             width: double.infinity,
             decoration: BoxDecoration(
               color: Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
-              borderRadius: BorderRadius.circular(20),
+              borderRadius: BorderRadius.circular(customBorder ?? 20),
               border: Border.all(
                 color: Theme.of(context).extension<BalancePageTheme>()!.cardBorderColor,
               ),
             ),
             child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                Text(
-                  title,
-                  style: TextStyle(
-                    color: Theme.of(context).extension<DashboardPageTheme>()!.cardTextColor,
-                    fontSize: 24,
-                    fontWeight: FontWeight.w900,
-                  ),
+                Row(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Expanded(
+                      child: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Text(
+                            title,
+                            style: TextStyle(
+                              color:
+                                  Theme.of(context).extension<DashboardPageTheme>()!.cardTextColor,
+                              fontSize: 24,
+                              fontWeight: FontWeight.w900,
+                            ),
+                            softWrap: true,
+                          ),
+                          SizedBox(height: 5),
+                          Text(
+                            subTitle,
+                            style: TextStyle(
+                                color: Theme.of(context)
+                                    .extension<DashboardPageTheme>()!
+                                    .cardTextColor,
+                                fontWeight: FontWeight.w500,
+                                fontFamily: 'Lato'),
+                            softWrap: true,
+                          ),
+                        ],
+                      ),
+                    ),
+                    if (svgPicture != null) svgPicture!,
+                    if (icon != null) icon!
+                  ],
                 ),
-                SizedBox(height: 5),
-                Text(
-                  subTitle,
-                  style: TextStyle(
-                      color: Theme.of(context).extension<DashboardPageTheme>()!.cardTextColor,
-                      fontWeight: FontWeight.w500,
-                      fontFamily: 'Lato'),
-                )
+                if (hint != null) ...[
+                  SizedBox(height: 10),
+                  hint!,
+                ]
               ],
             ),
           ),

lib/src/widgets/setting_actions.dart

@@ -17,6 +17,7 @@ class SettingActions {
     connectionSettingAction,
     walletSettingAction,
     addressBookSettingAction,
+    silentPaymentsSettingAction,
     securityBackupSettingAction,
     privacySettingAction,
     displaySettingAction,
@@ -35,6 +36,15 @@ class SettingActions {
     supportSettingAction,
   ];
 
+  static SettingActions silentPaymentsSettingAction = SettingActions._(
+    name: (context) => S.of(context).silent_payments_settings,
+    image: 'assets/images/bitcoin_menu.png',
+    onTap: (BuildContext context) {
+      Navigator.pop(context);
+      Navigator.of(context).pushNamed(Routes.silentPaymentsSettings);
+    },
+  );
+
   static SettingActions connectionSettingAction = SettingActions._(
     name: (context) => S.of(context).connection_sync,
     image: 'assets/images/nodes_menu.png',