diff --git a/deps/flutter_web_browser b/deps/flutter_web_browser new file mode 160000 index 0000000000000000000000000000000000000000..15808a8d9e1861db31087e28f320d17d88e452f2 --- /dev/null +++ b/deps/flutter_web_browser @@ -0,0 +1 @@ +Subproject commit 15808a8d9e1861db31087e28f320d17d88e452f2 diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 737606072f1c24d449ca7df0475b189bd0f71203..76a36accece6d93afbc051d1ab02dd5114ecf2f2 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,21 +1,21 @@ PODS: - Flutter (1.0.0) - - webview_flutter (0.0.1): + - flutter_web_browser (0.11.0): - Flutter DEPENDENCIES: - Flutter (from `.symlinks/flutter/ios`) - - webview_flutter (from `.symlinks/plugins/webview_flutter/ios`) + - flutter_web_browser (from `.symlinks/plugins/flutter_web_browser/ios`) EXTERNAL SOURCES: Flutter: :path: ".symlinks/flutter/ios" - webview_flutter: - :path: ".symlinks/plugins/webview_flutter/ios" + flutter_web_browser: + :path: ".symlinks/plugins/flutter_web_browser/ios" SPEC CHECKSUMS: Flutter: 58dd7d1b27887414a370fcccb9e645c08ffd7a6a - webview_flutter: 1aa7604e6cdb451a9b7ed2c37d5454c0b440246b + flutter_web_browser: bdea232160dec44dec86540bee05168cc844ef7c PODFILE CHECKSUM: 7fb83752f59ead6285236625b82473f90b1cb932 diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index c1bd48b166bd078242b91d4c15fd7adb350f65c5..ddd57e9bbbcf31aff23e51ad8df520c053b77498 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -28,6 +28,19 @@ <string>YES</string> <key>UIMainStoryboardFile</key> <string>Main</string> + <key>CFBundleURLTypes</key> + <array> + <dict> + <key>CFBundleIdentifier</key> + <string></string> + <key>CFBundleTypeRole</key> + <string>Editor</string> + <key>CFBundleURLSchemes</key> + <array> + <string>app://com.vereign.mobile_app</string> + </array> + </dict> + </array> <key>UISupportedInterfaceOrientations</key> <array> <string>UIInterfaceOrientationPortrait</string> diff --git a/lib/screens/home.dart b/lib/screens/home.dart index b4ca07b6e731b497d7f73221705f36e1fe2dc988..968442053ebb5c3060e5a2559a71bf9a3f95ece7 100644 --- a/lib/screens/home.dart +++ b/lib/screens/home.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; -import 'web_view_container.dart'; +import 'package:flutter_web_browser/flutter_web_browser.dart'; + class Home extends StatelessWidget { final _links = ['https://app.vereign.com', 'https://integration.vereign.com', 'https://rosengeorgiev.dev.vereign.com', 'https://igormarkin.dev.vereign.com', 'https://gospodinbodurov.dev.vereign.com']; @override @@ -23,8 +24,7 @@ class Home extends StatelessWidget { onPressed: () => _handleURLButtonPress(context, url), )); } - void _handleURLButtonPress(BuildContext context, String url) { - Navigator.push(context, - MaterialPageRoute(builder: (context) => WebViewContainer(url))); + void _handleURLButtonPress(BuildContext context, String url) async { + FlutterWebBrowser.openWebPage(url: url, androidToolbarColor: Colors.deepPurple); } } \ No newline at end of file diff --git a/lib/screens/web_view_container.dart b/lib/screens/web_view_container.dart deleted file mode 100644 index a8a02f8ecbb049d812056eb58e852b05094efc1f..0000000000000000000000000000000000000000 --- a/lib/screens/web_view_container.dart +++ /dev/null @@ -1,27 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:webview_flutter/webview_flutter.dart'; -class WebViewContainer extends StatefulWidget { - final url; - WebViewContainer(this.url); - @override - createState() => _WebViewContainerState(this.url); -} -class _WebViewContainerState extends State<WebViewContainer> { - var _url; - final _key = UniqueKey(); - _WebViewContainerState(this._url); - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar(title: Text(this._url)), - body: Column( - children: [ - Expanded( - child: WebView( - key: _key, - javascriptMode: JavascriptMode.unrestricted, - initialUrl: _url)) - ], - )); - } -} \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index e7ea2448ba78a4ff3404f2375a1752bce2a5b2c4..e1081eb5c9f15c5024ef98e05156c89876f2343c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -46,6 +46,13 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_web_browser: + dependency: "direct main" + description: + path: "deps/flutter_web_browser" + relative: true + source: path + version: "0.11.0" matcher: dependency: transitive description: @@ -142,13 +149,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.8" - webview_flutter: - dependency: "direct main" - description: - name: webview_flutter - url: "https://pub.dartlang.org" - source: hosted - version: "0.3.10" sdks: dart: ">=2.2.2 <3.0.0" - flutter: ">=1.5.0 <2.0.0" + flutter: ">=0.1.4 <2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 03dc58afd822a9f44ef359fc78cd863f132bcdf2..fa896f6eb45a8fb0d684516f2022f61bce6cdfc8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -22,7 +22,9 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^0.1.2 - webview_flutter: ^0.3.10 + flutter_web_browser: + # Use + path: ./deps/flutter_web_browser dev_dependencies: flutter_test: