Changed the webview package from webview_flutter to webview_flutter_pro

Krishna-Baldwa · Oct 22, 2022 · 2b76dac · 2b76dac
1 parent dbfcaeb
commit 2b76dac
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 23 deletions.
diff --git a/android/.settings/org.eclipse.buildship.core.prefs b/android/.settings/org.eclipse.buildship.core.prefs
@@ -1,11 +1,11 @@
-arguments=
+arguments=--init-script C\:\\Users\\sp\\AppData\\Roaming\\Code\\User\\globalStorage\\redhat.java\\1.11.0\\config_win\\org.eclipse.osgi\\53\\0\\.cp\\gradle\\init\\init.gradle --init-script C\:\\Users\\sp\\AppData\\Roaming\\Code\\User\\globalStorage\\redhat.java\\1.11.0\\config_win\\org.eclipse.osgi\\53\\0\\.cp\\gradle\\protobuf\\init.gradle
 auto.sync=false
 build.scans.enabled=false
-connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
+connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(7.4.2))
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
-java.home=/usr/lib/jvm/java-11-openjdk-amd64
+java.home=C\:/Program Files/Java/jdk-19
 jvm.arguments=
 offline.mode=false
 override.workspace.settings=true

diff --git a/lib/src/routes/loginpage.dart b/lib/src/routes/loginpage.dart
@@ -6,7 +6,8 @@ import 'package:InstiApp/src/utils/common_widgets.dart';
 import 'package:dio/dio.dart';
 // import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:webview_flutter/webview_flutter.dart';
+// import 'package:webview_flutter/webview_flutter.dart';
+import 'package:flutter_webview_pro/webview_flutter.dart' as webview;
 import 'package:InstiApp/src/api/apiclient.dart';
 import 'package:InstiApp/src/api/model/user.dart';
 import 'package:InstiApp/src/bloc_provider.dart';
@@ -76,7 +77,7 @@ class _LoginPageState extends State<LoginPage> {
 
     _bloc = widget.bloc;
     if (Platform.isAndroid) {
-      WebView.platform = SurfaceAndroidWebView();
+      webview.WebView.platform = webview.SurfaceAndroidWebView();
     }
 
     // Creating login url
@@ -228,8 +229,8 @@ class _LoginPageState extends State<LoginPage> {
               ),
             ),
           )
-        : WebView(
-            javascriptMode: JavascriptMode.unrestricted,
+        : webview.WebView(
+            javascriptMode: webview.JavascriptMode.unrestricted,
             initialUrl: loginurl,
             // onWebViewCreated: (controller){
             //   this._controller = controller;

diff --git a/lib/src/routes/mappage.dart b/lib/src/routes/mappage.dart
@@ -5,10 +5,10 @@ import 'package:InstiApp/src/drawer.dart';
 import 'package:InstiApp/src/utils/common_widgets.dart';
 // import 'package:InstiApp/src/utils/safe_webview_scaffold.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 import 'package:jaguar/jaguar.dart' as jag;
 import 'package:jaguar_flutter_asset/jaguar_flutter_asset.dart';
 import 'package:permission_handler/permission_handler.dart';
+import 'package:flutter_webview_pro/webview_flutter.dart' as webview;
 // import 'package:webview_flutter/webview_flutter.dart';
 
 class MapPage extends StatefulWidget {
@@ -20,6 +20,7 @@ class _MapPageState extends State<MapPage> {
   late jag.Jaguar server;
 
   final String hostUrl = "insti.app";
+  // final String mapUrl = "https://www.gps-coordinates.net/my-location";
   final String mapUrl = "https://insti.app/map/?sandbox=true";
 
   // final String hostUrl = "127.0.0.1:9999";
@@ -29,7 +30,7 @@ class _MapPageState extends State<MapPage> {
   // final String mapUrl = "https://varunpatil.me/instimapweb-standalone/";
 
   StreamSubscription<String>? onUrlChangedSub;
-  InAppWebViewController? webViewController;
+  webview.WebViewController? webViewController;
 
   // Storing for dispose
   ThemeData? theme;
@@ -49,7 +50,7 @@ class _MapPageState extends State<MapPage> {
   @override
   void dispose() {
     onUrlChangedSub?.cancel();
-    server.close();
+    // server.close();
 
     super.dispose();
   }
@@ -86,25 +87,26 @@ class _MapPageState extends State<MapPage> {
                 semanticLabel: "Refresh",
               ),
               onPressed: () {
-                webViewController?.loadUrl(
-                  urlRequest: URLRequest(url: Uri.parse(mapUrl)),
-                );
+                webViewController?.loadUrl(mapUrl);
               },
             ),
           ],
         ),
       ),
-      body: InAppWebView(
-        onWebViewCreated: (controller) {
-          webViewController = controller;
+      body: webview.WebView(
+        initialUrl: mapUrl,
+        javascriptMode: webview.JavascriptMode.unrestricted,
+        onWebViewCreated: (webview.WebViewController webViewController) {
+          this.webViewController = webViewController;
         },
-        initialUrlRequest: URLRequest(url: Uri.parse(mapUrl)),
-        androidOnPermissionRequest: (controller, origin, resources) async {
-          await Permission.locationWhenInUse.request();
-          return PermissionRequestResponse(
-              resources: resources,
-              action: PermissionRequestResponseAction.GRANT);
+        navigationDelegate: (webview.NavigationRequest request) {
+          if (request.url.startsWith(mapUrl)) {
+            return webview.NavigationDecision.prevent;
+          }
+          return webview.NavigationDecision.navigate;
         },
+        gestureNavigationEnabled: true,
+        geolocationEnabled: true,
       ),
     );
   }

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -53,7 +53,7 @@ dependencies:
   json_annotation: ^4.4.0
   jaguar: ^3.0.12
   jaguar_flutter_asset: ^3.0.0
-  webview_flutter: ^2.8.0
+  flutter_webview_pro: ^3.0.1
   home_widget: ^0.1.5
 
   flutter_inappwebview: any