V4.6.3 bug fixes (#896)

* Add blocking screenshots native function to Monero.com [skip ci] * Fix seeds QR data * Update app versions and release notes [skip ci] * Update only build number for macos since it wasn't released yet [skip ci] * Fix adding sub-address * Fix Accounts Popup UI * Update app versions and release notes [skip ci] * Fix add/edit node issue * Update app versions and release notes [skip ci] * Fix input fields focus/keyboard issues * Update app versions and release notes [skip ci]
cake-tech · Apr 26, 2023 · 82b513d · 82b513d
1 parent 9d47e0e
commit 82b513d
Show file tree

Hide file tree

Showing 14 changed files with 276 additions and 182 deletions.
diff --git a/android/app/src/main/java/com/monero/app/MainActivity.java b/android/app/src/main/java/com/monero/app/MainActivity.java
@@ -23,6 +23,7 @@
 public class MainActivity extends FlutterFragmentActivity {
     final String UTILS_CHANNEL = "com.cake_wallet/native_utils";
     final int UNSTOPPABLE_DOMAIN_MIN_VERSION_SDK = 24;
+    boolean isAppSecure = false;
 
     @Override
     public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) {
@@ -48,13 +49,21 @@ private void handle(@NonNull MethodCall call, @NonNull MethodChannel.Result resu
                     handler.post(() -> result.success(bytes));
                     break;
                 case "getUnstoppableDomainAddress":
-                    int  version = Build.VERSION.SDK_INT;
+                    int version = Build.VERSION.SDK_INT;
                     if (version >= UNSTOPPABLE_DOMAIN_MIN_VERSION_SDK) {
                         getUnstoppableDomainAddress(call, result);
                     } else {
                         handler.post(() -> result.success(""));
                     }
                     break;
+                case "setIsAppSecure":
+                    isAppSecure = call.argument("isAppSecure");
+                    if (isAppSecure) {
+                        getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
+                    } else {
+                        getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
+                    }
+                    break;
                 default:
                     handler.post(() -> result.notImplemented());
             }

diff --git a/assets/text/Monerocom_Release_Notes.txt b/assets/text/Monerocom_Release_Notes.txt
@@ -1,13 +1,4 @@
-This update includes a HUGE number of usability improvements!
-Type a fiat amount in the receive screen
-Easily restore wallets from QR code
-Pay Bitcoin Lightning invoices in exchange
-Optionally disable the marketplace in display settings
-Better warning messages if trying to exchange outside the min/max limits
-More address flexibility when exchanging the currently-active wallet asset
-Modernized the seed language selection picker
-Adjusted pickers to resize if the keyboard is active
-Improved accessibility
-Click to copy additional fields in the exchange checkout
-Fix padding on some devices
-Bug fixes and code refactoring
+Fix for QR codes
+Fix for creating sub-addresses
+Fix Add/Edit nodes
+Fix issues with text/amount fields
diff --git a/assets/text/Release_Notes.txt b/assets/text/Release_Notes.txt
@@ -1,16 +1,4 @@
-This update includes a HUGE number of usability improvements!
-BTC/LTC coin control enhancements and bugfixes; easily look up Ordinals
-Type a fiat amount in the receive screen
-New Onramper Buy widget
-Easily restore wallets from QR code
-Substantially better reliability for seeing incoming, unconfirmed BTC/LTC transactions
-Pay Bitcoin Lightning invoices in exchange
-Optionally disable the marketplace in display settings
-Better warning messages if trying to exchange outside the min/max limits
-More address flexibility when exchanging the currently-active wallet asset
-Modernized the seed language selection picker
-Adjusted pickers to resize if the keyboard is active
-Improved accessibility
-Click to copy additional fields in the exchange checkout
-Fix padding on some devices
-Bug fixes and code refactoring
+Fix for QR codes
+Fix for creating sub-addresses
+Fix Add/Edit nodes
+Fix issues with text/amount fields
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -115,6 +115,8 @@ PODS:
     - Flutter
   - flutter_secure_storage (3.3.1):
     - Flutter
+  - in_app_review (0.2.0):
+    - Flutter
   - local_auth_ios (0.0.1):
     - Flutter
   - MTBBarcodeScanner (5.0.11)
@@ -165,6 +167,7 @@ DEPENDENCIES:
   - flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
   - flutter_mailer (from `.symlinks/plugins/flutter_mailer/ios`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
+  - in_app_review (from `.symlinks/plugins/in_app_review/ios`)
   - local_auth_ios (from `.symlinks/plugins/local_auth_ios/ios`)
   - package_info (from `.symlinks/plugins/package_info/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`)
@@ -220,6 +223,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/flutter_mailer/ios"
   flutter_secure_storage:
     :path: ".symlinks/plugins/flutter_secure_storage/ios"
+  in_app_review:
+    :path: ".symlinks/plugins/in_app_review/ios"
   local_auth_ios:
     :path: ".symlinks/plugins/local_auth_ios/ios"
   package_info:
@@ -260,6 +265,7 @@ SPEC CHECKSUMS:
   flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721
   flutter_mailer: 2ef5a67087bc8c6c4cefd04a178bf1ae2c94cd83
   flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
+  in_app_review: 318597b3a06c22bb46dc454d56828c85f444f99d
   local_auth_ios: c6cf091ded637a88f24f86a8875d8b0f526e2605
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
   OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c

diff --git a/lib/src/screens/base_page.dart b/lib/src/screens/base_page.dart
@@ -1,5 +1,4 @@
 import 'package:cake_wallet/themes/theme_base.dart';
-import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/palette.dart';
@@ -21,8 +20,6 @@ abstract class BasePage extends StatelessWidget {
 
   String? get title => null;
 
-  bool get canUseCloseIcon => false;
-
   Color get backgroundLightColor => Colors.white;
 
   Color get backgroundDarkColor => PaletteDark.backgroundColor;
@@ -53,27 +50,22 @@ abstract class BasePage extends StatelessWidget {
     final _backButton = Icon(Icons.arrow_back_ios,
       color: titleColor ?? Theme.of(context).primaryTextTheme.headline6!.color!,
       size: 16,);
-    final _closeButton = currentTheme.type == ThemeType.dark
-        ? closeButtonImageDarkTheme : closeButtonImage;
-
-    bool isMobileView = ResponsiveLayoutUtil.instance.isMobile(context);
 
     return MergeSemantics(
       child: SizedBox(
-        height: isMobileView ? 37 : 45,
-        width: isMobileView ? 37 : 45,
+        height: 37,
+        width: 37,
         child: ButtonTheme(
           minWidth: double.minPositive,
           child: Semantics(
-            label: canUseCloseIcon && !isMobileView ? 'Close' : 'Back',
+            label: 'Back',
             child: TextButton(
               style: ButtonStyle(
                 overlayColor: MaterialStateColor.resolveWith(
                     (states) => Colors.transparent),
               ),
               onPressed: () => onClose(context),
-              child:
-                  canUseCloseIcon && !isMobileView ? _closeButton : _backButton,
+              child: _backButton,
             ),
           ),
         ),

diff --git a/lib/src/screens/dashboard/widgets/address_page.dart b/lib/src/screens/dashboard/widgets/address_page.dart
@@ -6,6 +6,7 @@ import 'package:cake_wallet/src/screens/dashboard/widgets/present_receive_option
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/src/widgets/keyboard_done_button.dart';
 import 'package:cake_wallet/themes/theme_base.dart';
+import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/utils/share_util.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/dashboard/receive_option_view_model.dart';
@@ -62,7 +63,37 @@ class AddressPage extends BasePage {
   Color get titleColor => Colors.white;
 
   @override
-  bool get canUseCloseIcon => true;
+  Widget? leading(BuildContext context) {
+    final _backButton = Icon(Icons.arrow_back_ios,
+      color: titleColor,
+      size: 16,
+    );
+    final _closeButton = currentTheme.type == ThemeType.dark
+        ? closeButtonImageDarkTheme : closeButtonImage;
+
+    bool isMobileView = ResponsiveLayoutUtil.instance.isMobile(context);
+
+    return MergeSemantics(
+      child: SizedBox(
+        height: isMobileView ? 37 : 45,
+        width: isMobileView ? 37 : 45,
+        child: ButtonTheme(
+          minWidth: double.minPositive,
+          child: Semantics(
+            label: !isMobileView ? 'Close' : 'Back',
+            child: TextButton(
+              style: ButtonStyle(
+                overlayColor: MaterialStateColor.resolveWith(
+                        (states) => Colors.transparent),
+              ),
+              onPressed: () => onClose(context),
+              child: !isMobileView ? _closeButton : _backButton,
+            ),
+          ),
+        ),
+      ),
+    );
+  }
 
   @override
   Widget middle(BuildContext context) =>

diff --git a/lib/src/screens/exchange/exchange_page.dart b/lib/src/screens/exchange/exchange_page.dart
@@ -2,6 +2,7 @@ import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/desktop_exchange_cards_section.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/mobile_exchange_cards_section.dart';
 import 'package:cake_wallet/src/widgets/add_template_button.dart';
+import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/utils/debounce.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cw_core/sync_status.dart';
@@ -108,7 +109,37 @@ class ExchangePage extends BasePage {
       });
 
   @override
-  bool get canUseCloseIcon => true;
+  Widget? leading(BuildContext context) {
+    final _backButton = Icon(Icons.arrow_back_ios,
+      color: titleColor,
+      size: 16,
+    );
+    final _closeButton = currentTheme.type == ThemeType.dark
+        ? closeButtonImageDarkTheme : closeButtonImage;
+
+    bool isMobileView = ResponsiveLayoutUtil.instance.isMobile(context);
+
+    return MergeSemantics(
+      child: SizedBox(
+        height: isMobileView ? 37 : 45,
+        width: isMobileView ? 37 : 45,
+        child: ButtonTheme(
+          minWidth: double.minPositive,
+          child: Semantics(
+            label: !isMobileView ? 'Close' : 'Back',
+            child: TextButton(
+              style: ButtonStyle(
+                overlayColor: MaterialStateColor.resolveWith(
+                        (states) => Colors.transparent),
+              ),
+              onPressed: () => onClose(context),
+              child: !isMobileView ? _closeButton : _backButton,
+            ),
+          ),
+        ),
+      ),
+    );
+  }
 
   @override
   Widget body(BuildContext context) {