Sync

.fvmrc

@@ -0,0 +1,3 @@
+{
+  "flutter": "3.24.3"
+}

.gitignore

@@ -18,7 +18,7 @@
 # The .vscode folder contains launch configuration and tasks you configure in
 # VS Code which you may wish to be included in version control, so this line
 # is commented out by default.
-#.vscode/
+.vscode/
 
 # Flutter/Dart/Pub related
 # Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
@@ -27,3 +27,6 @@
 .dart_tool/
 .packages
 build/
+
+# FVM Version Cache
+.fvm/

CHANGELOG.md

@@ -1,6 +1,23 @@
+## 1.1.0
+
+* Fix namespace issue and add a new media action preset by [kmartins](https://github.com/kmartins): [PR #21](https://github.com/PuntitOwO/simple_pip_mode_flutter/pull/21)
+* Add deprecation warning to `PipWidget.builder` and `PipWidget.pipBuilder` parameters. They will be removed in v2.0.0.
+* Refactor native code method dispatcher to separate methods for each method call.
+* Update README.md to include new features and deprecation warning.
+
+## 1.0.0
+
+* Android 14 support by [song011794](https://github.com/song011794): [PR #12](https://github.com/PuntitOwO/simple_pip_mode_flutter/pull/12)
+* Add auto enter parameter to `setAutoPipMode` by [af-ffr](https://github.com/af-ffr): [PR #8](https://github.com/PuntitOwO/simple_pip_mode_flutter/pull/8)
+* Add `AspectRatio` record type.
+* Update README.md to inlcude updated videos of new features.
+* Actions code refactor to pass flutter static analysis.
+* Dependencies updated.
+* Refactor example app.
+
 ## 0.8.0
 
-* Pip Actions implemented by [Erick Daros](https://github.com/erickdaros): [Issue #5](https://github.com/PuntitOwO/simple_pip_mode_flutter/issues/5).
+* Pip Actions implemented by [Erick Daros](https://github.com/erickdaros): [PR #6](https://github.com/PuntitOwO/simple_pip_mode_flutter/pull/6).
 
 ## 0.7.1
 

README.md

@@ -7,7 +7,11 @@ Big shout out to the original author of this library [@puntitOwO](https://www.gi
 
 Provides methods to check feature availability, enter PIP mode, callbacks for mode change and PIP Actions support.
 
-![pip_example](https://user-images.githubusercontent.com/69210614/154329387-bd90ce0b-d563-4173-b2d0-2cbcc62b670c.gif)
+[main.webm](https://github.com/user-attachments/assets/8d9dd33d-a008-41af-a663-579c3a9cae7d)
+
+[auto_enter.webm](https://github.com/user-attachments/assets/9704e36b-351d-440e-b66b-cf6ad1523d92)
+
+[actions.webm](https://github.com/user-attachments/assets/d171aaf5-2b21-4c49-9269-bd58cb3858b7)
 
 # Reasoning behind forking this library
 
@@ -30,16 +34,31 @@ In the `dependencies:` section of your `pubspec.yaml`, add the following line:
   simple_pip_mode: <latest_version>
 ```
 
-# Usage
+# Table of contents
+
+- [Features](#features)
+- [Installation](#installation)
+- [Table of contents](#table-of-contents)
+- [Usage](#usage)
+  - [Update manifest](#update-manifest)
+  - [Verify pip support](#verify-pip-support)
+  - [Entering pip mode](#entering-pip-mode)
+  - [Setting automatic pip mode](#setting-automatic-pip-mode)
+  - [Enabling callbacks](#enabling-callbacks)
+    - [Activity wrapper](#activity-wrapper)
+      - [Kotlin](#kotlin)
+      - [Java](#java)
+    - [Callback helper](#callback-helper)
+      - [Kotlin](#kotlin-1)
+      - [Java](#java-1)
+  - [Using callbacks](#using-callbacks)
+  - [Using the PIP widget](#using-the-pip-widget)
+  - [Using PIP Actions](#using-pip-actions)
+- [Notes](#notes)
+  - [Multi-platform apps](#multi-platform-apps)
+- [Contribute](#contribute)
 
-This section has example code for the following tasks:
-* [Update manifest](#update-manifest)
-* [Verify PIP support](#verify-pip-support)
-* [Entering PIP mode](#entering-pip-mode)
-* [Enabling callbacks](#enabling-callbacks)
-* [Using callbacks](#using-callbacks)
-* [Using the PIP Widget](#using-the-pip-widget)
-* [Using PIP Actions](#using-pip-actions)
+# Usage
 
 ## Update manifest
 
@@ -90,7 +109,7 @@ This way, when user presses home (or uses home gesture), the app enters PIP mode
 
 There's two ways of enabling callbacks:
 * [Activity wrapper](#activity-wrapper) (Recommended!)
-* [Callback helper](#callback-helper)
+* [Callback helper](#callback-helper) (The old, manual way)
 
 ### Activity wrapper 
 
@@ -178,16 +197,18 @@ SimplePip _pip = SimplePip(
 To use the widget, you need to [enable callbacks](#enabling-callbacks) first.
 Import `pip_widget.dart` file. 
 
-Add a `PipWidget` widget to your tree and give it a `builder` or a `child`, and a `pipBuilder` or a `pipChild`.
+Add a `PipWidget` widget to your tree and give it a `child` and a `pipChild`.
+
+> [!Note]
+> `builder` and `pipBuilder` are deprecated. Use a `Builder` as the `child` or `pipChild` instead.
+
 ```dart
 import 'package:simple_pip_mode/pip_widget.dart';
 class MyWidget extends StatelessWidget {
   Widget build(BuildContext context) {
     return PipWidget(
-      builder: (context) => Text('This is built when PIP mode is not active'),
-      child: Text('This widget is not used because builder is not null'),
-      //pipBuilder: (context) => Text('This is built when PIP mode is active'),
-      pipChild: Text('This widget is used because pipBuilder is null'),
+      child: Text('This is built when PIP mode is not active'),
+      pipChild: Text('This is built when PIP mode is active'),
     );
   }
 }
@@ -197,7 +218,7 @@ You can also pass callbacks directly to `PipWidget`.
 ## Using PIP Actions
 
 To use PIP actions, you need to specify a `pipLayout` preset on your `PipWidget`. 
-The current available action layout presets are focused on giving support to media reproduction controls. They are `media`, `media_only_pause` and `media_live`. Those are defined on the `[PipActionsLayout]` enum.
+The current available action layout presets are focused on giving support to media reproduction controls. They are `media`, `media_only_pause`, `media_live` and `mediaWithSeek10`. Those are defined on the `[PipActionsLayout]` enum.
 
 You can also add a `onPipAction` listener to handle actions callbacks from `PipWidget`. This can be defined on `SimplePip(onPipAction: ...)` too.
 ```dart
@@ -213,14 +234,16 @@ class MyWidget extends StatelessWidget {
         switch (action) {
           case PipAction.play:
             // example: videoPlayerController.play();
-            break;
           case PipAction.pause:
             // example: videoPlayerController.pause();
-            break;
           case PipAction.next:
             // example: videoPlayerController.next();
           case PipAction.previous:
             // example: videoPlayerController.previous();
+          case PipAction.rewind:
+            // example: videoPlayerController.seek(-10);
+          case PipAction.forward:
+            // example: videoPlayerController.seek(10);
           default:
             break;
         }
@@ -248,6 +271,10 @@ Calling `SimplePip` methods on a non-Android device will raise a `MissingPluginE
 
 # Contribute
 
-Huge thanks to [Erick Daros](https://github.com/erickdaros) for PIP Actions feature.
+Huge thanks to:
+* [Erick Daros](https://github.com/erickdaros) for PIP Actions feature.
+* [song011794](https://github.com/song011794) for updating the plugin to Android 14.
+* [af-ffr](https://github.com/af-ffr) for updating the plugin to add auto enter parameter.
+* [kmartins](https://github.com/kmartins) for updating the plugin to add more actions.
 
-I'm currently working on more features, so issues and pull requests are appreciated!
+Issues and pull requests are appreciated!

android/build.gradle

@@ -2,14 +2,14 @@ group 'cl.puntito.simple_pip_mode'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.8.0'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:8.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -25,26 +25,29 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 31
+    compileSdk 34
+    namespace = "cl.puntito.simple_pip_mode"
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = JavaVersion.VERSION_17
     }
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 21
     }
 }
 
 dependencies {
+    implementation "androidx.core:core:1.10.1"
+    implementation 'androidx.annotation:annotation:1.7.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

android/src/main/AndroidManifest.xml

@@ -1,3 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="cl.puntito.simple_pip_mode">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 </manifest>

android/src/main/kotlin/cl/puntito/simple_pip_mode/PipCallbackHelper.kt

@@ -7,26 +7,26 @@ import io.flutter.embedding.engine.FlutterEngine
 
 
 open class PipCallbackHelper {
-  private val CHANNEL = "puntito.simple_pip_mode"
-  private lateinit var channel: MethodChannel
+    private val CHANNEL = "puntito.simple_pip_mode"
+    private lateinit var channel: MethodChannel
 
-  fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
-    channel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL)
-  }
+    fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
+        channel = MethodChannel(flutterEngine.dartExecutor.binaryMessenger, CHANNEL)
+    }
 
-  fun setChannel(channel: MethodChannel) {
-    this.channel = channel
-  }
+    fun setChannel(channel: MethodChannel) {
+        this.channel = channel
+    }
 
-  fun onPictureInPictureModeChanged(active: Boolean) {
-    if (active) {
-      channel.invokeMethod("onPipEntered", null)
-    } else {
-      channel.invokeMethod("onPipExited", null)
+    fun onPictureInPictureModeChanged(active: Boolean) {
+        if (active) {
+            channel.invokeMethod("onPipEntered", null)
+        } else {
+            channel.invokeMethod("onPipExited", null)
+        }
     }
-  }
 
-  fun onPipAction(action: PipAction) {
-    channel.invokeMethod("onPipAction", action.name.lowercase())
-  }
+    fun onPipAction(action: PipAction) {
+        channel.invokeMethod("onPipAction", action.name.lowercase())
+    }
 }

android/src/main/kotlin/cl/puntito/simple_pip_mode/PipCallbackHelperActivityWrapper.kt

@@ -7,16 +7,16 @@ import io.flutter.embedding.engine.FlutterEngine
 import cl.puntito.simple_pip_mode.PipCallbackHelper
 
 
-open class PipCallbackHelperActivityWrapper: FlutterActivity() {
-  private var callbackHelper = PipCallbackHelper()
+open class PipCallbackHelperActivityWrapper : FlutterActivity() {
+    private var callbackHelper = PipCallbackHelper()
 
-  override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
-    super.configureFlutterEngine(flutterEngine)
-    callbackHelper.configureFlutterEngine(flutterEngine)
-  }
+    override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
+        super.configureFlutterEngine(flutterEngine)
+        callbackHelper.configureFlutterEngine(flutterEngine)
+    }
 
-  override fun onPictureInPictureModeChanged(active: Boolean, newConfig: Configuration?) {
-    super.onPictureInPictureModeChanged(active, newConfig)
-    callbackHelper.onPictureInPictureModeChanged(active)
-  }
+    override fun onPictureInPictureModeChanged(active: Boolean, newConfig: Configuration?) {
+        super.onPictureInPictureModeChanged(active, newConfig)
+        callbackHelper.onPictureInPictureModeChanged(active)
+    }
 }