Merge branch 'dev'

Author: Faraz

.flutter-plugins-dependencies

@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_inappwebview_ios","path":"/Users/faraz/.pub-cache/hosted/pub.dev/flutter_inappwebview_ios-1.1.2/","native_build":true,"dependencies":[]}],"android":[{"name":"flutter_inappwebview_android","path":"/Users/faraz/.pub-cache/hosted/pub.dev/flutter_inappwebview_android-1.1.3/","native_build":true,"dependencies":[]}],"macos":[{"name":"flutter_inappwebview_macos","path":"/Users/faraz/.pub-cache/hosted/pub.dev/flutter_inappwebview_macos-1.1.2/","native_build":true,"dependencies":[]}],"linux":[],"windows":[{"name":"flutter_inappwebview_windows","path":"/Users/faraz/.pub-cache/hosted/pub.dev/flutter_inappwebview_windows-0.6.0/","native_build":true,"dependencies":[]}],"web":[{"name":"flutter_inappwebview_web","path":"/Users/faraz/.pub-cache/hosted/pub.dev/flutter_inappwebview_web-1.1.2/","dependencies":[]}]},"dependencyGraph":[{"name":"flutter_inappwebview","dependencies":["flutter_inappwebview_android","flutter_inappwebview_ios","flutter_inappwebview_macos","flutter_inappwebview_web","flutter_inappwebview_windows"]},{"name":"flutter_inappwebview_android","dependencies":[]},{"name":"flutter_inappwebview_ios","dependencies":[]},{"name":"flutter_inappwebview_macos","dependencies":[]},{"name":"flutter_inappwebview_web","dependencies":[]},{"name":"flutter_inappwebview_windows","dependencies":[]}],"date_created":"2025-01-08 19:22:57.405422","version":"3.27.1","swift_package_manager_enabled":false}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_inappwebview_ios","path":"/Users/faraz/.pub-cache/hosted/pub.dev/flutter_inappwebview_ios-1.1.2/","native_build":true,"dependencies":[]}],"android":[{"name":"flutter_inappwebview_android","path":"/Users/faraz/.pub-cache/hosted/pub.dev/flutter_inappwebview_android-1.1.3/","native_build":true,"dependencies":[]}],"macos":[{"name":"flutter_inappwebview_macos","path":"/Users/faraz/.pub-cache/hosted/pub.dev/flutter_inappwebview_macos-1.1.2/","native_build":true,"dependencies":[]}],"linux":[],"windows":[{"name":"flutter_inappwebview_windows","path":"/Users/faraz/.pub-cache/hosted/pub.dev/flutter_inappwebview_windows-0.6.0/","native_build":true,"dependencies":[]}],"web":[{"name":"flutter_inappwebview_web","path":"/Users/faraz/.pub-cache/hosted/pub.dev/flutter_inappwebview_web-1.1.2/","dependencies":[]}]},"dependencyGraph":[{"name":"flutter_inappwebview","dependencies":["flutter_inappwebview_android","flutter_inappwebview_ios","flutter_inappwebview_macos","flutter_inappwebview_web","flutter_inappwebview_windows"]},{"name":"flutter_inappwebview_android","dependencies":[]},{"name":"flutter_inappwebview_ios","dependencies":[]},{"name":"flutter_inappwebview_macos","dependencies":[]},{"name":"flutter_inappwebview_web","dependencies":[]},{"name":"flutter_inappwebview_windows","dependencies":[]}],"date_created":"2025-03-10 21:29:04.223404","version":"3.27.1","swift_package_manager_enabled":false}

CHANGELOG.md

@@ -1,3 +1,14 @@
+## v2.2.0
+
+### Features
+* macOS support (Beta)
+* Play animation with loop count
+
+### Fixes
+* Fix minimum version of Flutter SDK
+
+
+
 ## v2.1.0
 
 ### Features

README.md

@@ -12,7 +12,8 @@ Notably, when testing **other available packages**, users may experience **gestu
 
 ## Features
 
-- Mobile and Web stable version (support **glb**, **gltf** and **obj** format)
+- Mobile and Web **stable** version (fully support **glb**, **gltf** and **obj** format)
+- macOS **beta** version 🆕
 - Load 3D model from assets
 - Load 3D model from URL
 - Change 3D models by setState
@@ -22,6 +23,7 @@ Notably, when testing **other available packages**, users may experience **gestu
 - Load **obj** 3D models with textures and **mtl** files
 - Scale and camera properties for obj 3D models
 - Play animation
+- Play animation with loop count 🆕
 - Switch between animations
 - Pause animation
 - Reset animation
@@ -38,21 +40,26 @@ Notably, when testing **other available packages**, users may experience **gestu
 
 <!--
 ## Todo (Next Versions)
-- Change model source with setState
 - Support fbx format
 -->
 
