minor ui update

quetool · quetool · commit 867326d9eb1b · 2024-08-07T17:47:09.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.20
+
+- Minor updates
+
 ## 2.1.19
 
 - Dependency updates
diff --git a/example/sign/ios/Podfile.lock b/example/sign/ios/Podfile.lock
@@ -44,4 +44,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
 
-COCOAPODS: 1.13.0
+COCOAPODS: 1.15.2
diff --git a/example/sign/pubspec.lock b/example/sign/pubspec.lock
@@ -516,26 +516,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0"
+    version: "10.0.4"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.3"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.1"
   lints:
     dependency: transitive
     description:
@@ -580,10 +580,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.12.0"
   mime:
     dependency: transitive
     description:
@@ -897,10 +897,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.7.0"
   timing:
     dependency: transitive
     description:
@@ -1033,10 +1033,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
       url: "https://pub.dev"
     source: hosted
-    version: "13.0.0"
+    version: "14.2.1"
   w_common:
     dependency: transitive
     description:
diff --git a/lib/pages/qr_code_and_wallet_list_page.dart b/lib/pages/qr_code_and_wallet_list_page.dart
@@ -3,6 +3,8 @@ import 'package:walletconnect_modal_flutter/constants/constants.dart';
 import 'package:walletconnect_modal_flutter/models/listings.dart';
 import 'package:walletconnect_modal_flutter/pages/wallet_list_long_page.dart';
 import 'package:walletconnect_modal_flutter/services/explorer/explorer_service_singleton.dart';
+import 'package:walletconnect_modal_flutter/services/utils/platform/i_platform_utils.dart';
+import 'package:walletconnect_modal_flutter/services/utils/platform/platform_utils_singleton.dart';
 import 'package:walletconnect_modal_flutter/services/utils/widget_stack/widget_stack_singleton.dart';
 import 'package:walletconnect_modal_flutter/services/walletconnect_modal/i_walletconnect_modal_service.dart';
 import 'package:walletconnect_modal_flutter/widgets/grid_list/grid_list.dart';
@@ -20,39 +22,50 @@ class QRCodeAndWalletListPage extends StatelessWidget {
   Widget build(BuildContext context) {
     final IWalletConnectModalService service =
         WalletConnectModalProvider.of(context).service;
-
+    final pType = platformUtils.instance.getPlatformType();
     return WalletConnectModalNavBar(
       title: const WalletConnectModalNavbarTitle(
         title: 'Connect your wallet',
       ),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        children: <Widget>[
-          QRCodeWidget(
-            service: service,
-            logoPath: 'assets/walletconnect_logo_white.png',
-          ),
-          GridList(
-            state: GridListState.extraShort,
-            provider: explorerService.instance!,
-            viewLongList: () {
-              widgetStack.instance.add(
-                const WalletListLongPage(),
-              );
-            },
-            onSelect: (WalletData data) {
-              service.connectWallet(
-                walletData: data,
-              );
-            },
-            createListItem: (info, iconSize) {
-              return GridListWalletItem(
-                listItem: info,
-                imageSize: iconSize,
-              );
-            },
+      child: ConstrainedBox(
+        constraints: BoxConstraints(
+          maxWidth: (pType == PlatformType.mobile) ? double.infinity : 360,
+          maxHeight: (pType == PlatformType.mobile) ? double.infinity : 482,
+        ),
+        child: SingleChildScrollView(
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: <Widget>[
+              QRCodeWidget(
+                service: service,
+                logoPath: 'assets/walletconnect_logo_white.png',
+              ),
+              Visibility(
+                visible: (pType == PlatformType.mobile),
+                child: GridList(
+                  state: GridListState.extraShort,
+                  provider: explorerService.instance!,
+                  viewLongList: () {
+                    widgetStack.instance.add(
+                      const WalletListLongPage(),
+                    );
+                  },
+                  onSelect: (WalletData data) {
+                    service.connectWallet(
+                      walletData: data,
+                    );
+                  },
+                  createListItem: (info, iconSize) {
+                    return GridListWalletItem(
+                      listItem: info,
+                      imageSize: iconSize,
+                    );
+                  },
+                ),
+              ),
+            ],
           ),
-        ],
+        ),
       ),
     );
   }
diff --git a/lib/services/utils/platform/platform_utils.dart b/lib/services/utils/platform/platform_utils.dart
@@ -24,12 +24,13 @@ class PlatformUtils extends IPlatformUtils {
 
   @override
   PlatformType getPlatformType() {
+    if (kIsWeb) {
+      return PlatformType.web;
+    }
     if (Platform.isAndroid || Platform.isIOS) {
       return PlatformType.mobile;
     } else if (Platform.isLinux || Platform.isMacOS || Platform.isWindows) {
       return PlatformType.desktop;
-    } else if (kIsWeb) {
-      return PlatformType.web;
     }
     return PlatformType.mobile;
   }
diff --git a/lib/services/walletconnect_modal/walletconnect_modal_service.dart b/lib/services/walletconnect_modal/walletconnect_modal_service.dart
@@ -228,9 +228,19 @@ class WalletConnectModalService extends ChangeNotifier
       );
     } else {
       await showDialog(
+        barrierDismissible: false,
+        useSafeArea: true,
+        useRootNavigator: true,
+        anchorPoint: Offset(0, 0),
         context: context,
-        builder: (context) {
-          return root;
+        builder: (_) {
+          return Dialog(
+            clipBehavior: Clip.hardEdge,
+            child: ConstrainedBox(
+              constraints: BoxConstraints(maxWidth: 360, maxHeight: 600),
+              child: root,
+            ),
+          );
         },
       );
     }
diff --git a/pubspec.lock b/pubspec.lock
@@ -484,26 +484,26 @@ packages:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
+      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0"
+    version: "10.0.4"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
+      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.3"
   leak_tracker_testing:
     dependency: transitive
     description:
       name: leak_tracker_testing
-      sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "3.0.1"
   lints:
     dependency: transitive
     description:
@@ -548,10 +548,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
+      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.12.0"
   mime:
     dependency: transitive
     description:
@@ -881,10 +881,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
+    version: "0.7.0"
   timing:
     dependency: transitive
     description:
@@ -1017,10 +1017,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
+      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
       url: "https://pub.dev"
     source: hosted
-    version: "13.0.0"
+    version: "14.2.1"
   w_common:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: walletconnect_modal_flutter
 description: The WalletConnectModal for WalletConnect built using Flutter.
-version: 2.1.19
+version: 2.1.20
 repository: https://github.com/WalletConnect/WalletConnectModalFlutter
 
 environment:

Original file line number	Diff line number	Diff line change
`@@ -44,4 +44,4 @@ SPEC CHECKSUMS:`
`44`	`44`
`45`	`45`	`PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796`
`46`	`46`
`47`		`-COCOAPODS: 1.13.0`
	`47`	`+COCOAPODS: 1.15.2`