Merge pull request #47 from WalletConnect/chores/updates

Deps updates and minor changes

Author: quetool

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.1.17
+
+- Dependency updates
+- Minor changes
+
 ## 2.1.16
 
 - Updated dependencies

analysis_options.yaml

@@ -39,5 +39,6 @@ analyzer:
     - '**/generated_plugin_registrant.dart'
   errors:
     invalid_annotation_target: ignore
+  
 # Additional information about this file can be found at
 # https://dart.dev/guides/language/analysis-options

example/sign/lib/home_page.dart

@@ -10,12 +10,7 @@ import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
 import 'package:walletconnect_modal_flutter/walletconnect_modal_flutter.dart';
 
 class MyHomePage extends StatefulWidget {
-  const MyHomePage({
-    super.key,
-    required this.swapTheme,
-  });
-
-  final void Function() swapTheme;
+  const MyHomePage({super.key});
 
   @override
   State<MyHomePage> createState() => _MyHomePageState();
@@ -89,41 +84,8 @@ class _MyHomePageState extends State<MyHomePage> {
     }
 
     return Scaffold(
-      body: Stack(
-        children: [
-          WCMPage(web3App: _web3App!),
-          Positioned(
-            bottom: 20,
-            right: 20,
-            child: Row(
-              children: [
-                _buildIconButton(
-                  Icons.theater_comedy_outlined,
-                  widget.swapTheme,
-                ),
-              ],
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildIconButton(IconData icon, void Function()? onPressed) {
-    return Container(
-      decoration: BoxDecoration(
-        color: Colors.blue,
-        borderRadius: BorderRadius.circular(
-          48,
-        ),
-      ),
-      child: IconButton(
-        icon: Icon(
-          icon,
-          color: Colors.white,
-        ),
-        iconSize: 24,
-        onPressed: onPressed,
+      body: WCMPage(
+        web3App: _web3App!,
       ),
     );
   }

example/sign/lib/main.dart

@@ -17,7 +17,7 @@ class MyApp extends StatefulWidget {
   State<MyApp> createState() => _MyAppState();
 }
 
-class _MyAppState extends State<MyApp> {
+class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
   bool _isDark = true;
   List<Color> primaryColors = [
     WalletConnectModalThemeData.darkMode.primary100,
@@ -28,6 +28,14 @@ class _MyAppState extends State<MyApp> {
   @override
   void initState() {
     super.initState();
+    WidgetsBinding.instance.addObserver(this);
+    WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+      setState(() {
+        final platformDispatcher = View.of(context).platformDispatcher;
+        final platformBrightness = platformDispatcher.platformBrightness;
+        _isDark = platformBrightness == Brightness.dark;
+      });
+    });
 
     SystemChrome.setPreferredOrientations([
       DeviceOrientation.landscapeRight,
@@ -39,6 +47,12 @@ class _MyAppState extends State<MyApp> {
     LoggerUtil.setLogLevel(Level.error);
   }
 
+  @override
+  void dispose() {
+    WidgetsBinding.instance.removeObserver(this);
+    super.dispose();
+  }
+
   // This widget is the root of your application.
   @override
   Widget build(BuildContext context) {
@@ -57,16 +71,22 @@ class _MyAppState extends State<MyApp> {
           colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
           useMaterial3: true,
         ),
-        home: SizedBox(
-          width: double.infinity,
-          child: MyHomePage(
-            swapTheme: _swapTheme,
-          ),
-        ),
+        home: const MyHomePage(),
       ),
     );
   }
 
+  @override
+  void didChangePlatformBrightness() {
+    if (mounted) {
+      final platformDispatcher = View.of(context).platformDispatcher;
+      final platformBrightness = platformDispatcher.platformBrightness;
+      _isDark = platformBrightness == Brightness.dark;
+      _swapTheme();
+    }
+    super.didChangePlatformBrightness();
+  }
+
   void _swapTheme() {
     setState(() {
       _isDark = !_isDark;

example/sign/lib/pages/wcm_page.dart

@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
 import 'package:walletconnect_flutter_dapp/models/chain_metadata.dart';
 import 'package:walletconnect_flutter_dapp/utils/constants.dart';
 import 'package:walletconnect_flutter_dapp/utils/crypto/chain_data.dart';
-import 'package:walletconnect_flutter_dapp/utils/string_constants.dart';
 import 'package:walletconnect_flutter_dapp/widgets/chain_button.dart';
 import 'package:walletconnect_flutter_dapp/widgets/session_widget.dart';
 import 'package:walletconnect_flutter_v2/walletconnect_flutter_v2.dart';
@@ -99,13 +98,32 @@ class _WCMPageState extends State<WCMPage> with SingleTickerProviderStateMixin {
 
   Widget _buildWalletConnect() {
     // Build the list of chain button
-    final List<ChainMetadata> chains = ChainData.chains;
+    final List<Widget> evmChainButtons = [];
+    final List<Widget> nonEvmChainButtons = [];
 
-    List<Widget> chainButtons = [];
+    final evmChains = ChainData.chains.where((e) => e.type == ChainType.eip155);
+    final nonEvmChains =
+        ChainData.chains.where((e) => e.type != ChainType.eip155);
 
-    for (final ChainMetadata chain in chains) {
+    for (final ChainMetadata chain in evmChains) {
       // Build the button
-      chainButtons.add(
+      evmChainButtons.add(
+        ChainButton(
+          chain: chain,
+          onPressed: () {
+            _selectChain(
+              chain,
+              // deselectOthers: true,
+            );
+          },
+          selected: _selectedChains.contains(chain),
+        ),
+      );
+    }
+
+    for (final ChainMetadata chain in nonEvmChains) {
+      // Build the button
+      nonEvmChainButtons.add(
         ChainButton(
           chain: chain,
           onPressed: () {
@@ -123,37 +141,26 @@ class _WCMPageState extends State<WCMPage> with SingleTickerProviderStateMixin {
       appBar: AppBar(
         title: const Text('WalletConnectModal'),
       ),
-      body: Column(
-        mainAxisAlignment: MainAxisAlignment.center,
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.center,
+      body: ListView(
         children: [
+          const Text('EVM Chains:', style: StyleConstants.buttonText),
+          const SizedBox(height: StyleConstants.linear8),
+          Wrap(
+            spacing: 10.0,
+            children: evmChainButtons,
+          ),
+          const Divider(),
+          const Text('Non EVM Chains:', style: StyleConstants.buttonText),
+          Wrap(
+            spacing: 10.0,
+            children: nonEvmChainButtons,
+          ),
+          const Divider(),
+          const SizedBox(height: StyleConstants.linear8),
           WalletConnectModalConnect(
             service: _walletConnectModalService!,
-          ),
-          // WalletConnectModalConnect(
-          //   service: _walletConnectModalService!,
-          //   width: double.infinity,
-          //   height: 100,
-          // ),
-          Expanded(
-            child: Container(
-              padding: const EdgeInsets.all(8.0),
-              child: ListView(
-                children: [
-                  const Text(
-                    StringConstants.selectChains,
-                    style: StyleConstants.subtitleText,
-                    textAlign: TextAlign.center,
-                  ),
-                  const SizedBox(
-                    height: StyleConstants.linear24,
-                  ),
-                  // _buildTestnetSwitch(),
-                  ...chainButtons,
-                ],
-              ),
-            ),
+            width: double.infinity,
+            height: 50.0,
           ),
         ],
       ),

example/sign/lib/utils/crypto/chain_data.dart

@@ -106,7 +106,7 @@ class ChainData {
     ChainMetadata(
       type: ChainType.eip155,
       color: Colors.yellow.shade600,
-      chainName: 'Binance Smart Chain',
+      chainName: 'Binance Chain',
       namespace: 'eip155:56',
       chainId: '56',
       chainIcon: '93564157-2e8e-4ce7-81df-b264dbee9b00',

example/sign/lib/widgets/chain_button.dart

@@ -17,7 +17,7 @@ class ChainButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      width: double.infinity,
+      width: (MediaQuery.of(context).size.width / 2) - 14,
       height: StyleConstants.linear48,
       margin: const EdgeInsets.symmetric(
         vertical: StyleConstants.linear8,
@@ -26,13 +26,13 @@ class ChainButton extends StatelessWidget {
         onPressed: onPressed,
         style: ButtonStyle(
           backgroundColor: MaterialStateProperty.all<Color>(
-            Colors.white,
+            selected ? Colors.grey.shade400 : Colors.white,
           ),
           shape: MaterialStateProperty.all<RoundedRectangleBorder>(
             RoundedRectangleBorder(
               side: BorderSide(
-                color: chain.color,
-                width: selected ? 6 : 2,
+                color: selected ? Colors.grey.shade400 : chain.color,
+                width: selected ? 4 : 2,
               ),
               borderRadius: BorderRadius.circular(
                 StyleConstants.linear8,

example/sign/pubspec.lock

@@ -1067,7 +1067,7 @@ packages:
       path: "../.."
       relative: true
     source: path
-    version: "2.1.16"
+    version: "2.1.17"
   watcher:
     dependency: transitive
     description:

lib/models/listings.dart

@@ -6,6 +6,7 @@ part 'listings.g.dart';
 
 @freezed
 class WalletData with _$WalletData {
+  // ignore: invalid_annotation_target
   @JsonSerializable(includeIfNull: false)
   const factory WalletData({
     required Listing listing,
@@ -19,6 +20,7 @@ class WalletData with _$WalletData {
 
 @freezed
 class ListingResponse with _$ListingResponse {
+  // ignore: invalid_annotation_target
   @JsonSerializable(includeIfNull: false)
   const factory ListingResponse({
     required Map<String, Listing> listings,
@@ -31,6 +33,7 @@ class ListingResponse with _$ListingResponse {
 
 @freezed
 class Listing with _$Listing {
+  // ignore: invalid_annotation_target
   @JsonSerializable(includeIfNull: false, fieldRename: FieldRename.snake)
   const factory Listing({
     required String id,
@@ -49,6 +52,7 @@ class Listing with _$Listing {
 
 @freezed
 class App with _$App {
+  // ignore: invalid_annotation_target
   @JsonSerializable(includeIfNull: false, fieldRename: FieldRename.snake)
   const factory App({
     String? browser,
@@ -69,6 +73,7 @@ class App with _$App {
 
 @freezed
 class Injected with _$Injected {
+  // ignore: invalid_annotation_target
   @JsonSerializable(includeIfNull: false, fieldRename: FieldRename.snake)
   const factory Injected({
     required String injectedId,
@@ -81,6 +86,7 @@ class Injected with _$Injected {
 
 @freezed
 class ListingParams with _$ListingParams {
+  // ignore: invalid_annotation_target
   @JsonSerializable(includeIfNull: false)
   const factory ListingParams({
     int? page,