-## Samples
+## Compatibility
+
+- Android
+- iOS
+- Web
+- macOS (Beta)
+- Windows (Coming Soon)
+
+## Mobile & Web Samples
 
 <img src="https://raw.githubusercontent.com/m-r-davari/content-holder/refs/heads/master/flutter_3d_controller/scrs_gifs_v2/male_scr.gif" alt="Model1" width="19%"/> <img src="https://raw.githubusercontent.com/m-r-davari/content-holder/refs/heads/master/flutter_3d_controller/scrs_gifs_v2/lambo_scr.gif" alt="Model2" width="19%"/> <img src="https://raw.githubusercontent.com/m-r-davari/content-holder/refs/heads/master/flutter_3d_controller/scrs_gifs_v2/dog_scr.gif" alt="Model3" width="19%"/> <img src="https://raw.githubusercontent.com/m-r-davari/content-holder/refs/heads/master/flutter_3d_controller/scrs_gifs_v2/chair_scr.gif" alt="Model3" width="19%"/> <img src="https://raw.githubusercontent.com/m-r-davari/content-holder/refs/heads/master/flutter_3d_controller/scrs_gifs_v2/dash_scr.gif" alt="Model3" width="19%"/>
 <img src="https://raw.githubusercontent.com/m-r-davari/content-holder/refs/heads/master/flutter_3d_controller/scrs_gifs_v2/female_scr.gif" alt="Model1" width="19%"/> <img src="https://raw.githubusercontent.com/m-r-davari/content-holder/refs/heads/master/flutter_3d_controller/scrs_gifs_v2/bird_scr.gif" alt="Model2" width="19%"/> <img src="https://raw.githubusercontent.com/m-r-davari/content-holder/refs/heads/master/flutter_3d_controller/scrs_gifs_v2/male2_scr.gif" alt="Model3" width="19%"/> <img src="https://raw.githubusercontent.com/m-r-davari/content-holder/refs/heads/master/flutter_3d_controller/scrs_gifs_v2/donut_scr.gif" alt="Model3" width="19%"/> <img src="https://raw.githubusercontent.com/m-r-davari/content-holder/refs/heads/master/flutter_3d_controller/scrs_gifs_v2/multi_scr.gif" alt="Model3" width="19%"/>
 
+## Desktop(macOS) Samples
 
-## Compatibility
+<img src="https://raw.githubusercontent.com/m-r-davari/content-holder/refs/heads/master/flutter_3d_controller/macos_model_sc.png" alt="macOS_Model1" width="48.25%"/> <img src="https://raw.githubusercontent.com/m-r-davari/content-holder/refs/heads/master/flutter_3d_controller/macos_model_sc2.png" alt="macOS_Model2" width="48.25%"/> 
 
-- Android
-- iOS
-- Web
 
 ## Notes
 
@@ -78,6 +85,13 @@ controller.playAnimation();
 //If you pass null and your model has at least 1 animation it will play first animation.
 controller.playAnimation(animationName: chosenAnimation);
 
+//If you pass loopCount > 0, the animation will repeat for the specified number of times.
+//To play the animation only once, set loopCount to 1.
+controller.playAnimation(loopCount: 1);
+
+//The loopCount argument can also be used with a specific animation.
+controller.playAnimation(loopCount: 2, animationName: chosenAnimation);
+
 //It will pause the animation at current frame.
 controller.pauseAnimation();
 
