Merge remote-tracking branch 'origin/master'

# Conflicts:
#	example/.flutter-plugins-dependencies
#	pubspec.yaml

example/ios/Flutter/flutter_export_environment.sh

@@ -1,10 +1,15 @@
 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=C:\flutter\flutter"
-export "FLUTTER_APPLICATION_PATH=C:\Users\Administrator\Desktop\flutter\plugins\chewie\example"
-export "FLUTTER_TARGET=lib\main.dart"
+export "FLUTTER_ROOT=/Users/i2edu/Documents/flutter_sdk/flutter"
+export "FLUTTER_APPLICATION_PATH=/Users/i2edu/Documents/workspace/plugins/video_chewie/example"
+export "FLUTTER_TARGET=lib/main.dart"
 export "FLUTTER_BUILD_DIR=build"
-export "SYMROOT=${SOURCE_ROOT}/../build\ios"
-export "FLUTTER_FRAMEWORK_DIR=C:\flutter\flutter\bin\cache\artifacts\engine\ios"
+export "SYMROOT=${SOURCE_ROOT}/../build/ios"
+export "OTHER_LDFLAGS=$(inherited) -framework Flutter"
+export "FLUTTER_FRAMEWORK_DIR=/Users/i2edu/Documents/flutter_sdk/flutter/bin/cache/artifacts/engine/ios"
 export "FLUTTER_BUILD_NAME=1.0.0"
 export "FLUTTER_BUILD_NUMBER=1"
+export "DART_OBFUSCATION=false"
+export "TRACK_WIDGET_CREATION=false"
+export "TREE_SHAKE_ICONS=false"
+export "PACKAGE_CONFIG=.packages"

lib/src/chewie_player.dart

@@ -81,7 +81,7 @@ class ChewieState extends State<Chewie> {
       Animation<double> animation,
       _ChewieControllerProvider controllerProvider) {
     return Scaffold(
-      resizeToAvoidBottomPadding: false,
+      resizeToAvoidBottomInset: false,
       body: Container(
         alignment: Alignment.center,
         color: Colors.black,
@@ -278,8 +278,7 @@ class ChewieController extends ChangeNotifier {
 
   static ChewieController of(BuildContext context) {
     final chewieControllerProvider =
-        context.inheritFromWidgetOfExactType(_ChewieControllerProvider)
-            as _ChewieControllerProvider;
+        context.findAncestorWidgetOfExactType<_ChewieControllerProvider>();
 
     return chewieControllerProvider.controller;
   }

pubspec.yaml

@@ -11,7 +11,7 @@ environment:
 
 dependencies:
   open_iconic_flutter: ">=0.3.0 <0.4.0"
-  video_player: ^1.0.1
+  video_player: ">=0.7.0 <0.11.0"
   wakelock: ">=0.1.2 <0.2.0"
   screen:
     git:
@@ -19,6 +19,9 @@ dependencies:
   sys_volume:
     git:
       url: https://github.com/hwh97/flutter_volume.git
+#  event_bus:
+#    git:
+#      url: https://git.i2edu.net/plugins/event_bus.git
   auto_orientation: ^1.0.6
   flutter:
     sdk: flutter