✨ Web compatibility

redDwarf03 · Apr 8, 2024 · 19830a1 · 19830a1
1 parent 4e5f332
commit 19830a1
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 16 deletions.
diff --git a/lib/pages/get_wallet_page.dart b/lib/pages/get_wallet_page.dart
@@ -1,5 +1,7 @@
+import 'dart:io';
 import 'dart:math';
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -48,9 +50,11 @@ class GetWalletPage extends StatelessWidget {
             return WalletsList(
               itemList: itemsToShow,
               onTapWallet: (data) {
-                final url = Platform.isIOS
-                    ? data.listing.appStore
-                    : data.listing.playStore;
+                final url = kIsWeb
+                    ? data.listing.webappLink
+                    : Platform.isIOS
+                        ? data.listing.appStore
+                        : data.listing.playStore;
                 if ((url ?? '').isNotEmpty) {
                   urlUtils.instance.launchUrl(
                     Uri.parse(url!),

diff --git a/lib/services/explorer_service/explorer_service.dart b/lib/services/explorer_service/explorer_service.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
+import 'dart:io';
 import 'dart:math';
 
 import 'package:collection/collection.dart';
@@ -197,6 +198,7 @@ class ExplorerService implements IExplorerService {
 
   Future<List<NativeAppData>> _fetchNativeAppData() async {
     try {
+      if (kIsWeb) return [];
       final apiUrl = await coreUtils.instance.getApiUrl();
       final headers = coreUtils.instance.getAPIHeaders(projectId, _referer);
       final uri = Platform.isIOS

diff --git a/lib/services/magic_service/magic_service.dart b/lib/services/magic_service/magic_service.dart
@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
+import 'dart:io';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';

diff --git a/lib/utils/platform/platform_utils.dart b/lib/utils/platform/platform_utils.dart
@@ -1,12 +1,15 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter/foundation.dart' show kIsWeb;
 import 'package:web3modal_flutter/utils/platform/i_platform_utils.dart';
-import 'package:web3modal_flutter/web3modal_flutter.dart';
 
 class PlatformUtils extends IPlatformUtils {
   @override
   PlatformExact getPlatformExact() {
-    if (Platform.isAndroid) {
+    if (kIsWeb) {
+      return PlatformExact.web;
+    } else if (Platform.isAndroid) {
       return PlatformExact.android;
     } else if (Platform.isIOS) {
       return PlatformExact.iOS;
@@ -16,22 +19,24 @@ class PlatformUtils extends IPlatformUtils {
       return PlatformExact.macOS;
     } else if (Platform.isWindows) {
       return PlatformExact.windows;
-    } else if (kIsWeb) {
+    } else {
       return PlatformExact.web;
     }
-    return PlatformExact.web;
   }
 
   @override
   PlatformType getPlatformType() {
-    if (Platform.isAndroid || Platform.isIOS) {
-      return PlatformType.mobile;
-    } else if (Platform.isLinux || Platform.isMacOS || Platform.isWindows) {
-      return PlatformType.desktop;
-    } else if (kIsWeb) {
+    if (kIsWeb) {
       return PlatformType.web;
+    } else {
+      if (Platform.isAndroid || Platform.isIOS) {
+        return PlatformType.mobile;
+      } else if (Platform.isLinux || Platform.isMacOS || Platform.isWindows) {
+        return PlatformType.desktop;
+      } else {
+        return PlatformType.mobile;
+      }
     }
-    return PlatformType.mobile;
   }
 
   @override

diff --git a/lib/widgets/lists/list_items/download_wallet_item.dart b/lib/widgets/lists/list_items/download_wallet_item.dart
@@ -1,3 +1,6 @@
+import 'dart:io';
+
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
@@ -19,10 +22,10 @@ class DownloadWalletItem extends StatelessWidget {
     if (webOnly) {
       return walletInfo.listing.homepage;
     }
-    if (Platform.isIOS) {
+    if (kIsWeb == false && Platform.isIOS) {
       return walletInfo.listing.appStore ?? '';
     }
-    if (Platform.isAndroid) {
+    if (kIsWeb == false && Platform.isAndroid) {
       return walletInfo.listing.playStore ?? '';
     }
     return '';

diff --git a/lib/widgets/w3m_connect_wallet_button.dart b/lib/widgets/w3m_connect_wallet_button.dart
@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:web3modal_flutter/services/magic_service/magic_service_singleton.dart';
 import 'package:web3modal_flutter/services/w3m_service/i_w3m_service.dart';
@@ -55,7 +56,7 @@ class _W3MConnectWalletButtonState extends State<W3MConnectWalletButton> {
       alignment: AlignmentDirectional.center,
       children: [
         // if (_state == ConnectButtonState.connected)
-        if (Platform.isIOS && emailEnabled)
+        if (kIsWeb == false && Platform.isIOS && emailEnabled)
           SizedBox(
             width: 1.0,
             height: 1.0,