@@ -177,7 +191,7 @@ Flutter3DViewer.obj(
 
 ```yaml
 dependencies:
-  flutter_3d_controller: ^2.1.0
+  flutter_3d_controller: ^2.2.0
 ```
 
 ### `AndroidManifest.xml` (Android only)
@@ -230,27 +244,39 @@ Modify the `<head>` tag of your `web/index.html` to load the JavaScript, like so
 </head>
 ```
 
+### `Outgoing Connections(Client)` (macOS only)
 
-## Frequently Asked Questions
-- **The 3D model could not load** : First check the example, if models in examples loads, may be there is problem with your model or your model path.
-- **The animation list could not be retrieved** : Check if there are any special characters in the animation names that might cause a JSON encoding error.
-- **The 3D model could not load from url** : It might be due to [CORS] security restrictions. The server hosting the model file *must* send appropriate CORS response headers for viewer to be able to load the file. See [google/model-viewer#1015](https://github.com/google/model-viewer/issues/1015)
+For loading 3D models in *macOS* you need to configure the macOS App Sandbox by *enabling* the `Outgoing Connections (Client)` option in your `MacOS` XCode Project, under `Runner > Signing & Capabilities`.
 
-## Not working with a url on a real iOS device?
+<img src="https://raw.githubusercontent.com/m-r-davari/content-holder/refs/heads/master/flutter_3d_controller/macos_runner_config_sc.png" alt="macOS_runner_sc" width="60%"/>
 
-**Problem Description** : If you're having trouble loading 3D models from a URL on a real iOS device, **Lockdown Mode** might be the cause. Lockdown Mode is a security feature in iOS that restricts certain functionalities like network requests or loading embedded content to protect user data.
+### `AppDelegate.html` (macOS only)
 
-### How to Disable Lockdown Mode
-Follow these steps to disable Lockdown Mode on your device:
+Add the following codes to your macOS `AppDelegate` file to support transparent background for *flutter_3d_controller*
 
-1. Open the **Settings** app on your iPhone.
-2. Scroll down and select **Privacy and Security**.
-3. Tap on **Lockdown Mode**.
-4. Select **Turn Off Lockdown Mode**. You may need to enter your password to confirm.
-5. After disabling Lockdown Mode, return to the app and try loading the 3D model again.
+```swift
+import flutter_inappwebview_macos
 
----
+extension InAppWebView {
+    @objc public override func viewDidMoveToWindow() {
+        super.viewDidMoveToWindow()
+        
+        if window != nil {
+            print("InAppWebView moved to window, enforcing transparency")
+            self.setValue(false, forKey: "opaque")
+            self.setValue(false, forKey: "drawsBackground")
+            self.layer?.backgroundColor = NSColor.clear.cgColor
+        }
+    }
+}
+```
+
+## Frequently Asked Questions
+- **Desktop(macOS) rare issues** : You may experience unexpected issues in desktop(macOS) beta version.
+- **The 3D model could not load** : First check the example, if models in examples loads, may be there is problem with your model or your model path.
+- **The animation list could not be retrieved** : Check if there are any special characters in the animation names that might cause a JSON encoding error.
+- **The 3D model could not load from url** : It might be due to [CORS] security restrictions. The server hosting the model file *must* send appropriate CORS response headers for viewer to be able to load the file. See [google/model-viewer#1015](https://github.com/google/model-viewer/issues/1015)
 
-## More Info
 
+## More Info
 This package uses Google's [model-viewer](https://modelviewer.dev) to render 3D models and it may have some issue in rendering some models/textures, the core of package (Model Viewer) will change in future to support all type of 3D models.

example/android/app/build.gradle

@@ -1,72 +1,44 @@
-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'
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id "dev.flutter.flutter-gradle-plugin"
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
-    namespace "com.mrdavari.example"
-    compileSdkVersion flutter.compileSdkVersion
-    ndkVersion flutter.ndkVersion
+    namespace = "com.mrdavari.example"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+        jvmTarget = JavaVersion.VERSION_1_8
     }
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.mrdavari.example"
+        applicationId = "com.mrdavari.example"
         // You can update the following values to match your application needs.
-        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion 21//flutter.minSdkVersion
-        targetSdkVersion flutter.targetSdkVersion
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+        // For more information, see: https://flutter.dev/to/review-gradle-config.
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
     }
 
     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
+            signingConfig = signingConfigs.debug
         }
     }
 }
 
 flutter {
-    source '../..'
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    source = "../.."
 }

example/android/build.gradle

@@ -1,29 +1,16 @@
-buildscript {
-    ext.kotlin_version = '1.7.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
         mavenCentral()
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.buildDir = "../build"
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
 subprojects {
-    project.evaluationDependsOn(':app')
+    project.evaluationDependsOn(":app")
 }
 
 tasks.register("clean", Delete) {

example/android/gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip

example/android/settings.gradle

@@ -1,11 +1,25 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "8.1.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+}
+
+include ":app"

example/lib/main.dart

@@ -96,7 +96,11 @@ class _MyHomePageState extends State<MyHomePage> {
                   'Animations : $availableAnimations --- Length : ${availableAnimations.length}');
               chosenAnimation = await showPickerDialog(
                   'Animations', availableAnimations, chosenAnimation);
-              controller.playAnimation(animationName: chosenAnimation);
+              //Play animation with loop count
+              controller.playAnimation(
+                animationName: chosenAnimation,
+                loopCount: 2,
+              );
             },
             icon: const Icon(Icons.format_list_bulleted_outlined),
           ),

example/macos/Podfile.lock

@@ -0,0 +1,29 @@
+PODS:
+  - flutter_inappwebview_macos (0.0.1):
+    - FlutterMacOS
+    - OrderedSet (~> 6.0.3)
+  - FlutterMacOS (1.0.0)
+  - OrderedSet (6.0.3)
+
+DEPENDENCIES:
+  - flutter_inappwebview_macos (from `Flutter/ephemeral/.symlinks/plugins/flutter_inappwebview_macos/macos`)
+  - FlutterMacOS (from `Flutter/ephemeral`)
+
+SPEC REPOS:
+  trunk:
+    - OrderedSet
+
+EXTERNAL SOURCES:
+  flutter_inappwebview_macos:
+    :path: Flutter/ephemeral/.symlinks/plugins/flutter_inappwebview_macos/macos
+  FlutterMacOS:
+    :path: Flutter/ephemeral
+
+SPEC CHECKSUMS:
+  flutter_inappwebview_macos: bdf207b8f4ebd58e86ae06cd96b147de99a67c9b
+  FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
+  OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
+
+PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367
+
+COCOAPODS: 1.15.2