From 802663abced0b909daa74bceb3d9da29ff261af1 Mon Sep 17 00:00:00 2001 From: pichillilorenzo Date: Tue, 18 Sep 2018 03:07:12 +0200 Subject: [PATCH] updated Swift code, using storyboard for iOS, code cleanup, updated iOS options --- .gradle/4.4.1/fileChanges/last-build.bin | Bin 0 -> 1 bytes .gradle/4.4.1/fileHashes/fileHashes.lock | Bin 0 -> 17 bytes .gradle/4.4.1/taskHistory/taskHistory.lock | Bin 0 -> 17 bytes .../buildOutputCleanup.lock | Bin 0 -> 17 bytes .gradle/buildOutputCleanup/cache.properties | 2 + .idea/workspace.xml | 550 ++++++----- README.md | 2 +- android/build.gradle | 4 + .../flutter_inappbrowser/InAppBrowser.java | 1 + example/android/build.gradle | 2 +- example/flutter_plugin/.gitignore | 8 + example/flutter_plugin/CHANGELOG.md | 3 + example/flutter_plugin/LICENSE | 1 + example/flutter_plugin/README.md | 10 + example/flutter_plugin/android/.gitignore | 8 + example/flutter_plugin/android/build.gradle | 34 + .../flutter_plugin/android/gradle.properties | 1 + .../flutter_plugin/android/settings.gradle | 1 + .../android/src/main/AndroidManifest.xml | 3 + .../flutterplugin/FlutterPlugin.java | 25 + example/flutter_plugin/example/.gitignore | 71 ++ example/flutter_plugin/example/.metadata | 8 + example/flutter_plugin/example/README.md | 8 + .../example/android/app/build.gradle | 61 ++ .../android/app/src/main/AndroidManifest.xml | 39 + .../flutterpluginexample/MainActivity.java | 13 + .../main/res/drawable/launch_background.xml | 12 + .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 544 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 442 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 721 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 1031 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 1443 bytes .../app/src/main/res/values/styles.xml | 8 + .../example/android/build.gradle | 29 + .../example/android/gradle.properties | 1 + .../gradle/wrapper/gradle-wrapper.properties | 6 + .../example/android/settings.gradle | 15 + .../ios/Flutter/AppFrameworkInfo.plist | 26 + .../example/ios/Flutter/Debug.xcconfig | 3 + .../example/ios/Flutter/Release.xcconfig | 2 + example/flutter_plugin/example/ios/Podfile | 65 ++ .../ios/Runner.xcodeproj/project.pbxproj | 509 ++++++++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/xcschemes/Runner.xcscheme | 93 ++ .../contents.xcworkspacedata | 10 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../example/ios/Runner/AppDelegate.swift | 13 + .../AppIcon.appiconset/Contents.json | 122 +++ .../Icon-App-1024x1024@1x.png | Bin 0 -> 11112 bytes .../AppIcon.appiconset/Icon-App-20x20@1x.png | Bin 0 -> 564 bytes .../AppIcon.appiconset/Icon-App-20x20@2x.png | Bin 0 -> 1283 bytes .../AppIcon.appiconset/Icon-App-20x20@3x.png | Bin 0 -> 1588 bytes .../AppIcon.appiconset/Icon-App-29x29@1x.png | Bin 0 -> 1025 bytes .../AppIcon.appiconset/Icon-App-29x29@2x.png | Bin 0 -> 1716 bytes .../AppIcon.appiconset/Icon-App-29x29@3x.png | Bin 0 -> 1920 bytes .../AppIcon.appiconset/Icon-App-40x40@1x.png | Bin 0 -> 1283 bytes .../AppIcon.appiconset/Icon-App-40x40@2x.png | Bin 0 -> 1895 bytes .../AppIcon.appiconset/Icon-App-40x40@3x.png | Bin 0 -> 2665 bytes .../AppIcon.appiconset/Icon-App-60x60@2x.png | Bin 0 -> 2665 bytes .../AppIcon.appiconset/Icon-App-60x60@3x.png | Bin 0 -> 3831 bytes .../AppIcon.appiconset/Icon-App-76x76@1x.png | Bin 0 -> 1888 bytes .../AppIcon.appiconset/Icon-App-76x76@2x.png | Bin 0 -> 3294 bytes .../Icon-App-83.5x83.5@2x.png | Bin 0 -> 3612 bytes .../LaunchImage.imageset/Contents.json | 23 + .../LaunchImage.imageset/LaunchImage.png | Bin 0 -> 68 bytes .../LaunchImage.imageset/LaunchImage@2x.png | Bin 0 -> 68 bytes .../LaunchImage.imageset/LaunchImage@3x.png | Bin 0 -> 68 bytes .../LaunchImage.imageset/README.md | 5 + .../Runner/Base.lproj/LaunchScreen.storyboard | 37 + .../ios/Runner/Base.lproj/Main.storyboard | 26 + .../example/ios/Runner/Info.plist | 45 + .../ios/Runner/Runner-Bridging-Header.h | 1 + .../example/ios/Runner/Storyboard.storyboard | 89 ++ example/flutter_plugin/example/lib/main.dart | 39 + example/flutter_plugin/example/pubspec.yaml | 70 ++ .../example/test/widget_test.dart | 25 + example/flutter_plugin/ios/.gitignore | 36 + example/flutter_plugin/ios/Assets/.gitkeep | 0 .../ios/Classes/FlutterPlugin.h | 4 + .../ios/Classes/FlutterPlugin.m | 8 + .../ios/Classes/SwiftFlutterPlugin.swift | 45 + .../flutter_plugin/ios/flutter_plugin.podspec | 21 + .../flutter_plugin/lib/flutter_plugin.dart | 17 + example/flutter_plugin/pubspec.yaml | 52 + example/ios/Runner.xcodeproj/project.pbxproj | 7 + .../xcshareddata/xcschemes/Runner.xcscheme | 2 - .../ios/Runner/Assets.xcassets/Contents.json | 6 + .../Runner/Base.lproj/LaunchScreen.storyboard | 40 +- example/ios/Runner/Base.lproj/Main.storyboard | 19 +- example/ios/Runner/WebView.storyboard | 116 +++ example/lib/main.dart | 13 +- flutter_inappbrowser.iml | 3 + flutter_inappbrowser_android.iml | 2 +- ios/Classes/InAppBrowserOptions.swift | 42 + .../InAppBrowserWebViewController.swift | 566 +++++++++++ ios/Classes/SwiftFlutterPlugin.swift | 894 ++---------------- lib/flutter_inappbrowser.dart | 2 +- 97 files changed, 2974 insertions(+), 1065 deletions(-) create mode 100644 .gradle/4.4.1/fileChanges/last-build.bin create mode 100644 .gradle/4.4.1/fileHashes/fileHashes.lock create mode 100644 .gradle/4.4.1/taskHistory/taskHistory.lock create mode 100644 .gradle/buildOutputCleanup/buildOutputCleanup.lock create mode 100644 .gradle/buildOutputCleanup/cache.properties create mode 100644 example/flutter_plugin/.gitignore create mode 100644 example/flutter_plugin/CHANGELOG.md create mode 100644 example/flutter_plugin/LICENSE create mode 100644 example/flutter_plugin/README.md create mode 100644 example/flutter_plugin/android/.gitignore create mode 100644 example/flutter_plugin/android/build.gradle create mode 100644 example/flutter_plugin/android/gradle.properties create mode 100644 example/flutter_plugin/android/settings.gradle create mode 100644 example/flutter_plugin/android/src/main/AndroidManifest.xml create mode 100644 example/flutter_plugin/android/src/main/java/com/pichillilorenzo/flutterplugin/FlutterPlugin.java create mode 100644 example/flutter_plugin/example/.gitignore create mode 100644 example/flutter_plugin/example/.metadata create mode 100644 example/flutter_plugin/example/README.md create mode 100644 example/flutter_plugin/example/android/app/build.gradle create mode 100644 example/flutter_plugin/example/android/app/src/main/AndroidManifest.xml create mode 100644 example/flutter_plugin/example/android/app/src/main/java/com/pichillilorenzo/flutterpluginexample/MainActivity.java create mode 100644 example/flutter_plugin/example/android/app/src/main/res/drawable/launch_background.xml create mode 100644 example/flutter_plugin/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 example/flutter_plugin/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 example/flutter_plugin/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 example/flutter_plugin/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 example/flutter_plugin/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 example/flutter_plugin/example/android/app/src/main/res/values/styles.xml create mode 100644 example/flutter_plugin/example/android/build.gradle create mode 100644 example/flutter_plugin/example/android/gradle.properties create mode 100644 example/flutter_plugin/example/android/gradle/wrapper/gradle-wrapper.properties create mode 100644 example/flutter_plugin/example/android/settings.gradle create mode 100644 example/flutter_plugin/example/ios/Flutter/AppFrameworkInfo.plist create mode 100644 example/flutter_plugin/example/ios/Flutter/Debug.xcconfig create mode 100644 example/flutter_plugin/example/ios/Flutter/Release.xcconfig create mode 100644 example/flutter_plugin/example/ios/Podfile create mode 100644 example/flutter_plugin/example/ios/Runner.xcodeproj/project.pbxproj create mode 100644 example/flutter_plugin/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 example/flutter_plugin/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme create mode 100644 example/flutter_plugin/example/ios/Runner.xcworkspace/contents.xcworkspacedata create mode 100644 example/flutter_plugin/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 example/flutter_plugin/example/ios/Runner/AppDelegate.swift create mode 100644 example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png create mode 100644 example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png create mode 100644 example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png create mode 100644 example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png create mode 100644 example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png create mode 100644 example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png create mode 100644 example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png create mode 100644 example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png create mode 100644 example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png create mode 100644 example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png create mode 100644 example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png create mode 100644 example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png create mode 100644 example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png create mode 100644 example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png create mode 100644 example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png create mode 100644 example/flutter_plugin/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json create mode 100644 example/flutter_plugin/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png create mode 100644 example/flutter_plugin/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png create mode 100644 example/flutter_plugin/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png create mode 100644 example/flutter_plugin/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md create mode 100644 example/flutter_plugin/example/ios/Runner/Base.lproj/LaunchScreen.storyboard create mode 100644 example/flutter_plugin/example/ios/Runner/Base.lproj/Main.storyboard create mode 100644 example/flutter_plugin/example/ios/Runner/Info.plist create mode 100644 example/flutter_plugin/example/ios/Runner/Runner-Bridging-Header.h create mode 100644 example/flutter_plugin/example/ios/Runner/Storyboard.storyboard create mode 100644 example/flutter_plugin/example/lib/main.dart create mode 100644 example/flutter_plugin/example/pubspec.yaml create mode 100644 example/flutter_plugin/example/test/widget_test.dart create mode 100644 example/flutter_plugin/ios/.gitignore create mode 100644 example/flutter_plugin/ios/Assets/.gitkeep create mode 100644 example/flutter_plugin/ios/Classes/FlutterPlugin.h create mode 100644 example/flutter_plugin/ios/Classes/FlutterPlugin.m create mode 100644 example/flutter_plugin/ios/Classes/SwiftFlutterPlugin.swift create mode 100644 example/flutter_plugin/ios/flutter_plugin.podspec create mode 100644 example/flutter_plugin/lib/flutter_plugin.dart create mode 100644 example/flutter_plugin/pubspec.yaml create mode 100644 example/ios/Runner/Assets.xcassets/Contents.json create mode 100644 example/ios/Runner/WebView.storyboard create mode 100644 ios/Classes/InAppBrowserOptions.swift create mode 100644 ios/Classes/InAppBrowserWebViewController.swift diff --git a/.gradle/4.4.1/fileChanges/last-build.bin b/.gradle/4.4.1/fileChanges/last-build.bin new file mode 100644 index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d GIT binary patch literal 1 IcmZPo000310RR91 literal 0 HcmV?d00001 diff --git a/.gradle/4.4.1/fileHashes/fileHashes.lock b/.gradle/4.4.1/fileHashes/fileHashes.lock new file mode 100644 index 0000000000000000000000000000000000000000..3ae9587960c9d6a5b61ccd67f0c0082d7d4121ab GIT binary patch literal 17 TcmZP;c{2CZ1w)y=3{U_7HBbaS literal 0 HcmV?d00001 diff --git a/.gradle/4.4.1/taskHistory/taskHistory.lock b/.gradle/4.4.1/taskHistory/taskHistory.lock new file mode 100644 index 0000000000000000000000000000000000000000..b18ddce23cb4b2c4109a689c01e7af4edb9c8c84 GIT binary patch literal 17 TcmZS9eDyb`u8eU40~7!NGav)? literal 0 HcmV?d00001 diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000000000000000000000000000000000000..9a4cb628ae772042c3356f4d6b6c7dcb7e8beb7e GIT binary patch literal 17 TcmZS9JaZ`5(ZC{?0Rk8SDh~rc literal 0 HcmV?d00001 diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 00000000..3d1809d4 --- /dev/null +++ b/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Sun Sep 16 19:20:12 CEST 2018 +gradle.version=4.4.1 diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b8bd6388..a2b99c7e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,8 +2,24 @@ + + + + + + + + + + + + + + + + @@ -20,14 +36,12 @@ - - + + - - - - - + + + @@ -35,60 +49,25 @@ - - + + - - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -166,17 +145,19 @@ - @@ -195,6 +176,9 @@ + + + @@ -206,7 +190,37 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -218,9 +232,6 @@ - - - @@ -228,8 +239,17 @@ + + + + + + + + + @@ -398,69 +418,149 @@ - + - - - - - - - - - - - + + - + + + - + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + @@ -468,7 +568,6 @@ - @@ -476,9 +575,6 @@ - - - @@ -502,7 +598,6 @@ - @@ -527,13 +622,6 @@ - - - - - - - @@ -559,7 +647,6 @@ - @@ -567,7 +654,6 @@ - @@ -575,23 +661,6 @@ - - - - - - - - - - - - - - - - - @@ -627,7 +696,6 @@ - @@ -635,7 +703,6 @@ - @@ -643,7 +710,6 @@ - @@ -651,7 +717,6 @@ - @@ -659,23 +724,13 @@ - - - - - - - - - - - + @@ -684,7 +739,6 @@ - @@ -694,47 +748,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -742,7 +755,6 @@ - @@ -750,16 +762,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - @@ -767,45 +846,86 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + Android + + + + + + + + + + + + + + + 1.8 + + + + + + + + flutter_inappbrowser_android + + + + + + + + Dart SDK + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index da10681a..cfa417a8 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ class _MyAppState extends State { ### InAppBrowser.open -Opens a URL in a new InAppBrowser instance, the current browser instance, or the system browser. +Opens a URL in a new InAppBrowser instance or the system browser. ```dart inAppBrowser.open(url, target, options); diff --git a/android/build.gradle b/android/build.gradle index 04b65821..24f18e77 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -32,3 +32,7 @@ android { disable 'InvalidPackage' } } + +dependencies { + implementation 'com.android.support:customtabs:27.1.1' +} \ No newline at end of file diff --git a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowser.java b/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowser.java index 7866fe8f..d38cbc0e 100644 --- a/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowser.java +++ b/android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppBrowser.java @@ -155,6 +155,7 @@ public class InAppBrowser implements MethodCallHandler { switch (call.method) { case "open": final String url = call.argument("url").toString(); + String t = call.argument("target").toString(); if (t == null || t.equals("") || t.equals(NULL)) { t = SELF; diff --git a/example/android/build.gradle b/example/android/build.gradle index d4225c79..ae216294 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.1.2' + classpath 'com.android.tools.build:gradle:3.1.4' } } diff --git a/example/flutter_plugin/.gitignore b/example/flutter_plugin/.gitignore new file mode 100644 index 00000000..7ecebb44 --- /dev/null +++ b/example/flutter_plugin/.gitignore @@ -0,0 +1,8 @@ +.DS_Store +.dart_tool/ + +.packages +.pub/ +pubspec.lock + +build/ diff --git a/example/flutter_plugin/CHANGELOG.md b/example/flutter_plugin/CHANGELOG.md new file mode 100644 index 00000000..41cc7d81 --- /dev/null +++ b/example/flutter_plugin/CHANGELOG.md @@ -0,0 +1,3 @@ +## 0.0.1 + +* TODO: Describe initial release. diff --git a/example/flutter_plugin/LICENSE b/example/flutter_plugin/LICENSE new file mode 100644 index 00000000..ba75c69f --- /dev/null +++ b/example/flutter_plugin/LICENSE @@ -0,0 +1 @@ +TODO: Add your license here. diff --git a/example/flutter_plugin/README.md b/example/flutter_plugin/README.md new file mode 100644 index 00000000..69a4389d --- /dev/null +++ b/example/flutter_plugin/README.md @@ -0,0 +1,10 @@ +# flutter_plugin + +A new Flutter plugin. + +## Getting Started + +For help getting started with Flutter, view our online +[documentation](https://flutter.io/). + +For help on editing plugin code, view the [documentation](https://flutter.io/developing-packages/#edit-plugin-package). diff --git a/example/flutter_plugin/android/.gitignore b/example/flutter_plugin/android/.gitignore new file mode 100644 index 00000000..c6cbe562 --- /dev/null +++ b/example/flutter_plugin/android/.gitignore @@ -0,0 +1,8 @@ +*.iml +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/captures diff --git a/example/flutter_plugin/android/build.gradle b/example/flutter_plugin/android/build.gradle new file mode 100644 index 00000000..a5addfb0 --- /dev/null +++ b/example/flutter_plugin/android/build.gradle @@ -0,0 +1,34 @@ +group 'com.pichillilorenzo.flutterplugin' +version '1.0-SNAPSHOT' + +buildscript { + repositories { + google() + jcenter() + } + + dependencies { + classpath 'com.android.tools.build:gradle:3.1.2' + } +} + +rootProject.allprojects { + repositories { + google() + jcenter() + } +} + +apply plugin: 'com.android.library' + +android { + compileSdkVersion 27 + + defaultConfig { + minSdkVersion 16 + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + lintOptions { + disable 'InvalidPackage' + } +} diff --git a/example/flutter_plugin/android/gradle.properties b/example/flutter_plugin/android/gradle.properties new file mode 100644 index 00000000..8bd86f68 --- /dev/null +++ b/example/flutter_plugin/android/gradle.properties @@ -0,0 +1 @@ +org.gradle.jvmargs=-Xmx1536M diff --git a/example/flutter_plugin/android/settings.gradle b/example/flutter_plugin/android/settings.gradle new file mode 100644 index 00000000..e039a04a --- /dev/null +++ b/example/flutter_plugin/android/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'flutter_plugin' diff --git a/example/flutter_plugin/android/src/main/AndroidManifest.xml b/example/flutter_plugin/android/src/main/AndroidManifest.xml new file mode 100644 index 00000000..1c580028 --- /dev/null +++ b/example/flutter_plugin/android/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + diff --git a/example/flutter_plugin/android/src/main/java/com/pichillilorenzo/flutterplugin/FlutterPlugin.java b/example/flutter_plugin/android/src/main/java/com/pichillilorenzo/flutterplugin/FlutterPlugin.java new file mode 100644 index 00000000..a7ea5cc0 --- /dev/null +++ b/example/flutter_plugin/android/src/main/java/com/pichillilorenzo/flutterplugin/FlutterPlugin.java @@ -0,0 +1,25 @@ +package com.pichillilorenzo.flutterplugin; + +import io.flutter.plugin.common.MethodCall; +import io.flutter.plugin.common.MethodChannel; +import io.flutter.plugin.common.MethodChannel.MethodCallHandler; +import io.flutter.plugin.common.MethodChannel.Result; +import io.flutter.plugin.common.PluginRegistry.Registrar; + +/** FlutterPlugin */ +public class FlutterPlugin implements MethodCallHandler { + /** Plugin registration. */ + public static void registerWith(Registrar registrar) { + final MethodChannel channel = new MethodChannel(registrar.messenger(), "flutter_plugin"); + channel.setMethodCallHandler(new FlutterPlugin()); + } + + @Override + public void onMethodCall(MethodCall call, Result result) { + if (call.method.equals("getPlatformVersion")) { + result.success("Android " + android.os.Build.VERSION.RELEASE); + } else { + result.notImplemented(); + } + } +} diff --git a/example/flutter_plugin/example/.gitignore b/example/flutter_plugin/example/.gitignore new file mode 100644 index 00000000..47e0b4d6 --- /dev/null +++ b/example/flutter_plugin/example/.gitignore @@ -0,0 +1,71 @@ +# Miscellaneous +*.class +*.lock +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# Visual Studio Code related +.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +.dart_tool/ +.flutter-plugins +.packages +.pub-cache/ +.pub/ +build/ + +# Android related +**/android/**/gradle-wrapper.jar +**/android/.gradle +**/android/captures/ +**/android/gradlew +**/android/gradlew.bat +**/android/local.properties +**/android/**/GeneratedPluginRegistrant.java + +# iOS/XCode related +**/ios/**/*.mode1v3 +**/ios/**/*.mode2v3 +**/ios/**/*.moved-aside +**/ios/**/*.pbxuser +**/ios/**/*.perspectivev3 +**/ios/**/*sync/ +**/ios/**/.sconsign.dblite +**/ios/**/.tags* +**/ios/**/.vagrant/ +**/ios/**/DerivedData/ +**/ios/**/Icon? +**/ios/**/Pods/ +**/ios/**/.symlinks/ +**/ios/**/profile +**/ios/**/xcuserdata +**/ios/.generated/ +**/ios/Flutter/App.framework +**/ios/Flutter/Flutter.framework +**/ios/Flutter/Generated.xcconfig +**/ios/Flutter/app.flx +**/ios/Flutter/app.zip +**/ios/Flutter/flutter_assets/ +**/ios/ServiceDefinitions.json +**/ios/Runner/GeneratedPluginRegistrant.* + +# Exceptions to above rules. +!**/ios/**/default.mode1v3 +!**/ios/**/default.mode2v3 +!**/ios/**/default.pbxuser +!**/ios/**/default.perspectivev3 +!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages diff --git a/example/flutter_plugin/example/.metadata b/example/flutter_plugin/example/.metadata new file mode 100644 index 00000000..dbdb9afb --- /dev/null +++ b/example/flutter_plugin/example/.metadata @@ -0,0 +1,8 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: 2bca8007bd1962940fa3b3d568bc52e446005616 + channel: master diff --git a/example/flutter_plugin/example/README.md b/example/flutter_plugin/example/README.md new file mode 100644 index 00000000..17ecae4d --- /dev/null +++ b/example/flutter_plugin/example/README.md @@ -0,0 +1,8 @@ +# flutter_plugin_example + +Demonstrates how to use the flutter_plugin plugin. + +## Getting Started + +For help getting started with Flutter, view our online +[documentation](https://flutter.io/). diff --git a/example/flutter_plugin/example/android/app/build.gradle b/example/flutter_plugin/example/android/app/build.gradle new file mode 100644 index 00000000..545d4ec7 --- /dev/null +++ b/example/flutter_plugin/example/android/app/build.gradle @@ -0,0 +1,61 @@ +def localProperties = new Properties() +def localPropertiesFile = rootProject.file('local.properties') +if (localPropertiesFile.exists()) { + localPropertiesFile.withReader('UTF-8') { reader -> + localProperties.load(reader) + } +} + +def flutterRoot = localProperties.getProperty('flutter.sdk') +if (flutterRoot == null) { + throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") +} + +def flutterVersionCode = localProperties.getProperty('flutter.versionCode') +if (flutterVersionCode == null) { + flutterVersionCode = '1' +} + +def flutterVersionName = localProperties.getProperty('flutter.versionName') +if (flutterVersionName == null) { + flutterVersionName = '1.0' +} + +apply plugin: 'com.android.application' +apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" + +android { + compileSdkVersion 27 + + lintOptions { + disable 'InvalidPackage' + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId "com.pichillilorenzo.flutterpluginexample" + minSdkVersion 16 + targetSdkVersion 27 + versionCode flutterVersionCode.toInteger() + versionName flutterVersionName + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig signingConfigs.debug + } + } +} + +flutter { + source '../..' +} + +dependencies { + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' +} diff --git a/example/flutter_plugin/example/android/app/src/main/AndroidManifest.xml b/example/flutter_plugin/example/android/app/src/main/AndroidManifest.xml new file mode 100644 index 00000000..dbdb33a8 --- /dev/null +++ b/example/flutter_plugin/example/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + diff --git a/example/flutter_plugin/example/android/app/src/main/java/com/pichillilorenzo/flutterpluginexample/MainActivity.java b/example/flutter_plugin/example/android/app/src/main/java/com/pichillilorenzo/flutterpluginexample/MainActivity.java new file mode 100644 index 00000000..98ae0639 --- /dev/null +++ b/example/flutter_plugin/example/android/app/src/main/java/com/pichillilorenzo/flutterpluginexample/MainActivity.java @@ -0,0 +1,13 @@ +package com.pichillilorenzo.flutterpluginexample; + +import android.os.Bundle; +import io.flutter.app.FlutterActivity; +import io.flutter.plugins.GeneratedPluginRegistrant; + +public class MainActivity extends FlutterActivity { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + GeneratedPluginRegistrant.registerWith(this); + } +} diff --git a/example/flutter_plugin/example/android/app/src/main/res/drawable/launch_background.xml b/example/flutter_plugin/example/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 00000000..304732f8 --- /dev/null +++ b/example/flutter_plugin/example/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/example/flutter_plugin/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/example/flutter_plugin/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..db77bb4b7b0906d62b1847e87f15cdcacf6a4f29 GIT binary patch literal 544 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8bpbvhu0Wd6uZuB!w&u2PAxD2eNXD>P5D~Wn-+_Wa#27Xc zC?Zj|6r#X(-D3u$NCt}(Ms06KgJ4FxJVv{GM)!I~&n8Bnc94O7-Hd)cjDZswgC;Qs zO=b+9!WcT8F?0rF7!Uys2bs@gozCP?z~o%U|N3vA*22NaGQG zlg@K`O_XuxvZ&Ks^m&R!`&1=spLvfx7oGDKDwpwW`#iqdw@AL`7MR}m`rwr|mZgU`8P7SBkL78fFf!WnuYWm$5Z0 zNXhDbCv&49sM544K|?c)WrFfiZvCi9h0O)B3Pgg&ebxsLQ05GG~ AQ2+n{ literal 0 HcmV?d00001 diff --git a/example/flutter_plugin/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/example/flutter_plugin/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..17987b79bb8a35cc66c3c1fd44f5a5526c1b78be GIT binary patch literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xx&nMcT!A!W`0S9QKQy;}1Cl^CgaH=;G9cpY;r$Q>i*pfB zP2drbID<_#qf;rPZx^FqH)F_D#*k@@q03KywUtLX8Ua?`H+NMzkczFPK3lFz@i_kW%1NOn0|D2I9n9wzH8m|-tHjsw|9>@K=iMBhxvkv6m8Y-l zytQ?X=U+MF$@3 zt`~i=@j|6y)RWMK--}M|=T`o&^Ni>IoWKHEbBXz7?A@mgWoL>!*SXo`SZH-*HSdS+ yn*9;$7;m`l>wYBC5bq;=U}IMqLzqbYCidGC!)_gkIk_C@Uy!y&wkt5C($~2D>~)O*cj@FGjOCM)M>_ixfudOh)?xMu#Fs z#}Y=@YDTwOM)x{K_j*Q;dPdJ?Mz0n|pLRx{4n|)f>SXlmV)XB04CrSJn#dS5nK2lM zrZ9#~WelCp7&e13Y$jvaEXHskn$2V!!DN-nWS__6T*l;H&Fopn?A6HZ-6WRLFP=R` zqG+CE#d4|IbyAI+rJJ`&x9*T`+a=p|0O(+s{UBcyZdkhj=yS1>AirP+0R;mf2uMgM zC}@~JfByORAh4SyRgi&!(cja>F(l*O+nd+@4m$|6K6KDn_&uvCpV23&>G9HJp{xgg zoq1^2_p9@|WEo z*X_Uko@K)qYYv~>43eQGMdbiGbo>E~Q& zrYBH{QP^@Sti!`2)uG{irBBq@y*$B zi#&(U-*=fp74j)RyIw49+0MRPMRU)+a2r*PJ$L5roHt2$UjExCTZSbq%V!HeS7J$N zdG@vOZB4v_lF7Plrx+hxo7(fCV&}fHq)$ literal 0 HcmV?d00001 diff --git a/example/flutter_plugin/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/example/flutter_plugin/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..d5f1c8d34e7a88e3f88bea192c3a370d44689c3c GIT binary patch literal 1031 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=BuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFa`(sgt!6~Yi|1%a`XoT0ojZ}lNrNjb9xjc(B0U1_% zz5^97Xt*%oq$rQy4?0GKNfJ44uvxI)gC`h-NZ|&0-7(qS@?b!5r36oQ}zyZrNO3 zMO=Or+<~>+A&uN&E!^Sl+>xE!QC-|oJv`ApDhqC^EWD|@=#J`=d#Xzxs4ah}w&Jnc z$|q_opQ^2TrnVZ0o~wh<3t%W&flvYGe#$xqda2bR_R zvPYgMcHgjZ5nSA^lJr%;<&0do;O^tDDh~=pIxA#coaCY>&N%M2^tq^U%3DB@ynvKo}b?yu-bFc-u0JHzced$sg7S3zqI(2 z#Km{dPr7I=pQ5>FuK#)QwK?Y`E`B?nP+}U)I#c1+FM*1kNvWG|a(TpksZQ3B@sD~b zpQ2)*V*TdwjFOtHvV|;OsiDqHi=6%)o4b!)x$)%9pGTsE z-JL={-Ffv+T87W(Xpooq<`r*VzWQcgBN$$`u}f>-ZQI1BB8ykN*=e4rIsJx9>z}*o zo~|9I;xof literal 0 HcmV?d00001 diff --git a/example/flutter_plugin/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/example/flutter_plugin/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..4d6372eebdb28e45604e46eeda8dd24651419bc0 GIT binary patch literal 1443 zcmb`G{WsKk6vsdJTdFg%tJav9_E4vzrOaqkWF|A724Nly!y+?N9`YV6wZ}5(X(D_N(?!*n3`|_r0Hc?=PQw&*vnU?QTFY zB_MsH|!j$PP;I}?dppoE_gA(4uc!jV&0!l7_;&p2^pxNo>PEcNJv za5_RT$o2Mf!<+r?&EbHH6nMoTsDOa;mN(wv8RNsHpG)`^ymG-S5By8=l9iVXzN_eG%Xg2@Xeq76tTZ*dGh~Lo9vl;Zfs+W#BydUw zCkZ$o1LqWQO$FC9aKlLl*7x9^0q%0}$OMlp@Kk_jHXOjofdePND+j!A{q!8~Jn+s3 z?~~w@4?egS02}8NuulUA=L~QQfm;MzCGd)XhiftT;+zFO&JVyp2mBww?;QByS_1w! zrQlx%{^cMj0|Bo1FjwY@Q8?Hx0cIPF*@-ZRFpPc#bBw{5@tD(5%sClzIfl8WU~V#u zm5Q;_F!wa$BSpqhN>W@2De?TKWR*!ujY;Yylk_X5#~V!L*Gw~;$%4Q8~Mad z@`-kG?yb$a9cHIApZDVZ^U6Xkp<*4rU82O7%}0jjHlK{id@?-wpN*fCHXyXh(bLt* zPc}H-x0e4E&nQ>y%B-(EL=9}RyC%MyX=upHuFhAk&MLbsF0LP-q`XnH78@fT+pKPW zu72MW`|?8ht^tz$iC}ZwLp4tB;Q49K!QCF3@!iB1qOI=?w z7In!}F~ij(18UYUjnbmC!qKhPo%24?8U1x{7o(+?^Zu0Hx81|FuS?bJ0jgBhEMzf< zCgUq7r2OCB(`XkKcN-TL>u5y#dD6D!)5W?`O5)V^>jb)P)GBdy%t$uUMpf$SNV31$ zb||OojAbvMP?T@$h_ZiFLFVHDmbyMhJF|-_)HX3%m=CDI+ID$0^C>kzxprBW)hw(v zr!Gmda);ICoQyhV_oP5+C%?jcG8v+D@9f?Dk*!BxY}dazmrT@64UrP3hlslANK)bq z$67n83eh}OeW&SV@HG95P|bjfqJ7gw$e+`Hxo!4cx`jdK1bJ>YDSpGKLPZ^1cv$ek zIB?0S<#tX?SJCLWdMd{-ME?$hc7A$zBOdIJ)4!KcAwb=VMov)nK;9z>x~rfT1>dS+ zZ6#`2v@`jgbqq)P22H)Tx2CpmM^o1$B+xT6`(v%5xJ(?j#>Q$+rx_R|7TzDZe{J6q zG1*EcU%tE?!kO%^M;3aM6JN*LAKUVb^xz8-Pxo#jR5(-KBeLJvA@-gxNHx0M-ZJLl z;#JwQoh~9V?`UVo#}{6ka@II>++D@%KqGpMdlQ}?9E*wFcf5(#XQnP$Dk5~%iX^>f z%$y;?M0BLp{O3a(-4A?ewryHrrD%cx#Q^%KY1H zNre$ve+vceSLZcNY4U(RBX&)oZn*Py()h)XkE?PL$!bNb{N5FVI2Y%LKEm%yvpyTP z(1P?z~7YxD~Rf<(a@_y` literal 0 HcmV?d00001 diff --git a/example/flutter_plugin/example/android/app/src/main/res/values/styles.xml b/example/flutter_plugin/example/android/app/src/main/res/values/styles.xml new file mode 100644 index 00000000..00fa4417 --- /dev/null +++ b/example/flutter_plugin/example/android/app/src/main/res/values/styles.xml @@ -0,0 +1,8 @@ + + + + diff --git a/example/flutter_plugin/example/android/build.gradle b/example/flutter_plugin/example/android/build.gradle new file mode 100644 index 00000000..d4225c79 --- /dev/null +++ b/example/flutter_plugin/example/android/build.gradle @@ -0,0 +1,29 @@ +buildscript { + repositories { + google() + jcenter() + } + + dependencies { + classpath 'com.android.tools.build:gradle:3.1.2' + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +rootProject.buildDir = '../build' +subprojects { + project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { + project.evaluationDependsOn(':app') +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/example/flutter_plugin/example/android/gradle.properties b/example/flutter_plugin/example/android/gradle.properties new file mode 100644 index 00000000..8bd86f68 --- /dev/null +++ b/example/flutter_plugin/example/android/gradle.properties @@ -0,0 +1 @@ +org.gradle.jvmargs=-Xmx1536M diff --git a/example/flutter_plugin/example/android/gradle/wrapper/gradle-wrapper.properties b/example/flutter_plugin/example/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..9372d0f3 --- /dev/null +++ b/example/flutter_plugin/example/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Fri Jun 23 08:50:38 CEST 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/example/flutter_plugin/example/android/settings.gradle b/example/flutter_plugin/example/android/settings.gradle new file mode 100644 index 00000000..5a2f14fb --- /dev/null +++ b/example/flutter_plugin/example/android/settings.gradle @@ -0,0 +1,15 @@ +include ':app' + +def flutterProjectRoot = rootProject.projectDir.parentFile.toPath() + +def plugins = new Properties() +def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins') +if (pluginsFile.exists()) { + pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) } +} + +plugins.each { name, path -> + def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile() + include ":$name" + project(":$name").projectDir = pluginDirectory +} diff --git a/example/flutter_plugin/example/ios/Flutter/AppFrameworkInfo.plist b/example/flutter_plugin/example/ios/Flutter/AppFrameworkInfo.plist new file mode 100644 index 00000000..9367d483 --- /dev/null +++ b/example/flutter_plugin/example/ios/Flutter/AppFrameworkInfo.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + App + CFBundleIdentifier + io.flutter.flutter.app + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + App + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + MinimumOSVersion + 8.0 + + diff --git a/example/flutter_plugin/example/ios/Flutter/Debug.xcconfig b/example/flutter_plugin/example/ios/Flutter/Debug.xcconfig new file mode 100644 index 00000000..1fce94d3 --- /dev/null +++ b/example/flutter_plugin/example/ios/Flutter/Debug.xcconfig @@ -0,0 +1,3 @@ +#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include "Generated.xcconfig" +FLUTTER_BUILD_MODE=debug \ No newline at end of file diff --git a/example/flutter_plugin/example/ios/Flutter/Release.xcconfig b/example/flutter_plugin/example/ios/Flutter/Release.xcconfig new file mode 100644 index 00000000..399e9340 --- /dev/null +++ b/example/flutter_plugin/example/ios/Flutter/Release.xcconfig @@ -0,0 +1,2 @@ +#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include "Generated.xcconfig" diff --git a/example/flutter_plugin/example/ios/Podfile b/example/flutter_plugin/example/ios/Podfile new file mode 100644 index 00000000..2dfb5019 --- /dev/null +++ b/example/flutter_plugin/example/ios/Podfile @@ -0,0 +1,65 @@ +# Uncomment this line to define a global platform for your project +# platform :ios, '9.0' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +def parse_KV_file(file, separator='=') + file_abs_path = File.expand_path(file) + if !File.exists? file_abs_path + return []; + end + pods_ary = [] + skip_line_start_symbols = ["#", "/"] + File.foreach(file_abs_path) { |line| + next if skip_line_start_symbols.any? { |symbol| line =~ /^\s*#{symbol}/ } + plugin = line.split(pattern=separator) + if plugin.length == 2 + podname = plugin[0].strip() + path = plugin[1].strip() + podpath = File.expand_path("#{path}", file_abs_path) + pods_ary.push({:name => podname, :path => podpath}); + else + puts "Invalid plugin specification: #{line}" + end + } + return pods_ary +end + +target 'Runner' do + use_frameworks! + + # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock + # referring to absolute paths on developers' machines. + system('rm -rf .symlinks') + system('mkdir -p .symlinks/plugins') + + # Flutter Pods + generated_xcode_build_settings = parse_KV_file('./Flutter/Generated.xcconfig') + if generated_xcode_build_settings.empty? + puts "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter packages get is executed first." + end + generated_xcode_build_settings.map { |p| + if p[:name] == 'FLUTTER_FRAMEWORK_DIR' + symlink = File.join('.symlinks', 'flutter') + File.symlink(File.dirname(p[:path]), symlink) + pod 'Flutter', :path => File.join(symlink, File.basename(p[:path])) + end + } + + # Plugin Pods + plugin_pods = parse_KV_file('../.flutter-plugins') + plugin_pods.map { |p| + symlink = File.join('.symlinks', 'plugins', p[:name]) + File.symlink(p[:path], symlink) + pod p[:name], :path => File.join(symlink, 'ios') + } +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + target.build_configurations.each do |config| + config.build_settings['ENABLE_BITCODE'] = 'NO' + end + end +end diff --git a/example/flutter_plugin/example/ios/Runner.xcodeproj/project.pbxproj b/example/flutter_plugin/example/ios/Runner.xcodeproj/project.pbxproj new file mode 100644 index 00000000..23216f50 --- /dev/null +++ b/example/flutter_plugin/example/ios/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,509 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; }; + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; }; + 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; }; + 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; }; + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + DB2612FCD79CFD30D1ED676B /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C43B270A1396F896DC0446C6 /* Pods_Runner.framework */; }; + ED5EF107214FEBA60065FD45 /* Storyboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = ED5EF106214FEBA60065FD45 /* Storyboard.storyboard */; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 9705A1C41CF9048500538489 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */, + 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; }; + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = ""; }; + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; + 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; + 9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = ""; }; + 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + C43B270A1396F896DC0446C6 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + ED5EF106214FEBA60065FD45 /* Storyboard.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Storyboard.storyboard; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 97C146EB1CF9000F007C117D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */, + 3B80C3941E831B6300D905FE /* App.framework in Frameworks */, + DB2612FCD79CFD30D1ED676B /* Pods_Runner.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 1370AF27C0FCD5A746BF55B6 /* Frameworks */ = { + isa = PBXGroup; + children = ( + C43B270A1396F896DC0446C6 /* Pods_Runner.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + 5BC6EF24EEA526A3E6F37537 /* Pods */ = { + isa = PBXGroup; + children = ( + ); + name = Pods; + sourceTree = ""; + }; + 9740EEB11CF90186004384FC /* Flutter */ = { + isa = PBXGroup; + children = ( + 2D5378251FAA1A9400D5DBA9 /* flutter_assets */, + 3B80C3931E831B6300D905FE /* App.framework */, + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, + 9740EEBA1CF902C7004384FC /* Flutter.framework */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 9740EEB31CF90195004384FC /* Generated.xcconfig */, + ); + name = Flutter; + sourceTree = ""; + }; + 97C146E51CF9000F007C117D = { + isa = PBXGroup; + children = ( + 9740EEB11CF90186004384FC /* Flutter */, + 97C146F01CF9000F007C117D /* Runner */, + 97C146EF1CF9000F007C117D /* Products */, + 5BC6EF24EEA526A3E6F37537 /* Pods */, + 1370AF27C0FCD5A746BF55B6 /* Frameworks */, + ); + sourceTree = ""; + }; + 97C146EF1CF9000F007C117D /* Products */ = { + isa = PBXGroup; + children = ( + 97C146EE1CF9000F007C117D /* Runner.app */, + ); + name = Products; + sourceTree = ""; + }; + 97C146F01CF9000F007C117D /* Runner */ = { + isa = PBXGroup; + children = ( + 97C146FA1CF9000F007C117D /* Main.storyboard */, + 97C146FD1CF9000F007C117D /* Assets.xcassets */, + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, + 97C147021CF9000F007C117D /* Info.plist */, + 97C146F11CF9000F007C117D /* Supporting Files */, + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, + ED5EF106214FEBA60065FD45 /* Storyboard.storyboard */, + ); + path = Runner; + sourceTree = ""; + }; + 97C146F11CF9000F007C117D /* Supporting Files */ = { + isa = PBXGroup; + children = ( + ); + name = "Supporting Files"; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 97C146ED1CF9000F007C117D /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 3410A771F369E256652931DE /* [CP] Check Pods Manifest.lock */, + 9740EEB61CF901F6004384FC /* Run Script */, + 97C146EA1CF9000F007C117D /* Sources */, + 97C146EB1CF9000F007C117D /* Frameworks */, + 97C146EC1CF9000F007C117D /* Resources */, + 9705A1C41CF9048500538489 /* Embed Frameworks */, + 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + C682215FBA770A2F10789415 /* [CP] Embed Pods Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Runner; + productName = Runner; + productReference = 97C146EE1CF9000F007C117D /* Runner.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 97C146E61CF9000F007C117D /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0910; + ORGANIZATIONNAME = "The Chromium Authors"; + TargetAttributes = { + 97C146ED1CF9000F007C117D = { + CreatedOnToolsVersion = 7.3.1; + DevelopmentTeam = PFP8UV45Y6; + LastSwiftMigration = 0910; + }; + }; + }; + buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 97C146E51CF9000F007C117D; + productRefGroup = 97C146EF1CF9000F007C117D /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 97C146ED1CF9000F007C117D /* Runner */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 97C146EC1CF9000F007C117D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, + 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */, + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, + 2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */, + ED5EF107214FEBA60065FD45 /* Storyboard.storyboard in Resources */, + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3410A771F369E256652931DE /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Thin Binary"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin"; + }; + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + }; + C682215FBA770A2F10789415 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", + "${PODS_ROOT}/../.symlinks/flutter/ios-release/Flutter.framework", + "${BUILT_PRODUCTS_DIR}/flutter_plugin/flutter_plugin.framework", + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_plugin.framework", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 97C146EA1CF9000F007C117D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + 97C146FA1CF9000F007C117D /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C146FB1CF9000F007C117D /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C147001CF9000F007C117D /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 97C147031CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 97C147041CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 97C147061CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = PFP8UV45Y6; + ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.pichillilorenzo.flutterPluginExample; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Debug; + }; + 97C147071CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = PFP8UV45Y6; + ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/Flutter", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.pichillilorenzo.flutterPluginExample; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147031CF9000F007C117D /* Debug */, + 97C147041CF9000F007C117D /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147061CF9000F007C117D /* Debug */, + 97C147071CF9000F007C117D /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 97C146E61CF9000F007C117D /* Project object */; +} diff --git a/example/flutter_plugin/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/example/flutter_plugin/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..1d526a16 --- /dev/null +++ b/example/flutter_plugin/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/example/flutter_plugin/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/flutter_plugin/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 00000000..1263ac84 --- /dev/null +++ b/example/flutter_plugin/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/example/flutter_plugin/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/example/flutter_plugin/example/ios/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..21a3cc14 --- /dev/null +++ b/example/flutter_plugin/example/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/example/flutter_plugin/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/example/flutter_plugin/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/example/flutter_plugin/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/example/flutter_plugin/example/ios/Runner/AppDelegate.swift b/example/flutter_plugin/example/ios/Runner/AppDelegate.swift new file mode 100644 index 00000000..71cc41e3 --- /dev/null +++ b/example/flutter_plugin/example/ios/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +import UIKit +import Flutter + +@UIApplicationMain +@objc class AppDelegate: FlutterAppDelegate { + override func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]? + ) -> Bool { + GeneratedPluginRegistrant.register(with: self) + return super.application(application, didFinishLaunchingWithOptions: launchOptions) + } +} diff --git a/example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000..d36b1fab --- /dev/null +++ b/example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,122 @@ +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@3x.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@1x.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@1x.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@1x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-App-83.5x83.5@2x.png", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "Icon-App-1024x1024@1x.png", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..3d43d11e66f4de3da27ed045ca4fe38ad8b48094 GIT binary patch literal 11112 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 P-1+_A+?hGkL;m(J7kc&K literal 0 HcmV?d00001 diff --git a/example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..28c6bf03016f6c994b70f38d1b7346e5831b531f GIT binary patch literal 564 zcmV-40?Yl0P)Px$?ny*JR5%f>l)FnDQ543{x%ZCiu33$Wg!pQFfT_}?5Q|_VSlIbLC`dpoMXL}9 zHfd9&47Mo(7D231gb+kjFxZHS4-m~7WurTH&doVX2KI5sU4v(sJ1@T9eCIKPjsqSr z)C01LsCxk=72-vXmX}CQD#BD;Cthymh&~=f$Q8nn0J<}ZrusBy4PvRNE}+1ceuj8u z0mW5k8fmgeLnTbWHGwfKA3@PdZxhn|PypR&^p?weGftrtCbjF#+zk_5BJh7;0`#Wr zgDpM_;Ax{jO##IrT`Oz;MvfwGfV$zD#c2xckpcXC6oou4ML~ezCc2EtnsQTB4tWNg z?4bkf;hG7IMfhgNI(FV5Gs4|*GyMTIY0$B=_*mso9Ityq$m^S>15>-?0(zQ<8Qy<_TjHE33(?_M8oaM zyc;NxzRVK@DL6RJnX%U^xW0Gpg(lXp(!uK1v0YgHjs^ZXSQ|m#lV7ip7{`C_J2TxPmfw%h$|%acrYHt)Re^PB%O&&=~a zhS(%I#+V>J-vjIib^<+s%ludY7y^C(P8nmqn9fp!i+?vr`bziDE=bx`%2W#Xyrj|i z!XQ4v1%L`m{7KT7q+LZNB^h8Ha2e=`Wp65^0;J00)_^G=au=8Yo;1b`CV&@#=jIBo zjN^JNVfYSs)+kDdGe7`1&8!?MQYKS?DuHZf3iogk_%#9E|5S zWeHrmAo>P;ejX7mwq#*}W25m^ZI+{(Z8fI?4jM_fffY0nok=+88^|*_DwcW>mR#e+ zX$F_KMdb6sRz!~7KkyN0G(3XQ+;z3X%PZ4gh;n-%62U<*VUKNv(D&Q->Na@Xb&u5Q3`3DGf+a8O5x7c#7+R+EAYl@R5us)CIw z7sT@_y~Ao@uL#&^LIh&QceqiT^+lb0YbFZt_SHOtWA%mgPEKVNvVgCsXy{5+zl*X8 zCJe)Q@y>wH^>l4;h1l^Y*9%-23TSmE>q5nI@?mt%n;Sj4Qq`Z+ib)a*a^cJc%E9^J zB;4s+K@rARbcBLT5P=@r;IVnBMKvT*)ew*R;&8vu%?Z&S>s?8?)3*YawM0P4!q$Kv zMmKh3lgE~&w&v%wVzH3Oe=jeNT=n@Y6J6TdHWTjXfX~-=1A1Bw`EW8rn}MqeI34nh zexFeA?&C3B2(E?0{drE@DA2pu(A#ElY&6el60Rn|Qpn-FkfQ8M93AfWIr)drgDFEU zghdWK)^71EWCP(@(=c4kfH1Y(4iugD4fve6;nSUpLT%!)MUHs1!zJYy4y||C+SwQ! z)KM&$7_tyM`sljP2fz6&Z;jxRn{Wup8IOUx8D4uh&(=O zx-7$a;U><*5L^!%xRlw)vAbh;sdlR||& ze}8_8%)c2Fwy=F&H|LM+p{pZB5DKTx>Y?F1N%BlZkXf!}JeGuMZk~LPi7{cidvUGB zAJ4LVeNV%XO>LTrklB#^-;8nb;}6l;1oW&WS=Mz*Az!4cqqQzbOSFq`$Q%PfD7srM zpKgP-D_0XPTRX*hAqeq0TDkJ;5HB1%$3Np)99#16c{ zJImlNL(npL!W|Gr_kxl1GVmF5&^$^YherS7+~q$p zt}{a=*RiD2Ikv6o=IM1kgc7zqpaZ;OB)P!1zz*i3{U()Dq#jG)egvK}@uFLa`oyWZ zf~=MV)|yJn`M^$N%ul5);JuQvaU1r2wt(}J_Qgyy`qWQI`hEeRX0uC@c1(dQ2}=U$ tNIIaX+dr)NRWXcxoR{>fqI{SF_dm1Ylv~=3YHI)h002ovPDHLkV1g(pWS;;4 literal 0 HcmV?d00001 diff --git a/example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..f091b6b0bca859a3f474b03065bef75ba58a9e4c GIT binary patch literal 1588 zcmV-42Fv-0P)C1SqPt}wig>|5Crh^=oyX$BK<}M8eLU3e2hGT;=G|!_SP)7zNI6fqUMB=)y zRAZ>eDe#*r`yDAVgB_R*LB*MAc)8(b{g{9McCXW!lq7r(btRoB9!8B-#AI6JMb~YFBEvdsV)`mEQO^&#eRKx@b&x- z5lZm*!WfD8oCLzfHGz#u7sT0^VLMI1MqGxF^v+`4YYnVYgk*=kU?HsSz{v({E3lb9 z>+xILjBN)t6`=g~IBOelGQ(O990@BfXf(DRI5I$qN$0Gkz-FSc$3a+2fX$AedL4u{ z4V+5Ong(9LiGcIKW?_352sR;LtDPmPJXI{YtT=O8=76o9;*n%_m|xo!i>7$IrZ-{l z-x3`7M}qzHsPV@$v#>H-TpjDh2UE$9g6sysUREDy_R(a)>=eHw-WAyfIN z*qb!_hW>G)Tu8nSw9yn#3wFMiLcfc4pY0ek1}8(NqkBR@t4{~oC>ryc-h_ByH(Cg5 z>ao-}771+xE3um9lWAY1FeQFxowa1(!J(;Jg*wrg!=6FdRX+t_<%z&d&?|Bn){>zm zZQj(aA_HeBY&OC^jj*)N`8fa^ePOU72VpInJoI1?`ty#lvlNzs(&MZX+R%2xS~5Kh zX*|AU4QE#~SgPzOXe9>tRj>hjU@c1k5Y_mW*Jp3fI;)1&g3j|zDgC+}2Q_v%YfDax z!?umcN^n}KYQ|a$Lr+51Nf9dkkYFSjZZjkma$0KOj+;aQ&721~t7QUKx61J3(P4P1 zstI~7-wOACnWP4=8oGOwz%vNDqD8w&Q`qcNGGrbbf&0s9L0De{4{mRS?o0MU+nR_! zrvshUau0G^DeMhM_v{5BuLjb#Hh@r23lDAk8oF(C+P0rsBpv85EP>4CVMx#04MOfG z;P%vktHcXwTj~+IE(~px)3*MY77e}p#|c>TD?sMatC0Tu4iKKJ0(X8jxQY*gYtxsC z(zYC$g|@+I+kY;dg_dE>scBf&bP1Nc@Hz<3R)V`=AGkc;8CXqdi=B4l2k|g;2%#m& z*jfX^%b!A8#bI!j9-0Fi0bOXl(-c^AB9|nQaE`*)Hw+o&jS9@7&Gov#HbD~#d{twV zXd^Tr^mWLfFh$@Dr$e;PBEz4(-2q1FF0}c;~B5sA}+Q>TOoP+t>wf)V9Iy=5ruQa;z)y zI9C9*oUga6=hxw6QasLPnee@3^Rr*M{CdaL5=R41nLs(AHk_=Y+A9$2&H(B7!_pURs&8aNw7?`&Z&xY_Ye z)~D5Bog^td-^QbUtkTirdyK^mTHAOuptDflut!#^lnKqU md>ggs(5nOWAqO?umG&QVYK#ibz}*4>0000U6E9hRK9^#O7(mu>ETqrXGsduA8$)?`v2seloOCza43C{NQ$$gAOH**MCn0Q?+L7dl7qnbRdqZ8LSVp1ItDxhxD?t@5_yHg6A8yI zC*%Wgg22K|8E#!~cTNYR~@Y9KepMPrrB8cABapAFa=`H+UGhkXUZV1GnwR1*lPyZ;*K(i~2gp|@bzp8}og7e*#% zEnr|^CWdVV!-4*Y_7rFvlww2Ze+>j*!Z!pQ?2l->4q#nqRu9`ELo6RMS5=br47g_X zRw}P9a7RRYQ%2Vsd0Me{_(EggTnuN6j=-?uFS6j^u69elMypu?t>op*wBx<=Wx8?( ztpe^(fwM6jJX7M-l*k3kEpWOl_Vk3@(_w4oc}4YF4|Rt=2V^XU?#Yz`8(e?aZ@#li0n*=g^qOcVpd-Wbok=@b#Yw zqn8u9a)z>l(1kEaPYZ6hwubN6i<8QHgsu0oE) ziJ(p;Wxm>sf!K+cw>R-(^Y2_bahB+&KI9y^);#0qt}t-$C|Bo71lHi{_+lg#f%RFy z0um=e3$K3i6K{U_4K!EX?F&rExl^W|G8Z8;`5z-k}OGNZ0#WVb$WCpQu-_YsiqKP?BB# vzVHS-CTUF4Ozn5G+mq_~Qqto~ahA+K`|lyv3(-e}00000NkvXXu0mjfd`9t{ literal 0 HcmV?d00001 diff --git a/example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d0ef06e7edb86cdfe0d15b4b0d98334a86163658 GIT binary patch literal 1716 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 literal 0 HcmV?d00001 diff --git a/example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c8f9ed8f5cee1c98386d13b17e89f719e83555b2 GIT binary patch literal 1895 zcmV-t2blPYP)FQtfgmafE#=YDCq`qUBt#QpG%*H6QHY765~R=q zZ6iudfM}q!Pz#~9JgOi8QJ|DSu?1-*(kSi1K4#~5?#|rh?sS)(-JQqX*}ciXJ56_H zdw=^s_srbAdqxlvGyrgGet#6T7_|j;95sL%MtM;q86vOxKM$f#puR)Bjv9Zvz9-di zXOTSsZkM83)E9PYBXC<$6(|>lNLVBb&&6y{NByFCp%6+^ALR@NCTse_wqvNmSWI-m z!$%KlHFH2omF!>#%1l3LTZg(s7eof$7*xB)ZQ0h?ejh?Ta9fDv59+u#MokW+1t8Zb zgHv%K(u9G^Lv`lh#f3<6!JVTL3(dCpxHbnbA;kKqQyd1~^Xe0VIaYBSWm6nsr;dFj z4;G-RyL?cYgsN1{L4ZFFNa;8)Rv0fM0C(~Tkit94 zz#~A)59?QjD&pAPSEQ)p8gP|DS{ng)j=2ux)_EzzJ773GmQ_Cic%3JJhC0t2cx>|v zJcVusIB!%F90{+}8hG3QU4KNeKmK%T>mN57NnCZ^56=0?&3@!j>a>B43pi{!u z7JyDj7`6d)qVp^R=%j>UIY6f+3`+qzIc!Y_=+uN^3BYV|o+$vGo-j-Wm<10%A=(Yk^beI{t%ld@yhKjq0iNjqN4XMGgQtbKubPM$JWBz}YA65k%dm*awtC^+f;a-x4+ddbH^7iDWGg&N0n#MW{kA|=8iMUiFYvMoDY@sPC#t$55gn6ykUTPAr`a@!(;np824>2xJthS z*ZdmT`g5-`BuJs`0LVhz+D9NNa3<=6m;cQLaF?tCv8)zcRSh66*Z|vXhG@$I%U~2l z?`Q zykI#*+rQ=z6Jm=Bui-SfpDYLA=|vzGE(dYm=OC8XM&MDo7ux4UF1~0J1+i%aCUpRe zt3L_uNyQ*cE(38Uy03H%I*)*Bh=Lb^Xj3?I^Hnbeq72(EOK^Y93CNp*uAA{5Lc=ky zx=~RKa4{iTm{_>_vSCm?$Ej=i6@=m%@VvAITnigVg{&@!7CDgs908761meDK5azA} z4?=NOH|PdvabgJ&fW2{Mo$Q0CcD8Qc84%{JPYt5EiG{MdLIAeX%T=D7NIP4%Hw}p9 zg)==!2Lbp#j{u_}hMiao9=!VSyx0gHbeCS`;q&vzeq|fs`y&^X-lso(Ls@-706qmA z7u*T5PMo_w3{se1t2`zWeO^hOvTsohG_;>J0wVqVe+n)AbQCx)yh9;w+J6?NF5Lmo zecS@ieAKL8%bVd@+-KT{yI|S}O>pYckUFs;ry9Ow$CD@ztz5K-*D$^{i(_1llhSh^ zEkL$}tsQt5>QA^;QgjgIfBDmcOgi5YDyu?t6vSnbp=1+@6D& z5MJ}B8q;bRlVoxasyhcUF1+)o`&3r0colr}QJ3hcSdLu;9;td>kf@Tcn<@9sIx&=m z;AD;SCh95=&p;$r{Xz3iWCO^MX83AGJ(yH&eTXgv|0=34#-&WAmw{)U7OU9!Wz^!7 zZ%jZFi@JR;>Mhi7S>V7wQ176|FdW2m?&`qa(ScO^CFPR80HucLHOTy%5s*HR0^8)i h0WYBP*#0Ks^FNSabJA*5${_#%002ovPDHLkV1oKhTl@e3 literal 0 HcmV?d00001 diff --git a/example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..a6d6b8609df07bf62e5100a53a01510388bd2b22 GIT binary patch literal 2665 zcmV-v3YPVWP)oFh3q0MFesq&64WThn3$;G69TfjsAv=f2G9}p zgSx99+!YV6qME!>9MD13x)k(+XE7W?_O4LoLb5ND8 zaV{9+P@>42xDfRiYBMSgD$0!vssptcb;&?u9u(LLBKmkZ>RMD=kvD3h`sk6!QYtBa ztlZI#nu$8lJ^q2Z79UTgZe>BU73(Aospiq+?SdMt8lDZ;*?@tyWVZVS_Q7S&*tJaiRlJ z+aSMOmbg3@h5}v;A*c8SbqM3icg-`Cnwl;7Ts%A1RkNIp+Txl-Ckkvg4oxrqGA5ewEgYqwtECD<_3Egu)xGllKt&J8g&+=ac@Jq4-?w6M3b*>w5 z69N3O%=I^6&UL5gZ!}trC7bUj*12xLdkNs~Bz4QdJJ*UDZox2UGR}SNg@lmOvhCc~ z*f_UeXv(=#I#*7>VZx2ObEN~UoGUTl=-@)E;YtCRZ>SVp$p9yG5hEFZ!`wI!spd)n zSk+vK0Vin7FL{7f&6OB%f;SH22dtbcF<|9fi2Fp%q4kxL!b1#l^)8dUwJ zwEf{(wJj@8iYDVnKB`eSU+;ml-t2`@%_)0jDM`+a46xhDbBj2+&Ih>1A>6aky#(-SYyE{R3f#y57wfLs z6w1p~$bp;6!9DX$M+J~S@D6vJAaElETnsX4h9a5tvPhC3L@qB~bOzkL@^z0k_hS{T4PF*TDrgdXp+dzsE? z>V|VR035Pl9n5&-RePFdS{7KAr2vPOqR9=M$vXA1Yy5>w;EsF`;OK{2pkn-kpp9Pw z)r;5JfJKKaT$4qCb{TaXHjb$QA{y0EYy*+b1XI;6Ah- zw13P)xT`>~eFoJC!>{2XL(a_#upp3gaR1#5+L(Jmzp4TBnx{~WHedpJ1ch8JFk~Sw z>F+gN+i+VD?gMXwcIhn8rz`>e>J^TI3E-MW>f}6R-pL}>WMOa0k#jN+`RyUVUC;#D zg|~oS^$6%wpF{^Qr+}X>0PKcr3Fc&>Z>uv@C);pwDs@2bZWhYP!rvGx?_|q{d`t<*XEb#=aOb=N+L@CVBGqImZf&+a zCQEa3$~@#kC);pasdG=f6tuIi0PO-y&tvX%>Mv=oY3U$nD zJ#gMegnQ46pq+3r=;zmgcG+zRc9D~c>z+jo9&D+`E6$LmyFqlmCYw;-Zooma{sR@~ z)_^|YL1&&@|GXo*pivH7k!msl+$Sew3%XJnxajt0K%3M6Bd&YFNy9}tWG^aovK2eX z1aL1%7;KRDrA@eG-Wr6w+;*H_VD~qLiVI`{_;>o)k`{8xa3EJT1O_>#iy_?va0eR? zDV=N%;Zjb%Z2s$@O>w@iqt!I}tLjGk!=p`D23I}N4Be@$(|iSA zf3Ih7b<{zqpDB4WF_5X1(peKe+rASze%u8eKLn#KKXt;UZ+Adf$_TO+vTqshLLJ5c z52HucO=lrNVae5XWOLm!V@n-ObU11!b+DN<$RuU+YsrBq*lYT;?AwJpmNKniF0Q1< zJCo>Q$=v$@&y=sj6{r!Y&y&`0$-I}S!H_~pI&2H8Z1C|BX4VgZ^-! zje3-;x0PBD!M`v*J_)rL^+$<1VJhH*2Fi~aA7s&@_rUHYJ9zD=M%4AFQ`}k8OC$9s XsPq=LnkwKG00000NkvXXu0mjfhAk5^ literal 0 HcmV?d00001 diff --git a/example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..a6d6b8609df07bf62e5100a53a01510388bd2b22 GIT binary patch literal 2665 zcmV-v3YPVWP)oFh3q0MFesq&64WThn3$;G69TfjsAv=f2G9}p zgSx99+!YV6qME!>9MD13x)k(+XE7W?_O4LoLb5ND8 zaV{9+P@>42xDfRiYBMSgD$0!vssptcb;&?u9u(LLBKmkZ>RMD=kvD3h`sk6!QYtBa ztlZI#nu$8lJ^q2Z79UTgZe>BU73(Aospiq+?SdMt8lDZ;*?@tyWVZVS_Q7S&*tJaiRlJ z+aSMOmbg3@h5}v;A*c8SbqM3icg-`Cnwl;7Ts%A1RkNIp+Txl-Ckkvg4oxrqGA5ewEgYqwtECD<_3Egu)xGllKt&J8g&+=ac@Jq4-?w6M3b*>w5 z69N3O%=I^6&UL5gZ!}trC7bUj*12xLdkNs~Bz4QdJJ*UDZox2UGR}SNg@lmOvhCc~ z*f_UeXv(=#I#*7>VZx2ObEN~UoGUTl=-@)E;YtCRZ>SVp$p9yG5hEFZ!`wI!spd)n zSk+vK0Vin7FL{7f&6OB%f;SH22dtbcF<|9fi2Fp%q4kxL!b1#l^)8dUwJ zwEf{(wJj@8iYDVnKB`eSU+;ml-t2`@%_)0jDM`+a46xhDbBj2+&Ih>1A>6aky#(-SYyE{R3f#y57wfLs z6w1p~$bp;6!9DX$M+J~S@D6vJAaElETnsX4h9a5tvPhC3L@qB~bOzkL@^z0k_hS{T4PF*TDrgdXp+dzsE? z>V|VR035Pl9n5&-RePFdS{7KAr2vPOqR9=M$vXA1Yy5>w;EsF`;OK{2pkn-kpp9Pw z)r;5JfJKKaT$4qCb{TaXHjb$QA{y0EYy*+b1XI;6Ah- zw13P)xT`>~eFoJC!>{2XL(a_#upp3gaR1#5+L(Jmzp4TBnx{~WHedpJ1ch8JFk~Sw z>F+gN+i+VD?gMXwcIhn8rz`>e>J^TI3E-MW>f}6R-pL}>WMOa0k#jN+`RyUVUC;#D zg|~oS^$6%wpF{^Qr+}X>0PKcr3Fc&>Z>uv@C);pwDs@2bZWhYP!rvGx?_|q{d`t<*XEb#=aOb=N+L@CVBGqImZf&+a zCQEa3$~@#kC);pasdG=f6tuIi0PO-y&tvX%>Mv=oY3U$nD zJ#gMegnQ46pq+3r=;zmgcG+zRc9D~c>z+jo9&D+`E6$LmyFqlmCYw;-Zooma{sR@~ z)_^|YL1&&@|GXo*pivH7k!msl+$Sew3%XJnxajt0K%3M6Bd&YFNy9}tWG^aovK2eX z1aL1%7;KRDrA@eG-Wr6w+;*H_VD~qLiVI`{_;>o)k`{8xa3EJT1O_>#iy_?va0eR? zDV=N%;Zjb%Z2s$@O>w@iqt!I}tLjGk!=p`D23I}N4Be@$(|iSA zf3Ih7b<{zqpDB4WF_5X1(peKe+rASze%u8eKLn#KKXt;UZ+Adf$_TO+vTqshLLJ5c z52HucO=lrNVae5XWOLm!V@n-ObU11!b+DN<$RuU+YsrBq*lYT;?AwJpmNKniF0Q1< zJCo>Q$=v$@&y=sj6{r!Y&y&`0$-I}S!H_~pI&2H8Z1C|BX4VgZ^-! zje3-;x0PBD!M`v*J_)rL^+$<1VJhH*2Fi~aA7s&@_rUHYJ9zD=M%4AFQ`}k8OC$9s XsPq=LnkwKG00000NkvXXu0mjfhAk5^ literal 0 HcmV?d00001 diff --git a/example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..75b2d164a5a98e212cca15ea7bf2ab5de5108680 GIT binary patch literal 3831 zcmVjJBgitF5mAp-i>4+KS_oR{|13AP->1TD4=w)g|)JHOx|a2Wk1Va z!k)vP$UcQ#mdj%wNQoaJ!w>jv_6&JPyutpQps?s5dmDQ>`%?Bvj>o<%kYG!YW6H-z zu`g$@mp`;qDR!51QaS}|ZToSuAGcJ7$2HF0z`ln4t!#Yg46>;vGG9N9{V@9z#}6v* zfP?}r6b{*-C*)(S>NECI_E~{QYzN5SXRmVnP<=gzP+_Sp(Aza_hKlZ{C1D&l*(7IKXxQC1Z9#6wx}YrGcn~g%;icdw>T0Rf^w0{ z$_wn1J+C0@!jCV<%Go5LA45e{5gY9PvZp8uM$=1}XDI+9m7!A95L>q>>oe0$nC->i zeexUIvq%Uk<-$>DiDb?!In)lAmtuMWxvWlk`2>4lNuhSsjAf2*2tjT`y;@d}($o)S zn(+W&hJ1p0xy@oxP%AM15->wPLp{H!k)BdBD$toBpJh+crWdsNV)qsHaqLg2_s|Ih z`8E9z{E3sA!}5aKu?T!#enD(wLw?IT?k-yWVHZ8Akz4k5(TZJN^zZgm&zM28sfTD2BYJ|Fde3Xzh;;S` z=GXTnY4Xc)8nYoz6&vF;P7{xRF-{|2Xs5>a5)@BrnQ}I(_x7Cgpx#5&Td^4Q9_FnQ zX5so*;#8-J8#c$OlA&JyPp$LKUhC~-e~Ij!L%uSMu!-VZG7Hx-L{m2DVR2i=GR(_% zCVD!4N`I)&Q5S`?P&fQZ=4#Dgt_v2-DzkT}K(9gF0L(owe-Id$Rc2qZVLqI_M_DyO z9@LC#U28_LU{;wGZ&))}0R2P4MhajKCd^K#D+JJ&JIXZ_p#@+7J9A&P<0kdRujtQ_ zOy>3=C$kgi6$0pW06KaLz!21oOryKM3ZUOWqppndxfH}QpgjEJ`j7Tzn5bk6K&@RA?vl##y z$?V~1E(!wB5rH`>3nc&@)|#<1dN2cMzzm=PGhQ|Yppne(C-Vlt450IXc`J4R0W@I7 zd1e5uW6juvO%ni(WX7BsKx3MLngO7rHO;^R5I~0^nE^9^E_eYLgiR9&KnJ)pBbfno zSVnW$0R+&6jOOsZ82}nJ126+c|%svPo;TeUku<2G7%?$oft zyaO;tVo}(W)VsTUhq^XmFi#2z%-W9a{7mXn{uzivYQ_d6b7VJG{77naW(vHt-uhnY zVN#d!JTqVh(7r-lhtXVU6o})aZbDt_;&wJVGl2FKYFBFpU-#9U)z#(A%=IVnqytR$SY-sO( z($oNE09{D^@OuYPz&w~?9>Fl5`g9u&ecFGhqX=^#fmR=we0CJw+5xna*@oHnkahk+ z9aWeE3v|An+O5%?4fA&$Fgu~H_YmqR!yIU!bFCk4!#pAj%(lI(A5n)n@Id#M)O9Yx zJU9oKy{sRAIV3=5>(s8n{8ryJ!;ho}%pn6hZKTKbqk=&m=f*UnK$zW3YQP*)pw$O* zIfLA^!-bmBl6%d_n$#tP8Zd_(XdA*z*WH|E_yILwjtI~;jK#v-6jMl^?<%Y%`gvpwv&cFb$||^v4D&V=aNy?NGo620jL3VZnA%s zH~I|qPzB~e(;p;b^gJr7Ure#7?8%F0m4vzzPy^^(q4q1OdthF}Fi*RmVZN1OwTsAP zn9CZP`FazX3^kG(KodIZ=Kty8DLTy--UKfa1$6XugS zk%6v$Kmxt6U!YMx0JQ)0qX*{CXwZZk$vEROidEc7=J-1;peNat!vS<3P-FT5po>iE z!l3R+<`#x|+_hw!HjQGV=8!q|76y8L7N8gP3$%0kfush|u0uU^?dKBaeRSBUpOZ0c z62;D&Mdn2}N}xHRFTRI?zRv=>=AjHgH}`2k4WK=#AHB)UFrR-J87GgX*x5fL^W2#d z=(%K8-oZfMO=i{aWRDg=FX}UubM4eotRDcn;OR#{3q=*?3mE3_oJ-~prjhxh%PgQT zyn)Qozaq0@o&|LEgS{Ind4Swsr;b`u185hZPOBLL<`d2%^Yp1?oL)=jnLi;Zo0ZDliTtQ^b5SmfIMe{T==zZkbvn$KTQGlbG8w}s@M3TZnde;1Am46P3juKb zl9GU&3F=q`>j!`?SyH#r@O59%@aMX^rx}Nxe<>NqpUp5=lX1ojGDIR*-D^SDuvCKF z?3$xG(gVUsBERef_YjPFl^rU9EtD{pt z0CXwpN7BN3!8>hajGaTVk-wl=9rxmfWtIhC{mheHgStLi^+Nz12a?4r(fz)?3A%at zMlvQmL<2-R)-@G1wJ0^zQK%mR=r4d{Y3fHp){nWXUL#|CqXl(+v+qDh>FkF9`eWrW zfr^D%LNfOcTNvtx0JXR35J0~Jpi2#P3Q&80w+nqNfc}&G0A~*)lGHKv=^FE+b(37|)zL;KLF>oiGfb(?&1 zV3XRu!Sw>@quKiab%g6jun#oZ%!>V#A%+lNc?q>6+VvyAn=kf_6z^(TZUa4Eelh{{ zqFX-#dY(EV@7l$NE&kv9u9BR8&Ojd#ZGJ6l8_BW}^r?DIS_rU2(XaGOK z225E@kH5Opf+CgD^{y29jD4gHbGf{1MD6ggQ&%>UG4WyPh5q_tb`{@_34B?xfSO*| zZv8!)q;^o-bz`MuxXk*G^}(6)ACb@=Lfs`Hxoh>`Y0NE8QRQ!*p|SH@{r8=%RKd4p z+#Ty^-0kb=-H-O`nAA3_6>2z(D=~Tbs(n8LHxD0`R0_ATFqp-SdY3(bZ3;VUM?J=O zKCNsxsgt@|&nKMC=*+ZqmLHhX1KHbAJs{nGVMs6~TiF%Q)P@>!koa$%oS zjXa=!5>P`vC-a}ln!uH1ooeI&v?=?v7?1n~P(wZ~0>xWxd_Aw;+}9#eULM7M8&E?Y zC-ZLhi3RoM92SXUb-5i-Lmt5_rfjE{6y^+24`y$1lywLyHO!)Boa7438K4#iLe?rh z2O~YGSgFUBH?og*6=r9rme=peP~ah`(8Zt7V)j5!V0KPFf_mebo3z95U8(up$-+EA^9dTRLq>Yl)YMBuch9%=e5B`Vnb>o zt03=kq;k2TgGe4|lGne&zJa~h(UGutjP_zr?a7~#b)@15XNA>Dj(m=gg2Q5V4-$)D|Q9}R#002ovPDHLkV1o7DH3k3x literal 0 HcmV?d00001 diff --git a/example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/example/flutter_plugin/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..c4df70d39da7941ef3f6dcb7f06a192d8dcb308d GIT binary patch literal 1888 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 iW8Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v literal 0 HcmV?d00001 diff --git a/example/flutter_plugin/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/example/flutter_plugin/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838 GIT binary patch literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v literal 0 HcmV?d00001 diff --git a/example/flutter_plugin/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/example/flutter_plugin/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838 GIT binary patch literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v literal 0 HcmV?d00001 diff --git a/example/flutter_plugin/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/example/flutter_plugin/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md new file mode 100644 index 00000000..89c2725b --- /dev/null +++ b/example/flutter_plugin/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md @@ -0,0 +1,5 @@ +# Launch Screen Assets + +You can customize the launch screen with your own desired assets by replacing the image files in this directory. + +You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. \ No newline at end of file diff --git a/example/flutter_plugin/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/example/flutter_plugin/example/ios/Runner/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 00000000..f2e259c7 --- /dev/null +++ b/example/flutter_plugin/example/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/example/flutter_plugin/example/ios/Runner/Base.lproj/Main.storyboard b/example/flutter_plugin/example/ios/Runner/Base.lproj/Main.storyboard new file mode 100644 index 00000000..f3c28516 --- /dev/null +++ b/example/flutter_plugin/example/ios/Runner/Base.lproj/Main.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/example/flutter_plugin/example/ios/Runner/Info.plist b/example/flutter_plugin/example/ios/Runner/Info.plist new file mode 100644 index 00000000..ca4d58e7 --- /dev/null +++ b/example/flutter_plugin/example/ios/Runner/Info.plist @@ -0,0 +1,45 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + flutter_plugin_example + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + + diff --git a/example/flutter_plugin/example/ios/Runner/Runner-Bridging-Header.h b/example/flutter_plugin/example/ios/Runner/Runner-Bridging-Header.h new file mode 100644 index 00000000..7335fdf9 --- /dev/null +++ b/example/flutter_plugin/example/ios/Runner/Runner-Bridging-Header.h @@ -0,0 +1 @@ +#import "GeneratedPluginRegistrant.h" \ No newline at end of file diff --git a/example/flutter_plugin/example/ios/Runner/Storyboard.storyboard b/example/flutter_plugin/example/ios/Runner/Storyboard.storyboard new file mode 100644 index 00000000..e1d3fb08 --- /dev/null +++ b/example/flutter_plugin/example/ios/Runner/Storyboard.storyboard @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/example/flutter_plugin/example/lib/main.dart b/example/flutter_plugin/example/lib/main.dart new file mode 100644 index 00000000..0cff52da --- /dev/null +++ b/example/flutter_plugin/example/lib/main.dart @@ -0,0 +1,39 @@ +import 'package:flutter/material.dart'; +import 'dart:async'; + +import 'package:flutter/services.dart'; +import 'package:flutter_plugin/flutter_plugin.dart'; + +void main() => runApp(new MyApp()); + +class MyApp extends StatefulWidget { + @override + _MyAppState createState() => new _MyAppState(); +} + +class _MyAppState extends State { + String _platformVersion = 'Unknown'; + + @override + void initState() { + super.initState(); + } + + @override + Widget build(BuildContext context) { + return new MaterialApp( + home: new Scaffold( + appBar: new AppBar( + title: const Text('Flutter InAppBrowser Plugin example app'), + ), + body: new Center( + child: new RaisedButton(onPressed: () { + FlutterPlugin.open(); + }, + child: Text("Open InAppBrowser") + ), + ), + ), + ); + } +} diff --git a/example/flutter_plugin/example/pubspec.yaml b/example/flutter_plugin/example/pubspec.yaml new file mode 100644 index 00000000..0efda104 --- /dev/null +++ b/example/flutter_plugin/example/pubspec.yaml @@ -0,0 +1,70 @@ +name: flutter_plugin_example +description: Demonstrates how to use the flutter_plugin plugin. + +# The following defines the version and build number for your application. +# A version number is three numbers separated by dots, like 1.2.43 +# followed by an optional build number separated by a +. +# Both the version and the builder number may be overridden in flutter +# build by specifying --build-name and --build-number, respectively. +# Read more about versioning at semver.org. +version: 1.0.0+1 + +environment: + sdk: ">=2.0.0-dev.68.0 <3.0.0" + +dependencies: + flutter: + sdk: flutter + + # The following adds the Cupertino Icons font to your application. + # Use with the CupertinoIcons class for iOS style icons. + cupertino_icons: ^0.1.2 + +dev_dependencies: + flutter_test: + sdk: flutter + + flutter_plugin: + path: ../ + +# For information on the generic Dart part of this file, see the +# following page: https://www.dartlang.org/tools/pub/pubspec + +# The following section is specific to Flutter. +flutter: + + # The following line ensures that the Material Icons font is + # included with your application, so that you can use the icons in + # the material Icons class. + uses-material-design: true + + # To add assets to your application, add an assets section, like this: + # assets: + # - images/a_dot_burr.jpeg + # - images/a_dot_ham.jpeg + + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.io/assets-and-images/#resolution-aware. + + # For details regarding adding assets from package dependencies, see + # https://flutter.io/assets-and-images/#from-packages + + # To add custom fonts to your application, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + # fonts: + # - family: Schyler + # fonts: + # - asset: fonts/Schyler-Regular.ttf + # - asset: fonts/Schyler-Italic.ttf + # style: italic + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + # + # For details regarding fonts from package dependencies, + # see https://flutter.io/custom-fonts/#from-packages diff --git a/example/flutter_plugin/example/test/widget_test.dart b/example/flutter_plugin/example/test/widget_test.dart new file mode 100644 index 00000000..c5f8290b --- /dev/null +++ b/example/flutter_plugin/example/test/widget_test.dart @@ -0,0 +1,25 @@ +// This is a basic Flutter widget test. +// To perform an interaction with a widget in your test, use the WidgetTester utility that Flutter +// provides. For example, you can send tap and scroll gestures. You can also use WidgetTester to +// find child widgets in the widget tree, read text, and verify that the values of widget properties +// are correct. + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; + +import 'package:flutter_plugin_example/main.dart'; + +void main() { + testWidgets('Verify Platform version', (WidgetTester tester) async { + // Build our app and trigger a frame. + await tester.pumpWidget(new MyApp()); + + // Verify that platform version is retrieved. + expect( + find.byWidgetPredicate( + (Widget widget) => + widget is Text && widget.data.startsWith('Running on:'), + ), + findsOneWidget); + }); +} diff --git a/example/flutter_plugin/ios/.gitignore b/example/flutter_plugin/ios/.gitignore new file mode 100644 index 00000000..710ec6cf --- /dev/null +++ b/example/flutter_plugin/ios/.gitignore @@ -0,0 +1,36 @@ +.idea/ +.vagrant/ +.sconsign.dblite +.svn/ + +.DS_Store +*.swp +profile + +DerivedData/ +build/ +GeneratedPluginRegistrant.h +GeneratedPluginRegistrant.m + +.generated/ + +*.pbxuser +*.mode1v3 +*.mode2v3 +*.perspectivev3 + +!default.pbxuser +!default.mode1v3 +!default.mode2v3 +!default.perspectivev3 + +xcuserdata + +*.moved-aside + +*.pyc +*sync/ +Icon? +.tags* + +/Flutter/Generated.xcconfig diff --git a/example/flutter_plugin/ios/Assets/.gitkeep b/example/flutter_plugin/ios/Assets/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/example/flutter_plugin/ios/Classes/FlutterPlugin.h b/example/flutter_plugin/ios/Classes/FlutterPlugin.h new file mode 100644 index 00000000..0798c8fd --- /dev/null +++ b/example/flutter_plugin/ios/Classes/FlutterPlugin.h @@ -0,0 +1,4 @@ +#import + +@interface FlutterPlugin : NSObject +@end diff --git a/example/flutter_plugin/ios/Classes/FlutterPlugin.m b/example/flutter_plugin/ios/Classes/FlutterPlugin.m new file mode 100644 index 00000000..13208f03 --- /dev/null +++ b/example/flutter_plugin/ios/Classes/FlutterPlugin.m @@ -0,0 +1,8 @@ +#import "FlutterPlugin.h" +#import + +@implementation FlutterPlugin ++ (void)registerWithRegistrar:(NSObject*)registrar { + [SwiftFlutterPlugin registerWithRegistrar:registrar]; +} +@end diff --git a/example/flutter_plugin/ios/Classes/SwiftFlutterPlugin.swift b/example/flutter_plugin/ios/Classes/SwiftFlutterPlugin.swift new file mode 100644 index 00000000..c60ff46b --- /dev/null +++ b/example/flutter_plugin/ios/Classes/SwiftFlutterPlugin.swift @@ -0,0 +1,45 @@ +import Flutter +import UIKit +import WebKit + +public class SwiftFlutterPlugin: NSObject, Flutter.FlutterPlugin { + public static func register(with registrar: FlutterPluginRegistrar) { + let channel = FlutterMethodChannel(name: "flutter_plugin", binaryMessenger: registrar.messenger()) + let instance = SwiftFlutterPlugin() + registrar.addMethodCallDelegate(instance, channel: channel) + } + + public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) { + + let frame: CGRect = UIScreen.main.bounds + let tmpWindow = UIWindow(frame: frame) + let storyboard = UIStoryboard(name: "Storyboard", bundle: nil) + let vc = storyboard.instantiateViewController(withIdentifier: "viewController") + let tmpController = UIViewController() + let baseWindowLevel = UIApplication.shared.keyWindow?.windowLevel + tmpWindow.rootViewController = tmpController + tmpWindow.windowLevel = UIWindowLevel(baseWindowLevel! + 1) + tmpWindow.makeKeyAndVisible() + tmpController.present(vc, animated: true, completion: nil) + //tmpController.present(nav, animated: true) { () -> Void in } + result(true) + } +} + +public class testViewController: UIViewController { + @IBOutlet var webView: WKWebView! + @IBOutlet var urlField: UITextField! + @IBOutlet var done: UIButton! + + public override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) { + super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil) + } + + required public init?(coder aDecoder: NSCoder) { + super.init(coder: aDecoder) + } + + override public func viewDidLoad() { + print("asdasdasd") + } +} diff --git a/example/flutter_plugin/ios/flutter_plugin.podspec b/example/flutter_plugin/ios/flutter_plugin.podspec new file mode 100644 index 00000000..c28187c4 --- /dev/null +++ b/example/flutter_plugin/ios/flutter_plugin.podspec @@ -0,0 +1,21 @@ +# +# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html +# +Pod::Spec.new do |s| + s.name = 'flutter_plugin' + s.version = '0.0.1' + s.summary = 'A new Flutter plugin.' + s.description = <<-DESC +A new Flutter plugin. + DESC + s.homepage = 'http://example.com' + s.license = { :file => '../LICENSE' } + s.author = { 'Your Company' => 'email@example.com' } + s.source = { :path => '.' } + s.source_files = 'Classes/**/*' + s.public_header_files = 'Classes/**/*.h' + s.dependency 'Flutter' + + s.ios.deployment_target = '8.0' +end + diff --git a/example/flutter_plugin/lib/flutter_plugin.dart b/example/flutter_plugin/lib/flutter_plugin.dart new file mode 100644 index 00000000..5588bff0 --- /dev/null +++ b/example/flutter_plugin/lib/flutter_plugin.dart @@ -0,0 +1,17 @@ +import 'dart:async'; + +import 'package:flutter/services.dart'; + +class FlutterPlugin { + static const MethodChannel _channel = + const MethodChannel('flutter_plugin'); + + static Future get platformVersion async { + final String version = await _channel.invokeMethod('getPlatformVersion'); + return version; + } + + static Future open() async { + return await _channel.invokeMethod('open'); + } +} diff --git a/example/flutter_plugin/pubspec.yaml b/example/flutter_plugin/pubspec.yaml new file mode 100644 index 00000000..a866a4d8 --- /dev/null +++ b/example/flutter_plugin/pubspec.yaml @@ -0,0 +1,52 @@ +name: flutter_plugin +description: A new Flutter plugin. +version: 0.0.1 +author: +homepage: + +environment: + sdk: ">=2.0.0-dev.68.0 <3.0.0" + +dependencies: + flutter: + sdk: flutter + +# For information on the generic Dart part of this file, see the +# following page: https://www.dartlang.org/tools/pub/pubspec + +# The following section is specific to Flutter. +flutter: + plugin: + androidPackage: com.pichillilorenzo.flutterplugin + pluginClass: FlutterPlugin + + # To add assets to your plugin package, add an assets section, like this: + # assets: + # - images/a_dot_burr.jpeg + # - images/a_dot_ham.jpeg + # + # For details regarding assets in packages, see + # https://flutter.io/assets-and-images/#from-packages + # + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.io/assets-and-images/#resolution-aware. + + # To add custom fonts to your plugin package, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + # fonts: + # - family: Schyler + # fonts: + # - asset: fonts/Schyler-Regular.ttf + # - asset: fonts/Schyler-Italic.ttf + # style: italic + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + # + # For details regarding fonts in packages, see + # https://flutter.io/custom-fonts/#from-packages diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 6359b202..0f0a6312 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -20,6 +20,7 @@ 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + ED5EF13121506A3E0065FD45 /* WebView.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = ED5EF108214FF6F80065FD45 /* WebView.storyboard */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -55,6 +56,7 @@ 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; E8D91E403808A7540F18B75D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + ED5EF108214FF6F80065FD45 /* WebView.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = WebView.storyboard; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -131,6 +133,7 @@ 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, + ED5EF108214FF6F80065FD45 /* WebView.storyboard */, ); path = Runner; sourceTree = ""; @@ -178,6 +181,7 @@ TargetAttributes = { 97C146ED1CF9000F007C117D = { CreatedOnToolsVersion = 7.3.1; + DevelopmentTeam = PFP8UV45Y6; LastSwiftMigration = 0910; }; }; @@ -208,6 +212,7 @@ 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */, + ED5EF13121506A3E0065FD45 /* WebView.storyboard in Resources */, 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, 2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */, 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, @@ -427,6 +432,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = PFP8UV45Y6; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -455,6 +461,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = PFP8UV45Y6; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 1263ac84..f5a8db1a 100644 --- a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -26,7 +26,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" shouldUseLaunchSchemeArgsEnv = "YES"> @@ -46,7 +45,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/example/ios/Runner/Assets.xcassets/Contents.json b/example/ios/Runner/Assets.xcassets/Contents.json new file mode 100644 index 00000000..da4a164c --- /dev/null +++ b/example/ios/Runner/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/example/ios/Runner/Base.lproj/LaunchScreen.storyboard index f2e259c7..e5f47340 100644 --- a/example/ios/Runner/Base.lproj/LaunchScreen.storyboard +++ b/example/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -1,37 +1,31 @@ - - + + + + + - - + + + - + - + - - + + - + + - - - - - - - - - + - + - + - - - diff --git a/example/ios/Runner/Base.lproj/Main.storyboard b/example/ios/Runner/Base.lproj/Main.storyboard index f3c28516..c0688ac0 100644 --- a/example/ios/Runner/Base.lproj/Main.storyboard +++ b/example/ios/Runner/Base.lproj/Main.storyboard @@ -1,8 +1,12 @@ - - + + + + + - + + @@ -10,17 +14,18 @@ - - + + - + - + + diff --git a/example/ios/Runner/WebView.storyboard b/example/ios/Runner/WebView.storyboard new file mode 100644 index 00000000..125c7877 --- /dev/null +++ b/example/ios/Runner/WebView.storyboard @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/example/lib/main.dart b/example/lib/main.dart index 68d82e4c..bc5b063a 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -14,16 +14,16 @@ class MyInAppBrowser extends InAppBrowser { void onLoadStop(String url) { super.onLoadStop(url); print("\n\nStopped $url\n\n"); - this.injectScriptFile("https://code.jquery.com/jquery-3.3.1.min.js"); - /*this.injectScriptCode(""" + /*this.injectScriptFile("https://code.jquery.com/jquery-3.3.1.min.js"); + this.injectScriptCode(""" \$( "body" ).html( "Next Step..." ) - """);*/ + """); this.injectStyleCode(""" body { background-color: #3c3c3c !important; } """); - this.injectStyleFile("https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"); + this.injectStyleFile("https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css");*/ } @override @@ -65,7 +65,10 @@ class _MyAppState extends State { ), body: new Center( child: new RaisedButton(onPressed: () { - inAppBrowser.open("https://flutter.io/"); + inAppBrowser.open("https://flutter.io/", options: { + //"toolbarTop": false, + //"toolbarBottom": false + }); }, child: Text("Open InAppBrowser") ), diff --git a/flutter_inappbrowser.iml b/flutter_inappbrowser.iml index 98c4874a..c5627b49 100644 --- a/flutter_inappbrowser.iml +++ b/flutter_inappbrowser.iml @@ -11,6 +11,9 @@ + + + diff --git a/flutter_inappbrowser_android.iml b/flutter_inappbrowser_android.iml index ac5d744d..a06f850a 100644 --- a/flutter_inappbrowser_android.iml +++ b/flutter_inappbrowser_android.iml @@ -27,4 +27,4 @@ - + \ No newline at end of file diff --git a/ios/Classes/InAppBrowserOptions.swift b/ios/Classes/InAppBrowserOptions.swift new file mode 100644 index 00000000..01ff0bfc --- /dev/null +++ b/ios/Classes/InAppBrowserOptions.swift @@ -0,0 +1,42 @@ +// +// InAppBrowserOptions.swift +// flutter_inappbrowser +// +// Created by Lorenzo on 17/09/18. +// + +import Foundation + +@objcMembers +public class InAppBrowserOptions: NSObject { + var closeButtonCaption = "" + var closeButtonColor = "" + var clearCache = false + var clearSessionCache = false + var spinner = true + var enableViewportScale = false + var mediaPlaybackRequiresUserAction = false + var allowInlineMediaPlayback = false + var keyboardDisplayRequiresUserAction = true + var suppressesIncrementalRendering = false + var hidden = false + var disallowOverScroll = false + var toolbarTop = true + var toolbarTopColor = "" + var toolbarTopTranslucent = true + var toolbarBottom = true + var toolbarBottomColor = "" + var toolbarBottomTranslucent = true + var hideUrlBar = false + var presentationStyle = 0 //fullscreen + var transitionStyle = 0 //crossDissolve + + public func parse(options: [String: Any]) { + for (key, value) in options { + if self.value(forKey: key) != nil { + self.setValue(value, forKey: key) + } + } + } +} + diff --git a/ios/Classes/InAppBrowserWebViewController.swift b/ios/Classes/InAppBrowserWebViewController.swift new file mode 100644 index 00000000..1411ffdb --- /dev/null +++ b/ios/Classes/InAppBrowserWebViewController.swift @@ -0,0 +1,566 @@ +// +// InAppBrowserWebViewController.swift +// flutter_inappbrowser +// +// Created by Lorenzo on 17/09/18. +// + +import Flutter +import UIKit +import WebKit +import Foundation +import AVFoundation + +typealias OlderClosureType = @convention(c) (Any, Selector, UnsafeRawPointer, Bool, Bool, Any?) -> Void +typealias NewerClosureType = @convention(c) (Any, Selector, UnsafeRawPointer, Bool, Bool, Bool, Any?) -> Void + +extension WKWebView{ + + var keyboardDisplayRequiresUserAction: Bool? { + get { + return self.keyboardDisplayRequiresUserAction + } + set { + self.setKeyboardRequiresUserInteraction(newValue ?? true) + } + } + + func setKeyboardRequiresUserInteraction( _ value: Bool) { + + guard + let WKContentViewClass: AnyClass = NSClassFromString("WKContentView") else { + print("Cannot find the WKContentView class") + return + } + + let olderSelector: Selector = sel_getUid("_startAssistingNode:userIsInteracting:blurPreviousNode:userObject:") + let newerSelector: Selector = sel_getUid("_startAssistingNode:userIsInteracting:blurPreviousNode:changingActivityState:userObject:") + + if let method = class_getInstanceMethod(WKContentViewClass, olderSelector) { + + let originalImp: IMP = method_getImplementation(method) + let original: OlderClosureType = unsafeBitCast(originalImp, to: OlderClosureType.self) + let block : @convention(block) (Any, UnsafeRawPointer, Bool, Bool, Any?) -> Void = { (me, arg0, arg1, arg2, arg3) in + original(me, olderSelector, arg0, !value, arg2, arg3) + } + let imp: IMP = imp_implementationWithBlock(block) + method_setImplementation(method, imp) + } + + if let method = class_getInstanceMethod(WKContentViewClass, newerSelector) { + + let originalImp: IMP = method_getImplementation(method) + let original: NewerClosureType = unsafeBitCast(originalImp, to: NewerClosureType.self) + let block : @convention(block) (Any, UnsafeRawPointer, Bool, Bool, Bool, Any?) -> Void = { (me, arg0, arg1, arg2, arg3, arg4) in + original(me, newerSelector, arg0, !value, arg2, arg3, arg4) + } + let imp: IMP = imp_implementationWithBlock(block) + method_setImplementation(method, imp) + } + + } + +} + +class InAppBrowserWebViewController: UIViewController, WKUIDelegate, WKNavigationDelegate, UITextFieldDelegate { + @IBOutlet var webView: WKWebView! + @IBOutlet var closeButton: UIButton! + @IBOutlet var reloadButton: UIBarButtonItem! + @IBOutlet var backButton: UIBarButtonItem! + @IBOutlet var forwardButton: UIBarButtonItem! + @IBOutlet var shareButton: UIBarButtonItem! + @IBOutlet var spinner: UIActivityIndicatorView! + @IBOutlet var toolbarTop: UIView! + @IBOutlet var toolbarBottom: UIToolbar! + @IBOutlet var urlField: UITextField! + + weak var navigationDelegate: SwiftFlutterPlugin? + var currentURL: URL? + var tmpWindow: UIWindow? + var browserOptions: InAppBrowserOptions? + + required init(coder aDecoder: NSCoder) { + super.init(coder: aDecoder)! + } + + override func viewWillAppear(_ animated: Bool) { + UIApplication.shared.statusBarStyle = preferredStatusBarStyle + super.viewWillAppear(animated) + prepareWebView() + } + + override func viewDidLoad() { + webView.uiDelegate = self + webView.navigationDelegate = self + + urlField.delegate = self + urlField.text = self.currentURL?.absoluteString + + closeButton.addTarget(self, action: #selector(self.close), for: .touchUpInside) + + forwardButton.target = self + forwardButton.action = #selector(self.goForward) + + forwardButton.target = self + forwardButton.action = #selector(self.goForward) + + backButton.target = self + backButton.action = #selector(self.goBack) + + reloadButton.target = self + reloadButton.action = #selector(self.reload) + + shareButton.target = self + shareButton.action = #selector(self.share) + + spinner.hidesWhenStopped = true + spinner.isHidden = false + spinner.stopAnimating() + + navigate(to: self.currentURL!) + } + + // Prevent crashes on closing windows + deinit { + webView?.uiDelegate = nil + } + + override func viewWillDisappear (_ animated: Bool) { + super.viewWillDisappear(animated) + } + + func prepareWebView() { + + if (browserOptions?.hideUrlBar)! { + self.urlField.isHidden = true + self.urlField.isEnabled = false + } + + if (browserOptions?.toolbarTop)! { + if browserOptions?.toolbarTopColor != "" { + self.toolbarTop.backgroundColor = color(fromHexString: (browserOptions?.toolbarTopColor)!) + } + } + else { + self.toolbarTop.removeFromSuperview() + self.webView.bounds.size.height += self.toolbarTop.bounds.height + + if #available(iOS 9.0, *) { + let topConstraint = webView.topAnchor.constraint(equalTo: self.view.topAnchor, constant: CGFloat(getStatusBarOffset())) + NSLayoutConstraint.activate([topConstraint]) + } + } + + if (browserOptions?.toolbarBottom)! { + if browserOptions?.toolbarBottomColor != "" { + self.toolbarBottom.backgroundColor = color(fromHexString: (browserOptions?.toolbarBottomColor)!) + } + self.toolbarBottom.isTranslucent = (browserOptions?.toolbarBottomTranslucent)! + } + else { + self.toolbarBottom.removeFromSuperview() + self.webView.bounds.size.height += self.toolbarBottom.bounds.height + + if #available(iOS 9.0, *) { + let bottomConstraint = webView.bottomAnchor.constraint(equalTo: self.view.bottomAnchor) + NSLayoutConstraint.activate([bottomConstraint]) + } + } + + if browserOptions?.closeButtonCaption != "" { + closeButton.setTitle(browserOptions?.closeButtonCaption, for: .normal) + } + if browserOptions?.closeButtonColor != "" { + closeButton.tintColor = color(fromHexString: (browserOptions?.closeButtonColor)!) + } + + self.modalPresentationStyle = UIModalPresentationStyle(rawValue: (browserOptions?.presentationStyle)!)! + self.modalTransitionStyle = UIModalTransitionStyle(rawValue: (browserOptions?.transitionStyle)!)! + + // prevent webView from bouncing + if (browserOptions?.disallowOverScroll)! { + if self.webView.responds(to: #selector(getter: self.webView.scrollView)) { + self.webView.scrollView.bounces = false + } + else { + for subview: UIView in self.webView.subviews { + if subview is UIScrollView { + (subview as! UIScrollView).bounces = false + } + } + } + } + + let wkUController = WKUserContentController() + self.webView.configuration.userContentController = wkUController + + if (browserOptions?.enableViewportScale)! { + let jscript = "var meta = document.createElement('meta'); meta.setAttribute('name', 'viewport'); meta.setAttribute('content', 'width=device-width'); document.getElementsByTagName('head')[0].appendChild(meta);" + let userScript = WKUserScript(source: jscript, injectionTime: .atDocumentEnd, forMainFrameOnly: true) + self.webView.configuration.userContentController.addUserScript(userScript) + } + + // Prevents long press on links that cause WKWebView exit + let jscriptWebkitTouchCallout = WKUserScript(source: "document.body.style.webkitTouchCallout='none';", injectionTime: .atDocumentEnd, forMainFrameOnly: true) + self.webView.configuration.userContentController.addUserScript(jscriptWebkitTouchCallout) + + if (browserOptions?.mediaPlaybackRequiresUserAction)! { + if #available(iOS 10.0, *) { + self.webView.configuration.mediaTypesRequiringUserActionForPlayback = .all + } else { + // Fallback on earlier versions + } + } + + self.webView.configuration.allowsInlineMediaPlayback = (browserOptions?.allowInlineMediaPlayback)! + + self.webView.keyboardDisplayRequiresUserAction = browserOptions?.keyboardDisplayRequiresUserAction + self.webView.configuration.suppressesIncrementalRendering = (browserOptions?.suppressesIncrementalRendering)! + } + + // Load user requested url + func textFieldShouldReturn(_ textField: UITextField) -> Bool { + textField.resignFirstResponder() + if textField.text != nil && textField.text != "" { + let url = textField.text?.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) + let request = URLRequest(url: URL(string: url!)!) + webView.load(request) + } + else { + updateUrlTextField(url: (currentURL?.absoluteString)!) + } + //var list : WKBackForwardList = self.webView.backForwardList + return false + } + + // func createViews() { + // // We create the views in code for primarily for ease of upgrades and not requiring an external .xib to be included + //// let screenSize: CGRect = view.bounds + //// let myView = UIView(frame: CGRect(x: 0, y: 0, width: screenSize.width, height: screenSize.height-44-CGFloat((browserOptions?.location)! ? FOOTER_HEIGHT : TOOLBAR_HEIGHT))) + //// + // + //// + //// let webViewFrame = CGRect(x: 0, y: urlField.frame.height, width: screenSize.width, height: screenSize.height-44-CGFloat((browserOptions?.location)! ? FOOTER_HEIGHT : TOOLBAR_HEIGHT)) + //// + //// let webConfiguration = WKWebViewConfiguration() + //// webView = WKWebView(frame: webViewFrame, configuration: webConfiguration) + //// webView?.autoresizingMask = [.flexibleWidth, .flexibleHeight] + // + // let toolbarIsAtBottom: Bool = browserOptions!.toolbarposition == kInAppBrowserToolbarBarPositionBottom + // + // var webViewBounds: CGRect = view.bounds + // webViewBounds.origin.y += (toolbarIsAtBottom) ? 0 : CGFloat(TOOLBAR_HEIGHT+getStatusBarOffset()) + // webViewBounds.size.height -= (browserOptions?.location)! ? CGFloat(TOOLBAR_HEIGHT+getStatusBarOffset()) : 0 + // let webConfiguration = WKWebViewConfiguration() + // webView = WKWebView(frame: webViewBounds, configuration: webConfiguration) + // webView?.autoresizingMask = [.flexibleWidth, .flexibleHeight] + // view.addSubview(webView!) + // //view.sendSubview(toBack: webView!) + // + // webView?.uiDelegate = self + // webView?.navigationDelegate = self + // webView?.backgroundColor = UIColor.white + // webView?.clearsContextBeforeDrawing = true + // webView?.clipsToBounds = true + // webView?.contentMode = .scaleToFill + // webView?.isMultipleTouchEnabled = true + // webView?.isOpaque = true + // //webView?.scalesPageToFit = false + // webView?.isUserInteractionEnabled = true + // + // spinner = UIActivityIndicatorView(activityIndicatorStyle: .gray) + // spinner.alpha = 1.000 + // spinner.autoresizesSubviews = true + // spinner.autoresizingMask = [.flexibleLeftMargin, .flexibleTopMargin, .flexibleBottomMargin, .flexibleRightMargin] + // spinner.clearsContextBeforeDrawing = false + // spinner.clipsToBounds = false + // spinner.contentMode = .scaleToFill + // spinner.frame = CGRect(x: (webView?.frame.midX)!, y: (webView?.frame.midY)!, width: 20.0, height: 20.0) + // spinner.isHidden = false + // spinner.hidesWhenStopped = true + // spinner.isMultipleTouchEnabled = false + // spinner.isOpaque = false + // spinner.isUserInteractionEnabled = false + // spinner.stopAnimating() + // + // closeButton = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(self.close)) + // closeButton.isEnabled = true + // let flexibleSpaceButton = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil) + // let fixedSpaceButton = UIBarButtonItem(barButtonSystemItem: .fixedSpace, target: nil, action: nil) + // fixedSpaceButton.width = 20 + // + // + // let toolbarY: Float = toolbarIsAtBottom ? Float(view.bounds.size.height) - TOOLBAR_HEIGHT : 0.0 + // let toolbarFrame = CGRect(x: 0.0, y: CGFloat(toolbarY), width: view.bounds.size.width, height: CGFloat(TOOLBAR_HEIGHT)) + // + // toolbar = UIToolbar(frame: toolbarFrame) + // toolbar.alpha = 1.000 + // toolbar.autoresizesSubviews = true + // toolbar.autoresizingMask = toolbarIsAtBottom ? ([.flexibleWidth, .flexibleTopMargin]) : .flexibleWidth + // toolbar.barStyle = .blackOpaque + // toolbar.clearsContextBeforeDrawing = false + // toolbar.clipsToBounds = false + // toolbar.contentMode = .scaleToFill + // toolbar.isHidden = false + // toolbar.isMultipleTouchEnabled = false + // toolbar.isOpaque = false + // toolbar.isUserInteractionEnabled = true + // if browserOptions?.toolbarcolor != nil { + // // Set toolbar color if user sets it in options + // toolbar.barTintColor = color(fromHexString: (browserOptions?.toolbarcolor)!) + // } + // if !(browserOptions?.toolbartranslucent)! { + // // Set toolbar translucent to no if user sets it in options + // toolbar.isTranslucent = false + // } + // let labelInset: CGFloat = 5.0 + // let locationBarY: Float = toolbarIsAtBottom ? Float(view.bounds.size.height) - FOOTER_HEIGHT : Float(view.bounds.size.height) - LOCATIONBAR_HEIGHT + // + // + // let frontArrowString = NSLocalizedString("►", comment: "") + // // create arrow from Unicode char + // forwardButton = UIBarButtonItem(title: frontArrowString, style: .plain, target: self, action: #selector(self.goForward)) + // + // //forwardButton = UIBarButtonItem(barButtonSystemItem: .fastForward, target: self, action: #selector(self.goForward)) + // forwardButton.isEnabled = true + // forwardButton.imageInsets = UIEdgeInsets.zero as? UIEdgeInsets ?? UIEdgeInsets() + // if browserOptions?.navigationbuttoncolor != nil { + // // Set button color if user sets it in options + // forwardButton.tintColor = color(fromHexString: (browserOptions?.navigationbuttoncolor)!) + // } + // + // let backArrowString = NSLocalizedString("◄", comment: "") + // // create arrow from Unicode char + // backButton = UIBarButtonItem(title: backArrowString, style: .plain, target: self, action: #selector(self.goBack)) + // backButton.isEnabled = true + // backButton.imageInsets = UIEdgeInsets.zero as? UIEdgeInsets ?? UIEdgeInsets() + // if browserOptions?.navigationbuttoncolor != nil { + // // Set button color if user sets it in options + // backButton.tintColor = color(fromHexString: (browserOptions?.navigationbuttoncolor)!) + // } + // + // reloadButton = UIBarButtonItem(barButtonSystemItem: .refresh, target: self, action: #selector(self.reload)) + // reloadButton.isEnabled = true + // reloadButton.imageInsets = UIEdgeInsetsMake(0, 0, 0, 15) + // + // urlField = UITextField() + // urlField.bounds.size.width = toolbar.bounds.width - 150 + // urlField.bounds.size.height = CGFloat(TOOLBAR_HEIGHT-15) + // urlField.backgroundColor = color(fromHexString: "#ECECED") + // urlField.center.y = toolbar.center.y + // urlField.autoresizesSubviews = true + // urlField.autoresizingMask = [.flexibleWidth, .flexibleHeight] + // urlField.text = currentURL?.absoluteString + // urlField.textAlignment = NSTextAlignment.center + // urlField.font = UIFont.systemFont(ofSize: 15) + // urlField.borderStyle = UITextBorderStyle.roundedRect + // urlField.autocorrectionType = UITextAutocorrectionType.no + // urlField.keyboardType = UIKeyboardType.default + // urlField.returnKeyType = UIReturnKeyType.done + // urlField.clearButtonMode = UITextFieldViewMode.whileEditing; + // urlField.contentVerticalAlignment = UIControlContentVerticalAlignment.center + // urlField.delegate = self + // urlFieldBarButton = UIBarButtonItem.init(customView: urlField) + // + // // Filter out Navigation Buttons if user requests so + // if (browserOptions?.hidenavigationbuttons)! { + // toolbar.items = [closeButton, flexibleSpaceButton, urlFieldBarButton] + // } + // else { + // //toolbar.items = [urlFieldBarButton, closeButton, flexibleSpaceButton, backButton, fixedSpaceButton, forwardButton] + // toolbar.items = [urlFieldBarButton, flexibleSpaceButton, reloadButton, closeButton] + // } + // + // view.backgroundColor = UIColor.gray + // view.addSubview(toolbar) + // view.addSubview(spinner) + // } + + func setWebViewFrame(_ frame: CGRect) { + print("Setting the WebView's frame to \(NSStringFromCGRect(frame))") + webView.frame = frame + } + + // func showToolBar(_ show: Bool, toolbarPosition: String) { + // var toolbarFrame: CGRect = toolbar.frame + // // prevent double show/hide + // if show == !toolbar.isHidden { + // return + // } + // if show { + // toolbar.isHidden = false + // var webViewBounds: CGRect = view.bounds + // + // webViewBounds.size.height -= CGFloat(TOOLBAR_HEIGHT) + // toolbar.frame = toolbarFrame + // + // if (toolbarPosition == kInAppBrowserToolbarBarPositionTop) { + // toolbarFrame.origin.y = 0 + // webViewBounds.origin.y += toolbarFrame.size.height + // setWebViewFrame(webViewBounds) + // } + // else { + // toolbarFrame.origin.y = webViewBounds.size.height + CGFloat(LOCATIONBAR_HEIGHT) + // } + // setWebViewFrame(webViewBounds) + // } + // else { + // toolbar.isHidden = true + // setWebViewFrame(view.bounds) + // } + // } + + // override func viewDidUnload() { + // webView?.loadHTMLString(nil, baseURL: nil) + // CDVUserAgentUtil.releaseLock(userAgentLockToken) + // super.viewDidUnload() + // } + + @objc func reload () { + webView.reload() + } + + @objc func share () { + let vc = UIActivityViewController(activityItems: [currentURL ?? ""], applicationActivities: []) + present(vc, animated: true, completion: nil) + } + + @objc func close() { + currentURL = nil + + if (navigationDelegate != nil) { + navigationDelegate?.browserExit() + } + // if (navigationDelegate != nil) && navigationDelegate?.responds(to: #selector(self.browserExit)) { + // navigationDelegate?.browserExit() + // } + weak var weakSelf = self + + // Run later to avoid the "took a long time" log message. + DispatchQueue.main.async(execute: {() -> Void in + if (weakSelf?.responds(to: #selector(getter: self.presentingViewController)))! { + weakSelf?.presentingViewController?.dismiss(animated: true, completion: {() -> Void in + self.tmpWindow?.windowLevel = 0.0 + UIApplication.shared.delegate?.window??.makeKeyAndVisible() + }) + } + else { + weakSelf?.parent?.dismiss(animated: true, completion: {() -> Void in + self.tmpWindow?.windowLevel = 0.0 + UIApplication.shared.delegate?.window??.makeKeyAndVisible() + }) + } + }) + } + + func navigate(to url: URL) { + let request = URLRequest(url: url) + currentURL = url + updateUrlTextField(url: (currentURL?.absoluteString)!) + webView.load(request) + } + + @objc func goBack(_ sender: Any) { + webView.goBack() + updateUrlTextField(url: (webView?.url?.absoluteString)!) + } + + @objc func goForward(_ sender: Any) { + webView.goForward() + updateUrlTextField(url: (webView?.url?.absoluteString)!) + } + + func updateUrlTextField(url: String) { + urlField.text = url + } + + // + // On iOS 7 the status bar is part of the view's dimensions, therefore it's height has to be taken into account. + // The height of it could be hardcoded as 20 pixels, but that would assume that the upcoming releases of iOS won't + // change that value. + // + + func getStatusBarOffset() -> Float { + let statusBarFrame: CGRect = UIApplication.shared.statusBarFrame + let statusBarOffset: Float = Float(min(statusBarFrame.size.width, statusBarFrame.size.height)) + return statusBarOffset + } + + // func rePositionViews() { + // if (browserOptions?.toolbarposition == kInAppBrowserToolbarBarPositionTop) { + // webView?.frame = CGRect(x: (webView?.frame.origin.x)!, y: CGFloat(TOOLBAR_HEIGHT+getStatusBarOffset()), width: (webView?.frame.size.width)!, height: (webView?.frame.size.height)!) + // toolbar.frame = CGRect(x: toolbar.frame.origin.x, y: CGFloat(getStatusBarOffset()), width: toolbar.frame.size.width, height: toolbar.frame.size.height) + // } + // } + + // Helper function to convert hex color string to UIColor + // Assumes input like "#00FF00" (#RRGGBB). + // Taken from https://stackoverflow.com/questions/1560081/how-can-i-create-a-uicolor-from-a-hex-string + + func color(fromHexString: String, alpha:CGFloat? = 1.0) -> UIColor { + + // Convert hex string to an integer + let hexint = Int(self.intFromHexString(hexStr: fromHexString)) + let red = CGFloat((hexint & 0xff0000) >> 16) / 255.0 + let green = CGFloat((hexint & 0xff00) >> 8) / 255.0 + let blue = CGFloat((hexint & 0xff) >> 0) / 255.0 + let alpha = alpha! + + // Create color object, specifying alpha as well + let color = UIColor(red: red, green: green, blue: blue, alpha: alpha) + return color + } + + func intFromHexString(hexStr: String) -> UInt32 { + var hexInt: UInt32 = 0 + // Create scanner + let scanner: Scanner = Scanner(string: hexStr) + // Tell scanner to skip the # character + scanner.charactersToBeSkipped = CharacterSet(charactersIn: "#") + // Scan hex value + scanner.scanHexInt32(&hexInt) + return hexInt + } + + func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) { + // loading url, start spinner, update back/forward + backButton.isEnabled = webView.canGoBack + forwardButton.isEnabled = webView.canGoForward + + if (browserOptions?.spinner)! { + spinner.startAnimating() + } + + return (navigationDelegate?.webViewDidStartLoad(webView))! + } + + // func webView(_ theWebView: WKWebView, shouldStartLoadWith request: URLRequest, navigationType: UIWebViewNavigationType) -> Bool { + // let isTopLevelNavigation: Bool? = request.url == request.mainDocumentURL + // if isTopLevelNavigation ?? false { + // currentURL = request.url + // } + // + // return (navigationDelegate?.webView(theWebView, shouldStartLoadWith: request, navigationType: navigationType))! + // } + + func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) { + //func webViewDidFinishLoad(_ theWebView: WKWebView) { + // update url, stop spinner, update back/forward + currentURL = webView.url + updateUrlTextField(url: (currentURL?.absoluteString)!) + backButton.isEnabled = webView.canGoBack + forwardButton.isEnabled = webView.canGoForward + spinner.stopAnimating() + navigationDelegate?.webViewDidFinishLoad(webView) + } + + func webView(_ webView: WKWebView, didFail navigation: WKNavigation!, withError error: Error) { + //func webView(_ theWebView: WKWebView, didFailLoadWithError error: Error) { + // log fail message, stop spinner, update back/forward + print("webView:didFailLoadWithError - \(Int(error._code)): \(error.localizedDescription)") + backButton.isEnabled = webView.canGoBack + forwardButton.isEnabled = webView.canGoForward + spinner.stopAnimating() + navigationDelegate?.webView(webView, didFailLoadWithError: error) + } +} diff --git a/ios/Classes/SwiftFlutterPlugin.swift b/ios/Classes/SwiftFlutterPlugin.swift index 5ea1006e..6e26cb4c 100644 --- a/ios/Classes/SwiftFlutterPlugin.swift +++ b/ios/Classes/SwiftFlutterPlugin.swift @@ -21,101 +21,11 @@ import WebKit import Foundation import AVFoundation -let kInAppBrowserTargetSelf = "_self" -let kInAppBrowserTargetSystem = "_system" -let kInAppBrowserTargetBlank = "_blank" -let kInAppBrowserToolbarBarPositionBottom = "bottom" -let kInAppBrowserToolbarBarPositionTop = "top" -let TOOLBAR_HEIGHT: Float = 44.0 -let STATUSBAR_HEIGHT: Float = 20.0 -let LOCATIONBAR_HEIGHT: Float = 21.0 -let FOOTER_HEIGHT: Float = (TOOLBAR_HEIGHT + LOCATIONBAR_HEIGHT) - -@objcMembers -class CDVInAppBrowserOptions: NSObject { - var location = false - var toolbar = false - var closebuttoncaption = "" - var closebuttoncolor = "" - var toolbarposition = "" - var toolbarcolor = "" - var toolbartranslucent = false - var hidenavigationbuttons = false - var navigationbuttoncolor = "" - var clearcache = false - var clearsessioncache = false - var hidespinner = false - var presentationstyle = "" - var transitionstyle = "" - var enableviewportscale = false - var mediaplaybackrequiresuseraction = false - var allowinlinemediaplayback = false - var keyboarddisplayrequiresuseraction = false - var suppressesincrementalrendering = false - var hidden = false - var disallowoverscroll = false - - override init() { - super.init() - - // default values - location = true - toolbar = true - closebuttoncaption = "Done" - closebuttoncolor = "#FFFFFF" - toolbarposition = kInAppBrowserToolbarBarPositionBottom - clearcache = false - clearsessioncache = false - hidespinner = false - enableviewportscale = false - mediaplaybackrequiresuseraction = false - allowinlinemediaplayback = false - keyboarddisplayrequiresuseraction = true - suppressesincrementalrendering = false - hidden = false - disallowoverscroll = false - hidenavigationbuttons = false - toolbarcolor = "" - toolbartranslucent = true - - } - - class func parseOptions(_ options: String) -> CDVInAppBrowserOptions { - let obj = CDVInAppBrowserOptions() - // NOTE: this parsing does not handle quotes within values - let pairs = options.components(separatedBy: ",") - // parse keys and values, set the properties - for pair: String in pairs { - let keyvalue = pair.components(separatedBy: "=") - if keyvalue.count == 2 { - let key: String = keyvalue[0].lowercased() - let value: String = keyvalue[1] - let value_lc: String = value.lowercased() - let isBoolean: Bool = (value_lc == "yes") || (value_lc == "no") - let numberFormatter = NumberFormatter() - numberFormatter.allowsFloats = true - let isNumber: Bool = numberFormatter.number(from: value_lc) != nil - // set the property according to the key name - if obj.responds(to: NSSelectorFromString(key)) { - if isNumber { - obj.setValue(numberFormatter.number(from: value_lc), forKey: key) - } - else if isBoolean { - obj.setValue(((value_lc == "yes") ? 1 : 0), forKey: key) - } - else { - obj.setValue(value, forKey: key) - } - } - } - } - return obj - } -} - +let WEBVIEW_STORYBOARD = "WebView" +let WEBVIEW_STORYBOARD_CONTROLLER_ID = "viewController" public class SwiftFlutterPlugin: NSObject, FlutterPlugin { - var inAppBrowserViewController: CDVInAppBrowserViewController? + var webViewController: InAppBrowserWebViewController? var tmpWindow: UIWindow? var channel: FlutterMethodChannel @@ -134,57 +44,49 @@ public class SwiftFlutterPlugin: NSObject, FlutterPlugin { public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) { let arguments = call.arguments as? NSDictionary switch call.method { - case "open": - self.open(arguments: arguments!, result: result) - break - case "close": - self.close() - result(true) - break - case "show": - self.show() - result(true) - break - case "hide": - self.hide() - result(true) - break - case "injectScriptCode": - self.injectScriptCode(arguments: arguments!) - result(true) - break - case "injectScriptFile": - self.injectScriptFile(arguments: arguments!) - result(true) - break - case "injectStyleCode": - self.injectStyleCode(arguments: arguments!) - result(true) - break - case "injectStyleFile": - self.injectStyleFile(arguments: arguments!) - result(true) - break - default: - break + case "open": + self.open(arguments: arguments!, result: result) + break + case "close": + self.close() + result(true) + break + case "show": + self.show() + result(true) + break + case "hide": + self.hide() + result(true) + break + case "injectScriptCode": + self.injectScriptCode(arguments: arguments!) + result(true) + break + case "injectScriptFile": + self.injectScriptFile(arguments: arguments!) + result(true) + break + case "injectStyleCode": + self.injectStyleCode(arguments: arguments!) + result(true) + break + case "injectStyleFile": + self.injectStyleFile(arguments: arguments!) + result(true) + break + default: + break } } - func setting(forKey key: String) -> Any { - return ""//commandDelegate.settings[key.lowercased()]! - } - - func onReset() { - close() - } - func close() { - if inAppBrowserViewController == nil { + if webViewController == nil { print("IAB.close() called but it was already closed.") return } // Things are cleaned up in browserExit. - inAppBrowserViewController?.close() + webViewController?.close() } func isSystemUrl(_ url: URL) -> Bool { @@ -197,25 +99,24 @@ public class SwiftFlutterPlugin: NSObject, FlutterPlugin { public func open(arguments: NSDictionary, result: @escaping FlutterResult) { let url: String? = (arguments["url"] as? String)! var target: String? = (arguments["target"] as? String)! - target = target != nil ? target : kInAppBrowserTargetSelf - let options = (arguments["options"] as? String)! - + target = target != nil ? target : "_self" + let options = (arguments["options"] as? [String: Any])! + if url != nil { - let baseUrl: URL? = nil - let absoluteUrl = URL(string: url!, relativeTo: baseUrl)?.absoluteURL + let absoluteUrl = URL(string: url!)?.absoluteURL if isSystemUrl(absoluteUrl!) { - target = kInAppBrowserTargetSystem + target = "_system" } - if (target == kInAppBrowserTargetSelf) { - open(inCordovaWebView: absoluteUrl!, withOptions: options) + if (target == "_self" || target == "_target") { + openIn(inAppBrowser: absoluteUrl!, withOptions: options) } - else if (target == kInAppBrowserTargetSystem) { + else if (target == "_system") { open(inSystem: absoluteUrl!) } else { - // _blank or anything else + // anything else openIn(inAppBrowser: absoluteUrl!, withOptions: options) } } @@ -225,10 +126,12 @@ public class SwiftFlutterPlugin: NSObject, FlutterPlugin { result(true) } - func openIn(inAppBrowser url: URL, withOptions options: String) { - let browserOptions = CDVInAppBrowserOptions.parseOptions(options) + func openIn(inAppBrowser url: URL, withOptions options: [String: Any]) { + + let browserOptions = InAppBrowserOptions() + browserOptions.parse(options: options) - if browserOptions.clearcache { + if browserOptions.clearCache { let _: HTTPCookie? let storage = HTTPCookieStorage.shared for cookie in storage.cookies! { @@ -238,8 +141,7 @@ public class SwiftFlutterPlugin: NSObject, FlutterPlugin { } } - if browserOptions.clearsessioncache { - let _: HTTPCookie? + if browserOptions.clearSessionCache { let storage = HTTPCookieStorage.shared for cookie in storage.cookies! { if !(cookie.domain.isEqual(".^filecookies^") && cookie.isSessionOnly) { @@ -248,88 +150,29 @@ public class SwiftFlutterPlugin: NSObject, FlutterPlugin { } } - if inAppBrowserViewController == nil { - var userAgent: String = UIWebView().stringByEvaluatingJavaScript(from: "navigator.userAgent")! + if webViewController == nil { - let overrideUserAgent: String = "" - let appendUserAgent: String = "" - if overrideUserAgent != "" { - userAgent = overrideUserAgent - } - if appendUserAgent != "" { - userAgent = userAgent + (appendUserAgent) - } if !(self.tmpWindow != nil) { let frame: CGRect = UIScreen.main.bounds self.tmpWindow = UIWindow(frame: frame) } - inAppBrowserViewController = CDVInAppBrowserViewController(userAgent: userAgent, prevUserAgent: userAgent, browserOptions: browserOptions, tmpWindow: tmpWindow) - inAppBrowserViewController?.navigationDelegate = self + + let storyboard = UIStoryboard(name: WEBVIEW_STORYBOARD, bundle: nil) + let vc = storyboard.instantiateViewController(withIdentifier: WEBVIEW_STORYBOARD_CONTROLLER_ID) + webViewController = vc as? InAppBrowserWebViewController + webViewController?.browserOptions = browserOptions + webViewController?.tmpWindow = tmpWindow + webViewController?.currentURL = url + webViewController?.navigationDelegate = self } - inAppBrowserViewController?.showLocationBar(browserOptions.location) - inAppBrowserViewController?.showToolBar(browserOptions.toolbar, toolbarPosition: browserOptions.toolbarposition) - if browserOptions.closebuttoncaption != nil || browserOptions.closebuttoncolor != nil { - inAppBrowserViewController?.setCloseButtonTitle(browserOptions.closebuttoncaption, colorString: browserOptions.closebuttoncolor) - } - - // Set Presentation Style - var presentationStyle: UIModalPresentationStyle = .fullScreen - // default - if browserOptions.presentationstyle != nil { - if (browserOptions.presentationstyle.lowercased() == "pagesheet") { - presentationStyle = .pageSheet - } - else if (browserOptions.presentationstyle.lowercased() == "formsheet") { - presentationStyle = .formSheet - } - } - inAppBrowserViewController?.modalPresentationStyle = presentationStyle - - // Set Transition Style - var transitionStyle: UIModalTransitionStyle = .coverVertical - // default - if browserOptions.transitionstyle != nil { - if (browserOptions.transitionstyle.lowercased() == "fliphorizontal") { - transitionStyle = .flipHorizontal - } - else if (browserOptions.transitionstyle.lowercased() == "crossdissolve") { - transitionStyle = .crossDissolve - } - } - inAppBrowserViewController?.modalTransitionStyle = transitionStyle - - // prevent webView from bouncing - if browserOptions.disallowoverscroll { - if inAppBrowserViewController?.webView?.responds(to: #selector(getter: inAppBrowserViewController?.webView?.scrollView)) ?? false { - (inAppBrowserViewController?.webView?.scrollView)?.bounces = false - } - else { - for subview: UIView in (inAppBrowserViewController?.webView?.subviews)! { - if subview is UIScrollView { - (subview as? UIScrollView)?.bounces = false - } - } - } - } - - // UIWebView options - inAppBrowserViewController?.webView?.scalesPageToFit = browserOptions.enableviewportscale - inAppBrowserViewController?.webView?.mediaPlaybackRequiresUserAction = browserOptions.mediaplaybackrequiresuseraction - inAppBrowserViewController?.webView?.allowsInlineMediaPlayback = browserOptions.allowinlinemediaplayback - //if IsAtLeastiOSVersion("6.0") { - inAppBrowserViewController?.webView?.keyboardDisplayRequiresUserAction = browserOptions.keyboarddisplayrequiresuseraction - inAppBrowserViewController?.webView?.suppressesIncrementalRendering = browserOptions.suppressesincrementalrendering - //} - - inAppBrowserViewController?.navigate(to: url) if !browserOptions.hidden { show() } } public func show() { - if inAppBrowserViewController == nil { + if webViewController == nil { print("Tried to show IAB after it was closed.") return } @@ -338,17 +181,11 @@ public class SwiftFlutterPlugin: NSObject, FlutterPlugin { return } - previousStatusBarStyle = UIApplication.shared.statusBarStyle.rawValue - let nav = CDVInAppBrowserNavigationController(rootViewController: inAppBrowserViewController!) - nav.orientationDelegate = inAppBrowserViewController - nav.isNavigationBarHidden = true - nav.modalPresentationStyle = (inAppBrowserViewController?.modalPresentationStyle)! - weak var weakSelf: SwiftFlutterPlugin? = self // Run later to avoid the "took a long time" log message. DispatchQueue.main.async(execute: {() -> Void in - if weakSelf?.inAppBrowserViewController != nil { + if weakSelf?.webViewController != nil { if !(self.tmpWindow != nil) { let frame: CGRect = UIScreen.main.bounds self.tmpWindow = UIWindow(frame: frame) @@ -358,13 +195,14 @@ public class SwiftFlutterPlugin: NSObject, FlutterPlugin { self.tmpWindow?.rootViewController = tmpController self.tmpWindow?.windowLevel = UIWindowLevel(baseWindowLevel! + 1) self.tmpWindow?.makeKeyAndVisible() - tmpController.present(nav, animated: true) { () -> Void in } + + tmpController.present(self.webViewController!, animated: true, completion: nil) } }) } public func hide() { - if inAppBrowserViewController == nil { + if webViewController == nil { print("Tried to hide IAB after it was closed.") return } @@ -372,12 +210,13 @@ public class SwiftFlutterPlugin: NSObject, FlutterPlugin { print("Tried to hide IAB while already hidden") return } + previousStatusBarStyle = UIApplication.shared.statusBarStyle.rawValue // Run later to avoid the "took a long time" log message. DispatchQueue.main.async(execute: {() -> Void in - if self.inAppBrowserViewController != nil { + if self.webViewController != nil { self.previousStatusBarStyle = -1 - self.inAppBrowserViewController?.presentingViewController?.dismiss(animated: true, completion: {() -> Void in + self.webViewController?.presentingViewController?.dismiss(animated: true, completion: {() -> Void in self.tmpWindow?.windowLevel = 0.0 UIApplication.shared.delegate?.window??.makeKeyAndVisible() }) @@ -385,11 +224,6 @@ public class SwiftFlutterPlugin: NSObject, FlutterPlugin { }) } - func open(inCordovaWebView url: URL, withOptions options: String) { - _ = URLRequest(url: url) - openIn(inAppBrowser: url, withOptions: options) - } - func open(inSystem url: URL) { if UIApplication.shared.openURL(url) == false { NotificationCenter.default.post(Notification(name: Notification.Name(rawValue: "CDVPluginHandleOpenURLNotification"), object: url)) @@ -411,11 +245,11 @@ public class SwiftFlutterPlugin: NSObject, FlutterPlugin { if sourceArrayString != nil { let sourceString: String? = (sourceArrayString! as NSString).substring(with: NSRange(location: 1, length: (sourceArrayString?.characters.count ?? 0) - 2)) let jsToInject = String(format: jsWrapper, sourceString!) - inAppBrowserViewController?.webView?.stringByEvaluatingJavaScript(from: jsToInject) + webViewController?.webView?.evaluateJavaScript(jsToInject) } } else { - inAppBrowserViewController?.webView?.stringByEvaluatingJavaScript(from: source) + webViewController?.webView?.evaluateJavaScript(source) } } @@ -439,18 +273,18 @@ public class SwiftFlutterPlugin: NSObject, FlutterPlugin { injectDeferredObject(arguments["urlFile"] as! String, withWrapper: jsWrapper) } - func webViewDidStartLoad(_ webView: UIWebView) { - let url: String = inAppBrowserViewController!.currentURL!.absoluteString + func webViewDidStartLoad(_ webView: WKWebView) { + let url: String = webViewController!.currentURL!.absoluteString channel.invokeMethod("loadstart", arguments: ["type": "loadstart", "url": url]) } - func webViewDidFinishLoad(_ webView: UIWebView) { - let url: String = inAppBrowserViewController!.currentURL!.absoluteString + func webViewDidFinishLoad(_ webView: WKWebView) { + let url: String = webViewController!.currentURL!.absoluteString channel.invokeMethod("loadstop", arguments: ["type": "loadstop", "url": url]) } - func webView(_ webView: UIWebView, didFailLoadWithError error: Error) { - let url: String = inAppBrowserViewController!.currentURL!.absoluteString + func webView(_ webView: WKWebView, didFailLoadWithError error: Error) { + let url: String = webViewController!.currentURL!.absoluteString let arguments = ["type": "loaderror", "url": url, "code": error._code, "message": error.localizedDescription] as [String : Any] channel.invokeMethod("loaderror", arguments: arguments) } @@ -458,577 +292,19 @@ public class SwiftFlutterPlugin: NSObject, FlutterPlugin { func browserExit() { channel.invokeMethod("exit", arguments: ["type": "exit"]) - + // Set navigationDelegate to nil to ensure no callbacks are received from it. - inAppBrowserViewController?.navigationDelegate = nil + webViewController?.navigationDelegate = nil // Don't recycle the ViewController since it may be consuming a lot of memory. // Also - this is required for the PDF/User-Agent bug work-around. - inAppBrowserViewController = nil + webViewController = nil - //if (IsAtLeastiOSVersion(@"7.0")) { - if previousStatusBarStyle != -1 { - UIApplication.shared.statusBarStyle = UIStatusBarStyle(rawValue: previousStatusBarStyle)! - } - //} + if previousStatusBarStyle != -1 { + UIApplication.shared.statusBarStyle = UIStatusBarStyle(rawValue: previousStatusBarStyle)! + } previousStatusBarStyle = -1 // this value was reset before reapplying it. caused statusbar to stay black on ios7 } - -} - -class CDVInAppBrowserViewController: UIViewController, UIWebViewDelegate { - @IBOutlet var webView: UIWebView! - @IBOutlet var closeButton: UIBarButtonItem! - @IBOutlet var addressLabel: UILabel! - @IBOutlet var backButton: UIBarButtonItem! - @IBOutlet var forwardButton: UIBarButtonItem! - @IBOutlet var spinner: UIActivityIndicatorView! - @IBOutlet var toolbar: UIToolbar! - weak var orientationDelegate: CDVInAppBrowserViewController? - weak var navigationDelegate: SwiftFlutterPlugin? - var currentURL: URL? - var tmpWindow: UIWindow? - - private var userAgent = "" - private var prevUserAgent = "" - private var userAgentLockToken: Int = 0 - private var browserOptions: CDVInAppBrowserOptions? - - init(userAgent: String, prevUserAgent: String, browserOptions: CDVInAppBrowserOptions, tmpWindow: UIWindow?) { - - super.init(nibName: nil, bundle: nil) - - self.userAgent = userAgent - self.prevUserAgent = prevUserAgent - self.browserOptions = browserOptions - self.tmpWindow = tmpWindow - createViews() - - } - - required init?(coder aDecoder: NSCoder) { - fatalError("init(coder:) has not been implemented") - } - - // Prevent crashes on closing windows - deinit { - webView?.delegate = nil - } - - func createViews() { - // We create the views in code for primarily for ease of upgrades and not requiring an external .xib to be included - var webViewBounds: CGRect = view.bounds - let toolbarIsAtBottom: Bool = !(browserOptions!.toolbarposition == kInAppBrowserToolbarBarPositionTop) - webViewBounds.size.height -= CGFloat((browserOptions?.location)! ? FOOTER_HEIGHT : TOOLBAR_HEIGHT) - webView = UIWebView(frame: webViewBounds)// as WKWebView - webView?.autoresizingMask = [.flexibleWidth, .flexibleHeight] - - view.addSubview(webView!) - view.sendSubview(toBack: webView!) - webView?.delegate = self - webView?.backgroundColor = UIColor.white - webView?.clearsContextBeforeDrawing = true - webView?.clipsToBounds = true - webView?.contentMode = .scaleToFill - webView?.isMultipleTouchEnabled = true - webView?.isOpaque = true - webView?.scalesPageToFit = false - webView?.isUserInteractionEnabled = true - - spinner = UIActivityIndicatorView(activityIndicatorStyle: .gray) - spinner.alpha = 1.000 - spinner.autoresizesSubviews = true - spinner.autoresizingMask = [.flexibleLeftMargin, .flexibleTopMargin, .flexibleBottomMargin, .flexibleRightMargin] - spinner.clearsContextBeforeDrawing = false - spinner.clipsToBounds = false - spinner.contentMode = .scaleToFill - spinner.frame = CGRect(x: (webView?.frame.midX)!, y: (webView?.frame.midY)!, width: 20.0, height: 20.0) - spinner.isHidden = false - spinner.hidesWhenStopped = true - spinner.isMultipleTouchEnabled = false - spinner.isOpaque = false - spinner.isUserInteractionEnabled = false - spinner.stopAnimating() - - closeButton = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(self.close)) - closeButton.isEnabled = true - let flexibleSpaceButton = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: nil, action: nil) - let fixedSpaceButton = UIBarButtonItem(barButtonSystemItem: .fixedSpace, target: nil, action: nil) - fixedSpaceButton.width = 20 - let toolbarY: Float = toolbarIsAtBottom ? Float(view.bounds.size.height) - TOOLBAR_HEIGHT : 0.0 - let toolbarFrame = CGRect(x: 0.0, y: CGFloat(toolbarY), width: view.bounds.size.width, height: CGFloat(TOOLBAR_HEIGHT)) - - toolbar = UIToolbar(frame: toolbarFrame) - toolbar.alpha = 1.000 - toolbar.autoresizesSubviews = true - toolbar.autoresizingMask = toolbarIsAtBottom ? ([.flexibleWidth, .flexibleTopMargin]) : .flexibleWidth - toolbar.barStyle = .blackOpaque - toolbar.clearsContextBeforeDrawing = false - toolbar.clipsToBounds = false - toolbar.contentMode = .scaleToFill - toolbar.isHidden = false - toolbar.isMultipleTouchEnabled = false - toolbar.isOpaque = false - toolbar.isUserInteractionEnabled = true - if browserOptions?.toolbarcolor != nil { - // Set toolbar color if user sets it in options - toolbar.barTintColor = color(fromHexString: (browserOptions?.toolbarcolor)!) - } - if !(browserOptions?.toolbartranslucent)! { - // Set toolbar translucent to no if user sets it in options - toolbar.isTranslucent = false - } - let labelInset: CGFloat = 5.0 - let locationBarY: Float = toolbarIsAtBottom ? Float(view.bounds.size.height) - FOOTER_HEIGHT : Float(view.bounds.size.height) - LOCATIONBAR_HEIGHT - - addressLabel = UILabel(frame: CGRect(x: labelInset, y: CGFloat(locationBarY), width: view.bounds.size.width - labelInset, height: CGFloat(LOCATIONBAR_HEIGHT))) - addressLabel.adjustsFontSizeToFitWidth = false - addressLabel.alpha = 1.000 - addressLabel.autoresizesSubviews = true - addressLabel.autoresizingMask = [.flexibleWidth, .flexibleRightMargin, .flexibleTopMargin] - addressLabel.backgroundColor = UIColor.clear// as? CGColor - addressLabel.baselineAdjustment = .alignCenters - addressLabel.clearsContextBeforeDrawing = true - addressLabel.clipsToBounds = true - addressLabel.contentMode = .scaleToFill - addressLabel.isEnabled = true - addressLabel.isHidden = false - addressLabel.lineBreakMode = .byTruncatingTail - - if addressLabel.responds(to: NSSelectorFromString("setMinimumScaleFactor:")) { - addressLabel.setValue((10.0 / UIFont.labelFontSize), forKey: "minimumScaleFactor") - } - else if addressLabel.responds(to: NSSelectorFromString("setMinimumFontSize:")) { - addressLabel.setValue(10.0, forKey: "minimumFontSize") - } - - addressLabel.isMultipleTouchEnabled = false - addressLabel.numberOfLines = 1 - addressLabel.isOpaque = false - addressLabel.shadowOffset = CGSize(width: 0.0, height: -1.0) - addressLabel.text = NSLocalizedString("Loading...", comment: "") - addressLabel.textAlignment = .left - addressLabel.textColor = UIColor(white: 1.000, alpha: 1.000) - addressLabel.isUserInteractionEnabled = false - - let frontArrowString = NSLocalizedString("►", comment: "") - // create arrow from Unicode char - forwardButton = UIBarButtonItem(title: frontArrowString, style: .plain, target: self, action: #selector(self.goForward)) - forwardButton.isEnabled = true - forwardButton.imageInsets = UIEdgeInsets.zero as? UIEdgeInsets ?? UIEdgeInsets() - if browserOptions?.navigationbuttoncolor != nil { - // Set button color if user sets it in options - forwardButton.tintColor = color(fromHexString: (browserOptions?.navigationbuttoncolor)!) - } - - let backArrowString = NSLocalizedString("◄", comment: "") - // create arrow from Unicode char - backButton = UIBarButtonItem(title: backArrowString, style: .plain, target: self, action: #selector(self.goBack)) - backButton.isEnabled = true - backButton.imageInsets = UIEdgeInsets.zero as? UIEdgeInsets ?? UIEdgeInsets() - if browserOptions?.navigationbuttoncolor != nil { - // Set button color if user sets it in options - backButton.tintColor = color(fromHexString: (browserOptions?.navigationbuttoncolor)!) - } - - // Filter out Navigation Buttons if user requests so - if (browserOptions?.hidenavigationbuttons)! { - toolbar.items = [closeButton, flexibleSpaceButton] - } - else { - toolbar.items = [closeButton, flexibleSpaceButton, backButton, fixedSpaceButton, forwardButton] - } - view.backgroundColor = UIColor.gray// as? CGColor - view.addSubview(toolbar) - view.addSubview(addressLabel) - view.addSubview(spinner) - } - - func setWebViewFrame(_ frame: CGRect) { - print("Setting the WebView's frame to \(NSStringFromCGRect(frame))") - webView?.frame = frame - } - - func setCloseButtonTitle(_ title: String, colorString: String) { - // the advantage of using UIBarButtonSystemItemDone is the system will localize it for you automatically - // but, if you want to set this yourself, knock yourself out (we can't set the title for a system Done button, so we have to create a new one) - closeButton = nil - // Initialize with title if title is set, otherwise the title will be 'Done' localized - closeButton = title != nil ? UIBarButtonItem(title: title, style: .bordered, target: self, action: #selector(self.close)) : UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(self.close)) - closeButton.isEnabled = true - // If color on closebutton is requested then initialize with that that color, otherwise use initialize with default - closeButton.tintColor = colorString != nil ? color(fromHexString: colorString) : UIColor(red: 60.0 / 255.0, green: 136.0 / 255.0, blue: 230.0 / 255.0, alpha: 1) - - var items = toolbar.items - items![0] = closeButton - toolbar.items = items //as? [AVMetadataItem] ?? [AVMetadataItem]() - } - - func showLocationBar(_ show: Bool) { - var locationbarFrame: CGRect = addressLabel.frame - let toolbarVisible: Bool = !toolbar.isHidden - // prevent double show/hide - if show == !addressLabel.isHidden { - return - } - - if show { - addressLabel.isHidden = false - if toolbarVisible { - // toolBar at the bottom, leave as is - // put locationBar on top of the toolBar - var webViewBounds: CGRect = view.bounds - webViewBounds.size.height -= CGFloat(FOOTER_HEIGHT) - setWebViewFrame(webViewBounds) - locationbarFrame.origin.y = webViewBounds.size.height - addressLabel.frame = locationbarFrame - } - else { - // no toolBar, so put locationBar at the bottom - var webViewBounds: CGRect = view.bounds - webViewBounds.size.height -= CGFloat(LOCATIONBAR_HEIGHT) - setWebViewFrame(webViewBounds) - locationbarFrame.origin.y = webViewBounds.size.height - addressLabel.frame = locationbarFrame - } - } - else { - addressLabel.isHidden = true - if toolbarVisible { - // locationBar is on top of toolBar, hide locationBar - // webView take up whole height less toolBar height - var webViewBounds: CGRect = view.bounds - webViewBounds.size.height -= CGFloat(TOOLBAR_HEIGHT) - setWebViewFrame(webViewBounds) - } - else { - // no toolBar, expand webView to screen dimensions - setWebViewFrame(view.bounds) - } - } - } - - func showToolBar(_ show: Bool, toolbarPosition: String) { - var toolbarFrame: CGRect = toolbar.frame - var locationbarFrame: CGRect = addressLabel.frame - let locationbarVisible: Bool = !addressLabel.isHidden - // prevent double show/hide - if show == !toolbar.isHidden { - return - } - if show { - toolbar.isHidden = false - var webViewBounds: CGRect = view.bounds - - if locationbarVisible { - // locationBar at the bottom, move locationBar up - // put toolBar at the bottom - webViewBounds.size.height -= CGFloat(FOOTER_HEIGHT) - locationbarFrame.origin.y = webViewBounds.size.height - addressLabel.frame = locationbarFrame - toolbar.frame = toolbarFrame - } - else { - // no locationBar, so put toolBar at the bottom - var webViewBounds: CGRect = view.bounds - webViewBounds.size.height -= CGFloat(TOOLBAR_HEIGHT) - toolbar.frame = toolbarFrame - } - - if (toolbarPosition == kInAppBrowserToolbarBarPositionTop) { - toolbarFrame.origin.y = 0 - webViewBounds.origin.y += toolbarFrame.size.height - setWebViewFrame(webViewBounds) - } - else { - toolbarFrame.origin.y = webViewBounds.size.height + CGFloat(LOCATIONBAR_HEIGHT) - } - setWebViewFrame(webViewBounds) - } - else { - toolbar.isHidden = true - if locationbarVisible { - // locationBar is on top of toolBar, hide toolBar - // put locationBar at the bottom - // webView take up whole height less locationBar height - var webViewBounds: CGRect = view.bounds - webViewBounds.size.height -= CGFloat(LOCATIONBAR_HEIGHT) - setWebViewFrame(webViewBounds) - // move locationBar down - locationbarFrame.origin.y = webViewBounds.size.height - addressLabel.frame = locationbarFrame - } - else { - // no locationBar, expand webView to screen dimensions - setWebViewFrame(view.bounds) - } - } - } - - override func viewDidLoad() { - super.viewDidLoad() - } - -// override func viewDidUnload() { -// webView?.loadHTMLString(nil, baseURL: nil) -// CDVUserAgentUtil.releaseLock(userAgentLockToken) -// super.viewDidUnload() -// } - -// func preferredStatusBarStyle() -> UIStatusBarStyle { -// return .default -// } -// -// func prefersStatusBarHidden() -> Bool { -// return false -// } - - @objc func close() { - currentURL = nil - if (navigationDelegate != nil) { - navigationDelegate?.browserExit() - } -// if (navigationDelegate != nil) && navigationDelegate?.responds(to: #selector(self.browserExit)) { -// navigationDelegate?.browserExit() -// } - weak var weakSelf = self// as? UIViewController - // Run later to avoid the "took a long time" log message. - - DispatchQueue.main.async(execute: {() -> Void in - if (weakSelf?.responds(to: #selector(getter: self.presentingViewController)))! { - weakSelf?.presentingViewController?.dismiss(animated: true, completion: {() -> Void in - self.tmpWindow?.windowLevel = 0.0 - UIApplication.shared.delegate?.window??.makeKeyAndVisible() - }) - } - else { - weakSelf?.parent?.dismiss(animated: true, completion: {() -> Void in - self.tmpWindow?.windowLevel = 0.0 - UIApplication.shared.delegate?.window??.makeKeyAndVisible() - }) - } - }) - } - - func navigate(to url: URL) { - let request = URLRequest(url: url) - currentURL = url - webView?.loadRequest(request) -// if userAgentLockToken != 0 { -// webView?.load(request, mimeType: <#String#>, textEncodingName: <#String#>, baseURL: <#URL#>) -// } -// else { -// weak var weakSelf: CDVInAppBrowserViewController? = self -// CDVUserAgentUtil.acquireLock({(_ lockToken: Int) -> Void in -// userAgentLockToken = lockToken -// CDVUserAgentUtil.setUserAgent(userAgent, lockToken: lockToken) -// weakSelf?.webView?.load(request) -// }) -// } - } - - @objc func goBack(_ sender: Any) { - webView?.goBack() - } - - @objc func goForward(_ sender: Any) { - webView?.goForward() - } - - override func viewWillAppear(_ animated: Bool) { - //if IsAtLeastiOSVersion("7.0") { - UIApplication.shared.statusBarStyle = preferredStatusBarStyle - //} - rePositionViews() - super.viewWillAppear(animated) - } - - // - // On iOS 7 the status bar is part of the view's dimensions, therefore it's height has to be taken into account. - // The height of it could be hardcoded as 20 pixels, but that would assume that the upcoming releases of iOS won't - // change that value. - // - - func getStatusBarOffset() -> Float { - let statusBarFrame: CGRect = UIApplication.shared.statusBarFrame - let statusBarOffset: Float = Float(min(statusBarFrame.size.width, statusBarFrame.size.height))//IsAtLeastiOSVersion("7.0") ? min(statusBarFrame.size.width, statusBarFrame.size.height) : 0.0 - return statusBarOffset - } - - func rePositionViews() { - if (browserOptions?.toolbarposition == kInAppBrowserToolbarBarPositionTop) { - webView?.frame = CGRect(x: (webView?.frame.origin.x)!, y: CGFloat(TOOLBAR_HEIGHT), width: (webView?.frame.size.width)!, height: (webView?.frame.size.height)!) - toolbar.frame = CGRect(x: toolbar.frame.origin.x, y: CGFloat(getStatusBarOffset()), width: toolbar.frame.size.width, height: toolbar.frame.size.height) - } - } - - // Helper function to convert hex color string to UIColor - // Assumes input like "#00FF00" (#RRGGBB). - // Taken from https://stackoverflow.com/questions/1560081/how-can-i-create-a-uicolor-from-a-hex-string - - func color(fromHexString: String, alpha:CGFloat? = 1.0) -> UIColor { - - // Convert hex string to an integer - let hexint = Int(self.intFromHexString(hexStr: fromHexString)) - let red = CGFloat((hexint & 0xff0000) >> 16) / 255.0 - let green = CGFloat((hexint & 0xff00) >> 8) / 255.0 - let blue = CGFloat((hexint & 0xff) >> 0) / 255.0 - let alpha = alpha! - - // Create color object, specifying alpha as well - let color = UIColor(red: red, green: green, blue: blue, alpha: alpha) - return color - } - - func intFromHexString(hexStr: String) -> UInt32 { - var hexInt: UInt32 = 0 - // Create scanner - let scanner: Scanner = Scanner(string: hexStr) - // Tell scanner to skip the # character - scanner.charactersToBeSkipped = CharacterSet(charactersIn: "#") - // Scan hex value - scanner.scanHexInt32(&hexInt) - return hexInt - } - - // MARK: UIWebViewDelegate - - func webViewDidStartLoad(_ theWebView: UIWebView) { - // loading url, start spinner, update back/forward - addressLabel.text = NSLocalizedString("Loading...", comment: "") - backButton.isEnabled = theWebView.canGoBack - forwardButton.isEnabled = theWebView.canGoForward - print((browserOptions?.hidespinner)! ? "Yes" : "No") - if !(browserOptions?.hidespinner)! { - spinner.startAnimating() - } - return (navigationDelegate?.webViewDidStartLoad(theWebView))! - } - -// func webView(_ theWebView: UIWebView, shouldStartLoadWith request: URLRequest, navigationType: UIWebViewNavigationType) -> Bool { -// let isTopLevelNavigation: Bool? = request.url == request.mainDocumentURL -// if isTopLevelNavigation ?? false { -// currentURL = request.url -// } -// -// return (navigationDelegate?.webView(theWebView, shouldStartLoadWith: request, navigationType: navigationType))! -// } - - func webViewDidFinishLoad(_ theWebView: UIWebView) { - // update url, stop spinner, update back/forward - currentURL = theWebView.request?.url - addressLabel.text = currentURL?.absoluteString - backButton.isEnabled = theWebView.canGoBack - forwardButton.isEnabled = theWebView.canGoForward - spinner.stopAnimating() - - // Work around a bug where the first time a PDF is opened, all UIWebViews - // reload their User-Agent from NSUserDefaults. - // This work-around makes the following assumptions: - // 1. The app has only a single Cordova Webview. If not, then the app should - // take it upon themselves to load a PDF in the background as a part of - // their start-up flow. - // 2. That the PDF does not require any additional network requests. We change - // the user-agent here back to that of the CDVViewController, so requests - // from it must pass through its white-list. This *does* break PDFs that - // contain links to other remote PDF/websites. - // More info at https://issues.apache.org/jira/browse/CB-2225 - let isPDF: Bool = "true" == theWebView.stringByEvaluatingJavaScript(from: "document.body==null") - if isPDF { - //CDVUserAgentUtil.setUserAgent(prevUserAgent, lockToken: userAgentLockToken) - } - navigationDelegate?.webViewDidFinishLoad(theWebView) - } - - func webView(_ theWebView: UIWebView, didFailLoadWithError error: Error) { - // log fail message, stop spinner, update back/forward - print("webView:didFailLoadWithError - \(Int(error._code)): \(error.localizedDescription)") - backButton.isEnabled = theWebView.canGoBack - forwardButton.isEnabled = theWebView.canGoForward - spinner.stopAnimating() - addressLabel.text = NSLocalizedString("Load Error", comment: "") - navigationDelegate?.webView(theWebView, didFailLoadWithError: error) - } - - // MARK: CDVScreenOrientationDelegate -// func shouldAutorotate() -> Bool { -// if (orientationDelegate != nil) && (orientationDelegate?.responds(to: #selector(getter: self.shouldAutorotate)))! { -// return orientationDelegate!.shouldAutorotate -// } -// return true -// } -// -// func supportedInterfaceOrientations() -> Int { -// if (orientationDelegate != nil) && (orientationDelegate?.responds(to: #selector(getter: self.supportedInterfaceOrientations)))! { -// return Int(orientationDelegate!.supportedInterfaceOrientations.rawValue) -// } -// //return Int(1 << .portrait) -// return 1 -// } - -// override func shouldAutorotate(to interfaceOrientation: UIInterfaceOrientation) -> Bool { -// if (orientationDelegate != nil) && (orientationDelegate?.responds(to: #selector(self.shouldAutorotateToInterfaceOrientation)))! { -// return orientationDelegate!.shouldAutorotate(to: interfaceOrientation) -// } -// return true -// } - -} - -class CDVInAppBrowserNavigationController: UINavigationController { - weak var orientationDelegate: AnyObject? - - override func dismiss(animated flag: Bool, completion: (() -> Void)? = nil) { - if presentedViewController != nil { - super.dismiss(animated: flag, completion: completion) - } - } - - override func viewDidLoad() { - var statusBarFrame: CGRect = invertFrameIfNeeded(UIApplication.shared.statusBarFrame) - statusBarFrame.size.height = CGFloat(STATUSBAR_HEIGHT) - // simplified from: http://stackoverflow.com/a/25669695/219684 - let bgToolbar = UIToolbar(frame: statusBarFrame) - bgToolbar.barStyle = .default - bgToolbar.autoresizingMask = .flexibleWidth - view.addSubview(bgToolbar) - super.viewDidLoad() - } - - func invertFrameIfNeeded(_ rect: CGRect) -> CGRect { - // We need to invert since on iOS 7 frames are always in Portrait context -// if !IsAtLeastiOSVersion("8.0") { -// if UIInterfaceOrientationIsLandscape(UIApplication.shared.statusBarOrientation) { -// let temp: CGFloat = rect.size.width -// rect.size.width = rect.size.height -// rect.size.height = temp -// } -// rect.origin = CGPoint.zero -// } - return rect - } - - // MARK: CDVScreenOrientationDelegate - override var shouldAutorotate: Bool { - if (orientationDelegate != nil) && (orientationDelegate?.responds(to: #selector(getter: self.shouldAutorotate)))! { - return orientationDelegate!.shouldAutorotate - } - return true - } - - override var supportedInterfaceOrientations: UIInterfaceOrientationMask { - if (orientationDelegate != nil) && (orientationDelegate?.responds(to: #selector(getter: self.supportedInterfaceOrientations)))! { - return orientationDelegate!.supportedInterfaceOrientations - } - //return Int(1 << .portrait) - return UIInterfaceOrientationMask(rawValue: 1) - } - -// override func shouldAutorotate(to interfaceOrientation: UIInterfaceOrientation) -> Bool { -// if (orientationDelegate != nil) && (orientationDelegate?.responds(to: #selector(self.shouldAutorotateToInterfaceOrientation)))! { -// return orientationDelegate!.shouldAutorotate(to: interfaceOrientation) -// } -// return true -// } + } diff --git a/lib/flutter_inappbrowser.dart b/lib/flutter_inappbrowser.dart index 40f52fb0..c8836a45 100644 --- a/lib/flutter_inappbrowser.dart +++ b/lib/flutter_inappbrowser.dart @@ -121,7 +121,7 @@ class InAppBrowser { /// - __transitionstyle__: Set to `fliphorizontal`, `crossdissolve` or `coververtical` to set the [transition style](http://developer.apple.com/library/ios/#documentation/UIKit/Reference/UIViewController_Class/Reference/Reference.html#//apple_ref/occ/instp/UIViewController/modalTransitionStyle) (defaults to `coververtical`). /// - __toolbarposition__: Set to `top` or `bottom` (default is `bottom`). Causes the toolbar to be at the top or bottom of the window. /// - __hidespinner__: Set to `yes` or `no` to change the visibility of the loading indicator (defaults to `no`). - Future open(String url, {String target = "_self", String options = "location=yes"}) async { + Future open(String url, {String target = "_self", Map options = const {}}) async { Map args = {}; args.putIfAbsent('url', () => url); args.putIfAbsent('target', () => target);