From 42f1b21bb568b1072d72b758329a6052ca1d5f2b Mon Sep 17 00:00:00 2001 From: Aravind Chowdary Date: Mon, 12 Jun 2023 08:49:12 +0530 Subject: [PATCH 01/14] updated transcoder for android --- .../com/{example => aravi}/video_compress/ThumbnailUtility.kt | 0 .../main/kotlin/com/{example => aravi}/video_compress/Utility.kt | 0 .../com/{example => aravi}/video_compress/VideoCompressPlugin.kt | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename android/src/main/kotlin/com/{example => aravi}/video_compress/ThumbnailUtility.kt (100%) rename android/src/main/kotlin/com/{example => aravi}/video_compress/Utility.kt (100%) rename android/src/main/kotlin/com/{example => aravi}/video_compress/VideoCompressPlugin.kt (100%) diff --git a/android/src/main/kotlin/com/example/video_compress/ThumbnailUtility.kt b/android/src/main/kotlin/com/aravi/video_compress/ThumbnailUtility.kt similarity index 100% rename from android/src/main/kotlin/com/example/video_compress/ThumbnailUtility.kt rename to android/src/main/kotlin/com/aravi/video_compress/ThumbnailUtility.kt diff --git a/android/src/main/kotlin/com/example/video_compress/Utility.kt b/android/src/main/kotlin/com/aravi/video_compress/Utility.kt similarity index 100% rename from android/src/main/kotlin/com/example/video_compress/Utility.kt rename to android/src/main/kotlin/com/aravi/video_compress/Utility.kt diff --git a/android/src/main/kotlin/com/example/video_compress/VideoCompressPlugin.kt b/android/src/main/kotlin/com/aravi/video_compress/VideoCompressPlugin.kt similarity index 100% rename from android/src/main/kotlin/com/example/video_compress/VideoCompressPlugin.kt rename to android/src/main/kotlin/com/aravi/video_compress/VideoCompressPlugin.kt From 252bc9a7e6b632a8160e42bd4b0e22ab3145849f Mon Sep 17 00:00:00 2001 From: Aravind Chowdary Date: Mon, 12 Jun 2023 08:49:26 +0530 Subject: [PATCH 02/14] removed jcenter dependence --- android/build.gradle | 13 +++++++------ android/src/main/AndroidManifest.xml | 2 +- .../com/aravi/video_compress/ThumbnailUtility.kt | 4 ++-- .../main/kotlin/com/aravi/video_compress/Utility.kt | 4 ++-- .../com/aravi/video_compress/VideoCompressPlugin.kt | 4 ++-- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index ae95c4ff..046a6ad2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,8 +1,8 @@ -group 'com.example.video_compress' -version '1.0-SNAPSHOT' +group 'com.aravi.video_compress' +version '1.0' buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.8.10' repositories { google() mavenCentral() @@ -18,6 +18,7 @@ rootProject.allprojects { repositories { google() mavenCentral() +// jcenter() } } @@ -25,13 +26,13 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 31 + compileSdkVersion 33 sourceSets { main.java.srcDirs += 'src/main/kotlin' } defaultConfig { - minSdkVersion 18 + minSdkVersion 21 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { @@ -41,5 +42,5 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'com.otaliastudios:transcoder:0.9.1' + implementation 'com.otaliastudios:transcoder:0.10.5' } diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 55d34d07..df4fbb7c 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ + package="com.aravi.video_compress"> diff --git a/android/src/main/kotlin/com/aravi/video_compress/ThumbnailUtility.kt b/android/src/main/kotlin/com/aravi/video_compress/ThumbnailUtility.kt index e63aec80..c8db34b0 100644 --- a/android/src/main/kotlin/com/aravi/video_compress/ThumbnailUtility.kt +++ b/android/src/main/kotlin/com/aravi/video_compress/ThumbnailUtility.kt @@ -1,4 +1,4 @@ -package com.example.video_compress +package com.aravi.video_compress import android.content.Context import android.graphics.Bitmap @@ -47,4 +47,4 @@ class ThumbnailUtility(channelName: String) { result.success(file.absolutePath) } -} \ No newline at end of file +} diff --git a/android/src/main/kotlin/com/aravi/video_compress/Utility.kt b/android/src/main/kotlin/com/aravi/video_compress/Utility.kt index f5647097..83001ceb 100644 --- a/android/src/main/kotlin/com/aravi/video_compress/Utility.kt +++ b/android/src/main/kotlin/com/aravi/video_compress/Utility.kt @@ -1,4 +1,4 @@ -package com.example.video_compress +package com.aravi.video_compress import android.content.Context import android.graphics.Bitmap @@ -131,4 +131,4 @@ class Utility(private val channelName: String) { val dir = context.getExternalFilesDir("video_compress") result.success(dir?.deleteRecursively()) } -} \ No newline at end of file +} diff --git a/android/src/main/kotlin/com/aravi/video_compress/VideoCompressPlugin.kt b/android/src/main/kotlin/com/aravi/video_compress/VideoCompressPlugin.kt index 2861da1d..a9c724ef 100644 --- a/android/src/main/kotlin/com/aravi/video_compress/VideoCompressPlugin.kt +++ b/android/src/main/kotlin/com/aravi/video_compress/VideoCompressPlugin.kt @@ -1,4 +1,4 @@ -package com.example.video_compress +package com.aravi.video_compress import android.content.Context import android.net.Uri @@ -13,7 +13,7 @@ import com.otaliastudios.transcoder.strategy.RemoveTrackStrategy import com.otaliastudios.transcoder.strategy.TrackStrategy import io.flutter.embedding.engine.plugins.FlutterPlugin import io.flutter.plugin.common.BinaryMessenger -import com.otaliastudios.transcoder.internal.Logger +import com.otaliastudios.transcoder.internal.utils.Logger import io.flutter.plugin.common.MethodCall import io.flutter.plugin.common.MethodChannel import io.flutter.plugin.common.MethodChannel.MethodCallHandler From 4a5f9c1e95a0216281033e5aa585ec16aae006d2 Mon Sep 17 00:00:00 2001 From: Aravind Chowdary Date: Mon, 12 Jun 2023 08:58:25 +0530 Subject: [PATCH 03/14] export ready --- README.md | 2 +- example/android/app/build.gradle | 4 +- example/android/build.gradle | 2 +- example/lib/main.dart | 4 +- example/lib/video_thumbnail.dart | 2 +- .../Flutter/GeneratedPluginRegistrant.swift | 2 +- example/pubspec.yaml | 2 +- lib/src/video_compress/video_compressor.dart | 5 +- ...compress.dart => video_compress_plus.dart} | 0 pubspec.yaml | 48 +++---------------- 10 files changed, 17 insertions(+), 54 deletions(-) rename lib/{video_compress.dart => video_compress_plus.dart} (100%) diff --git a/README.md b/README.md index 1c4681da..555ca31b 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Add this to your package's `pubspec.yaml` file: ```yaml dependencies: - video_compress: ^3.1.0 + video_compress_plus: ^1.0.0 ``` ### 2. Install it diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 3629ef02..42329ab9 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -39,8 +39,8 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.example.video_compress_example" - minSdkVersion 18 - targetSdkVersion 31 + minSdkVersion 21 + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/example/android/build.gradle b/example/android/build.gradle index c10ca09f..1c4cdaa2 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -26,6 +26,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/example/lib/main.dart b/example/lib/main.dart index d2beae6b..5fa67407 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:image_picker/image_picker.dart'; -import 'package:video_compress/video_compress.dart'; +import 'package:video_compress_plus/video_compress_plus.dart'; import 'package:file_selector/file_selector.dart'; import 'dart:io'; import 'package:video_compress_example/video_thumbnail.dart'; @@ -75,7 +75,7 @@ class _MyHomePageState extends State { ), Text( '$_counter', - style: Theme.of(context).textTheme.headline4, + style: Theme.of(context).textTheme.titleMedium, ), InkWell( child: Icon( diff --git a/example/lib/video_thumbnail.dart b/example/lib/video_thumbnail.dart index 3a15b377..90ce48f5 100644 --- a/example/lib/video_thumbnail.dart +++ b/example/lib/video_thumbnail.dart @@ -2,7 +2,7 @@ import 'dart:io'; import 'package:file_selector/file_selector.dart'; import 'package:flutter/material.dart'; import 'package:image_picker/image_picker.dart'; -import 'package:video_compress/video_compress.dart'; +import 'package:video_compress_plus/video_compress_plus.dart'; class VideoThumbnail extends StatefulWidget { @override diff --git a/example/macos/Flutter/GeneratedPluginRegistrant.swift b/example/macos/Flutter/GeneratedPluginRegistrant.swift index 875bdd33..c61fc19c 100644 --- a/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -6,7 +6,7 @@ import FlutterMacOS import Foundation import file_selector_macos -import video_compress +import video_compress_plus func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin")) diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 453ecec7..c68e6e3f 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -20,7 +20,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - video_compress: + video_compress_plus: path: ../ # For information on the generic Dart part of this file, see the diff --git a/lib/src/video_compress/video_compressor.dart b/lib/src/video_compress/video_compressor.dart index 3b7b38e3..0382cd47 100644 --- a/lib/src/video_compress/video_compressor.dart +++ b/lib/src/video_compress/video_compressor.dart @@ -1,12 +1,11 @@ import 'dart:async'; import 'dart:convert'; import 'dart:io'; -import 'dart:typed_data'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:video_compress/src/progress_callback/compress_mixin.dart'; -import 'package:video_compress/video_compress.dart'; +import 'package:video_compress_plus/src/progress_callback/compress_mixin.dart'; +import 'package:video_compress_plus/video_compress_plus.dart'; abstract class IVideoCompress extends CompressMixin {} diff --git a/lib/video_compress.dart b/lib/video_compress_plus.dart similarity index 100% rename from lib/video_compress.dart rename to lib/video_compress_plus.dart diff --git a/pubspec.yaml b/pubspec.yaml index c7a901bb..dd331fc7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,61 +1,25 @@ -name: video_compress +name: video_compress_plus description: Light library of video manipulation of Flutter. Compress video, remove audio, get video thumbnail from dart code. -version: 3.1.2 -homepage: https://github.com/jonataslaw/VideoCompress +version: 1.0.0 +homepage: https://github.com/kamaravichow/VideoCompressPlus environment: - sdk: '>=2.16.2 <3.0.0' + sdk: '>=2.16.2 <4.0.0' flutter: ">=2.0.0" dependencies: flutter: sdk: flutter -# dev_dependencies: -# flutter_test: -# sdk: flutter - -# For information on the generic Dart part of this file, see the -# following page: https://www.dartlang.org/tools/pub/pubspec - flutter: plugin: platforms: android: - package: com.example.video_compress + package: com.aravi.video_compress pluginClass: VideoCompressPlugin ios: pluginClass: VideoCompressPlugin macos: pluginClass: VideoCompressPlugin - # 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.dev/assets-and-images/#from-packages - # - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.dev/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.dev/custom-fonts/#from-packages + \ No newline at end of file From fc8d0f35e37c44a17cdb7d1b2378dbb1c78974b7 Mon Sep 17 00:00:00 2001 From: Aravind Chowdary Date: Mon, 12 Jun 2023 08:59:18 +0530 Subject: [PATCH 04/14] doc update --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 555ca31b..07da35ff 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ $ pub get Now in your `Dart` code, you can use: ````dart -import 'package:video_compress/video_compress.dart'; +import 'package:video_compress_plus/video_compress_plus.dart'; ```` # How to use @@ -55,7 +55,7 @@ import 'package:video_compress/video_compress.dart'; ### Imports ````dart -import 'package:video_compress/video_compress.dart'; +import 'package:video_compress_plus/video_compress_plus.dart'; ```` From d9cb9b6f9000dde33b6bcf75c6ff2518c2929bcf Mon Sep 17 00:00:00 2001 From: MattyBoy Date: Thu, 22 Jun 2023 12:33:50 -0500 Subject: [PATCH 05/14] Fixed: iOS podspec incorrect --- ios/{video_compress.podspec => video_compress_plus.podspec} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename ios/{video_compress.podspec => video_compress_plus.podspec} (83%) diff --git a/ios/video_compress.podspec b/ios/video_compress_plus.podspec similarity index 83% rename from ios/video_compress.podspec rename to ios/video_compress_plus.podspec index dc34372b..e651abd2 100644 --- a/ios/video_compress.podspec +++ b/ios/video_compress_plus.podspec @@ -2,14 +2,14 @@ # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html # Pod::Spec.new do |s| - s.name = 'video_compress' + s.name = 'video_compress_plus' s.version = '0.3.0' s.swift_version = '5.0' s.summary = 'A new flutter plugin project.' s.description = <<-DESC A new flutter plugin project. DESC - s.homepage = 'https://github.com/jonataslaw/video_compress' + s.homepage = 'https://github.com/kamaravichow/VideoCompressPlus' s.license = { :file => '../LICENSE' } s.author = { 'Jonny Borges' => 'jonataborges01@gmail.com' } s.source = { :path => '.' } From 9bab0ca6ae95e4b80e8b0dd2d78398ef918bf768 Mon Sep 17 00:00:00 2001 From: MattyBoy Date: Thu, 22 Jun 2023 12:43:16 -0500 Subject: [PATCH 06/14] Fixed: iOS podspec incorrect --- ios/{video_compress.podspec => video_compress_plus.podspec} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename ios/{video_compress.podspec => video_compress_plus.podspec} (83%) diff --git a/ios/video_compress.podspec b/ios/video_compress_plus.podspec similarity index 83% rename from ios/video_compress.podspec rename to ios/video_compress_plus.podspec index dc34372b..e651abd2 100644 --- a/ios/video_compress.podspec +++ b/ios/video_compress_plus.podspec @@ -2,14 +2,14 @@ # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html # Pod::Spec.new do |s| - s.name = 'video_compress' + s.name = 'video_compress_plus' s.version = '0.3.0' s.swift_version = '5.0' s.summary = 'A new flutter plugin project.' s.description = <<-DESC A new flutter plugin project. DESC - s.homepage = 'https://github.com/jonataslaw/video_compress' + s.homepage = 'https://github.com/kamaravichow/VideoCompressPlus' s.license = { :file => '../LICENSE' } s.author = { 'Jonny Borges' => 'jonataborges01@gmail.com' } s.source = { :path => '.' } From 31049004d08a3706b55b96fb62a4990eb5e4fbf5 Mon Sep 17 00:00:00 2001 From: Gabriel Araujo Date: Thu, 22 Jun 2023 16:49:18 -0300 Subject: [PATCH 07/14] Update VideoCompressPlugin.m --- ios/Classes/VideoCompressPlugin.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Classes/VideoCompressPlugin.m b/ios/Classes/VideoCompressPlugin.m index 10ef50d0..8bddffbb 100644 --- a/ios/Classes/VideoCompressPlugin.m +++ b/ios/Classes/VideoCompressPlugin.m @@ -1,5 +1,5 @@ #import "VideoCompressPlugin.h" -#import +#import @implementation VideoCompressPlugin + (void)registerWithRegistrar:(NSObject*)registrar { From 4d7fd1149d0afca5e31b0f088e414851f6667800 Mon Sep 17 00:00:00 2001 From: Gabriel Araujo Date: Thu, 22 Jun 2023 16:57:17 -0300 Subject: [PATCH 08/14] removed all plus references --- README.md | 6 +++--- example/lib/main.dart | 2 +- example/lib/video_thumbnail.dart | 2 +- example/macos/Flutter/GeneratedPluginRegistrant.swift | 2 +- example/pubspec.yaml | 2 +- ios/Classes/VideoCompressPlugin.m | 2 +- ios/video_compress_plus.podspec | 2 +- lib/src/video_compress/video_compressor.dart | 4 ++-- lib/{video_compress_plus.dart => video_compress.dart} | 0 pubspec.yaml | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) rename lib/{video_compress_plus.dart => video_compress.dart} (100%) diff --git a/README.md b/README.md index 07da35ff..f558f151 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Add this to your package's `pubspec.yaml` file: ```yaml dependencies: - video_compress_plus: ^1.0.0 + video_compress: ^1.0.0 ``` ### 2. Install it @@ -47,7 +47,7 @@ $ pub get Now in your `Dart` code, you can use: ````dart -import 'package:video_compress_plus/video_compress_plus.dart'; +import 'package:video_compress/video_compress.dart'; ```` # How to use @@ -55,7 +55,7 @@ import 'package:video_compress_plus/video_compress_plus.dart'; ### Imports ````dart -import 'package:video_compress_plus/video_compress_plus.dart'; +import 'package:video_compress/video_compress.dart'; ```` diff --git a/example/lib/main.dart b/example/lib/main.dart index 5fa67407..d4e449f0 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:image_picker/image_picker.dart'; -import 'package:video_compress_plus/video_compress_plus.dart'; +import 'package:video_compress/video_compress.dart'; import 'package:file_selector/file_selector.dart'; import 'dart:io'; import 'package:video_compress_example/video_thumbnail.dart'; diff --git a/example/lib/video_thumbnail.dart b/example/lib/video_thumbnail.dart index 90ce48f5..3a15b377 100644 --- a/example/lib/video_thumbnail.dart +++ b/example/lib/video_thumbnail.dart @@ -2,7 +2,7 @@ import 'dart:io'; import 'package:file_selector/file_selector.dart'; import 'package:flutter/material.dart'; import 'package:image_picker/image_picker.dart'; -import 'package:video_compress_plus/video_compress_plus.dart'; +import 'package:video_compress/video_compress.dart'; class VideoThumbnail extends StatefulWidget { @override diff --git a/example/macos/Flutter/GeneratedPluginRegistrant.swift b/example/macos/Flutter/GeneratedPluginRegistrant.swift index c61fc19c..875bdd33 100644 --- a/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -6,7 +6,7 @@ import FlutterMacOS import Foundation import file_selector_macos -import video_compress_plus +import video_compress func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin")) diff --git a/example/pubspec.yaml b/example/pubspec.yaml index c68e6e3f..453ecec7 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -20,7 +20,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - video_compress_plus: + video_compress: path: ../ # For information on the generic Dart part of this file, see the diff --git a/ios/Classes/VideoCompressPlugin.m b/ios/Classes/VideoCompressPlugin.m index 8bddffbb..10ef50d0 100644 --- a/ios/Classes/VideoCompressPlugin.m +++ b/ios/Classes/VideoCompressPlugin.m @@ -1,5 +1,5 @@ #import "VideoCompressPlugin.h" -#import +#import @implementation VideoCompressPlugin + (void)registerWithRegistrar:(NSObject*)registrar { diff --git a/ios/video_compress_plus.podspec b/ios/video_compress_plus.podspec index e651abd2..677f51b7 100644 --- a/ios/video_compress_plus.podspec +++ b/ios/video_compress_plus.podspec @@ -2,7 +2,7 @@ # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html # Pod::Spec.new do |s| - s.name = 'video_compress_plus' + s.name = 'video_compress' s.version = '0.3.0' s.swift_version = '5.0' s.summary = 'A new flutter plugin project.' diff --git a/lib/src/video_compress/video_compressor.dart b/lib/src/video_compress/video_compressor.dart index 0382cd47..de2ef4c1 100644 --- a/lib/src/video_compress/video_compressor.dart +++ b/lib/src/video_compress/video_compressor.dart @@ -4,8 +4,8 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:video_compress_plus/src/progress_callback/compress_mixin.dart'; -import 'package:video_compress_plus/video_compress_plus.dart'; +import 'package:video_compress/src/progress_callback/compress_mixin.dart'; +import 'package:video_compress/video_compress.dart'; abstract class IVideoCompress extends CompressMixin {} diff --git a/lib/video_compress_plus.dart b/lib/video_compress.dart similarity index 100% rename from lib/video_compress_plus.dart rename to lib/video_compress.dart diff --git a/pubspec.yaml b/pubspec.yaml index dd331fc7..d46c46de 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,4 +1,4 @@ -name: video_compress_plus +name: video_compress description: Light library of video manipulation of Flutter. Compress video, remove audio, get video thumbnail from dart code. version: 1.0.0 homepage: https://github.com/kamaravichow/VideoCompressPlus From b6d5f2e0d501585b6daf54f7f38259e91cac1e90 Mon Sep 17 00:00:00 2001 From: Gabriel Araujo Date: Thu, 22 Jun 2023 17:01:03 -0300 Subject: [PATCH 09/14] removed last plus reference --- ios/{video_compress_plus.podspec => video_compress.podspec} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ios/{video_compress_plus.podspec => video_compress.podspec} (100%) diff --git a/ios/video_compress_plus.podspec b/ios/video_compress.podspec similarity index 100% rename from ios/video_compress_plus.podspec rename to ios/video_compress.podspec From 170baa60868e9966dc5ce28fb30b893af638315d Mon Sep 17 00:00:00 2001 From: Gabriel Araujo Date: Thu, 22 Jun 2023 17:05:42 -0300 Subject: [PATCH 10/14] last changes --- ios/video_compress.podspec | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/video_compress.podspec b/ios/video_compress.podspec index 677f51b7..c78d418a 100644 --- a/ios/video_compress.podspec +++ b/ios/video_compress.podspec @@ -9,7 +9,7 @@ Pod::Spec.new do |s| s.description = <<-DESC A new flutter plugin project. DESC - s.homepage = 'https://github.com/kamaravichow/VideoCompressPlus' + s.homepage = 'https://github.com/SpectoraSoftware/VideoCompress' s.license = { :file => '../LICENSE' } s.author = { 'Jonny Borges' => 'jonataborges01@gmail.com' } s.source = { :path => '.' } diff --git a/pubspec.yaml b/pubspec.yaml index d46c46de..17e0faf0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: video_compress description: Light library of video manipulation of Flutter. Compress video, remove audio, get video thumbnail from dart code. version: 1.0.0 -homepage: https://github.com/kamaravichow/VideoCompressPlus +homepage: https://github.com/SpectoraSoftware/VideoCompress environment: sdk: '>=2.16.2 <4.0.0' From 2aa6308122b57784cdde6be71ed8013468162acb Mon Sep 17 00:00:00 2001 From: Gabriel Araujo Date: Thu, 22 Jun 2023 17:50:00 -0300 Subject: [PATCH 11/14] Minor package changes --- android/build.gradle | 2 +- android/src/main/AndroidManifest.xml | 2 +- .../main/kotlin/com/aravi/video_compress/ThumbnailUtility.kt | 2 +- android/src/main/kotlin/com/aravi/video_compress/Utility.kt | 2 +- .../kotlin/com/aravi/video_compress/VideoCompressPlugin.kt | 2 +- macos/video_compress.podspec | 4 ++-- pubspec.yaml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 046a6ad2..2fde10d3 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,4 +1,4 @@ -group 'com.aravi.video_compress' +group 'com.spectora.video_compress' version '1.0' buildscript { diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index df4fbb7c..4f14169c 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ + package="com.spectora.video_compress"> diff --git a/android/src/main/kotlin/com/aravi/video_compress/ThumbnailUtility.kt b/android/src/main/kotlin/com/aravi/video_compress/ThumbnailUtility.kt index c8db34b0..fd086ebd 100644 --- a/android/src/main/kotlin/com/aravi/video_compress/ThumbnailUtility.kt +++ b/android/src/main/kotlin/com/aravi/video_compress/ThumbnailUtility.kt @@ -1,4 +1,4 @@ -package com.aravi.video_compress +package com.spectora.video_compress import android.content.Context import android.graphics.Bitmap diff --git a/android/src/main/kotlin/com/aravi/video_compress/Utility.kt b/android/src/main/kotlin/com/aravi/video_compress/Utility.kt index 83001ceb..04f59a0e 100644 --- a/android/src/main/kotlin/com/aravi/video_compress/Utility.kt +++ b/android/src/main/kotlin/com/aravi/video_compress/Utility.kt @@ -1,4 +1,4 @@ -package com.aravi.video_compress +package com.spectora.video_compress import android.content.Context import android.graphics.Bitmap diff --git a/android/src/main/kotlin/com/aravi/video_compress/VideoCompressPlugin.kt b/android/src/main/kotlin/com/aravi/video_compress/VideoCompressPlugin.kt index a9c724ef..dc3ddd67 100644 --- a/android/src/main/kotlin/com/aravi/video_compress/VideoCompressPlugin.kt +++ b/android/src/main/kotlin/com/aravi/video_compress/VideoCompressPlugin.kt @@ -1,4 +1,4 @@ -package com.aravi.video_compress +package com.spectora.video_compress import android.content.Context import android.net.Uri diff --git a/macos/video_compress.podspec b/macos/video_compress.podspec index 788046c2..a68cb04c 100644 --- a/macos/video_compress.podspec +++ b/macos/video_compress.podspec @@ -9,9 +9,9 @@ Pod::Spec.new do |s| s.description = <<-DESC A new flutter plugin project. DESC - s.homepage = 'https://github.com/jonataslaw/video_compress' + s.homepage = 'https://github.com/SpectoraSoftware/VideoCompress' s.license = { :file => '../LICENSE' } - s.author = { 'Jonny Borges' => 'jonataborges01@gmail.com' } + s.author = { 'Gabriel Araujo' => 'gabriel@spectora.com' } s.source = { :path => '.' } s.source_files = 'Classes/**/*' s.dependency 'FlutterMacOS' diff --git a/pubspec.yaml b/pubspec.yaml index 17e0faf0..8703c6f2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ flutter: plugin: platforms: android: - package: com.aravi.video_compress + package: com.spectora.video_compress pluginClass: VideoCompressPlugin ios: pluginClass: VideoCompressPlugin From caf41183e84adebd6ef5c8fba547937daf556a65 Mon Sep 17 00:00:00 2001 From: Gabriel Araujo Date: Thu, 22 Jun 2023 18:01:03 -0300 Subject: [PATCH 12/14] Adjusted path --- .../com/{aravi => spectora}/video_compress/ThumbnailUtility.kt | 0 .../main/kotlin/com/{aravi => spectora}/video_compress/Utility.kt | 0 .../com/{aravi => spectora}/video_compress/VideoCompressPlugin.kt | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename android/src/main/kotlin/com/{aravi => spectora}/video_compress/ThumbnailUtility.kt (100%) rename android/src/main/kotlin/com/{aravi => spectora}/video_compress/Utility.kt (100%) rename android/src/main/kotlin/com/{aravi => spectora}/video_compress/VideoCompressPlugin.kt (100%) diff --git a/android/src/main/kotlin/com/aravi/video_compress/ThumbnailUtility.kt b/android/src/main/kotlin/com/spectora/video_compress/ThumbnailUtility.kt similarity index 100% rename from android/src/main/kotlin/com/aravi/video_compress/ThumbnailUtility.kt rename to android/src/main/kotlin/com/spectora/video_compress/ThumbnailUtility.kt diff --git a/android/src/main/kotlin/com/aravi/video_compress/Utility.kt b/android/src/main/kotlin/com/spectora/video_compress/Utility.kt similarity index 100% rename from android/src/main/kotlin/com/aravi/video_compress/Utility.kt rename to android/src/main/kotlin/com/spectora/video_compress/Utility.kt diff --git a/android/src/main/kotlin/com/aravi/video_compress/VideoCompressPlugin.kt b/android/src/main/kotlin/com/spectora/video_compress/VideoCompressPlugin.kt similarity index 100% rename from android/src/main/kotlin/com/aravi/video_compress/VideoCompressPlugin.kt rename to android/src/main/kotlin/com/spectora/video_compress/VideoCompressPlugin.kt From 27113814ab4c384fca1fcc9721911b7576f19c9a Mon Sep 17 00:00:00 2001 From: "ruben.sousa" Date: Sun, 16 Jul 2023 01:56:47 +0100 Subject: [PATCH 13/14] refactor: change startTime and duration to double in android --- .../kotlin/com/spectora/video_compress/VideoCompressPlugin.kt | 4 ++-- lib/src/video_compress/video_compressor.dart | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/src/main/kotlin/com/spectora/video_compress/VideoCompressPlugin.kt b/android/src/main/kotlin/com/spectora/video_compress/VideoCompressPlugin.kt index dc3ddd67..ab851e45 100644 --- a/android/src/main/kotlin/com/spectora/video_compress/VideoCompressPlugin.kt +++ b/android/src/main/kotlin/com/spectora/video_compress/VideoCompressPlugin.kt @@ -79,8 +79,8 @@ class VideoCompressPlugin : MethodCallHandler, FlutterPlugin { val path = call.argument("path")!! val quality = call.argument("quality")!! val deleteOrigin = call.argument("deleteOrigin")!! - val startTime = call.argument("startTime") - val duration = call.argument("duration") + val startTime = call.argument("startTime") + val duration = call.argument("duration") val includeAudio = call.argument("includeAudio") ?: true val frameRate = if (call.argument("frameRate")==null) 30 else call.argument("frameRate") diff --git a/lib/src/video_compress/video_compressor.dart b/lib/src/video_compress/video_compressor.dart index de2ef4c1..7153c7c4 100644 --- a/lib/src/video_compress/video_compressor.dart +++ b/lib/src/video_compress/video_compressor.dart @@ -123,8 +123,8 @@ extension Compress on IVideoCompress { String path, { VideoQuality quality = VideoQuality.DefaultQuality, bool deleteOrigin = false, - int? startTime, - int? duration, + double? startTime, + double? duration, bool? includeAudio, int frameRate = 30, }) async { From 337bffc9b7ff151d224b7428da08ab494329e503 Mon Sep 17 00:00:00 2001 From: "ruben.sousa" Date: Wed, 19 Jul 2023 11:38:27 +0100 Subject: [PATCH 14/14] refactor: fix double for startTime and duration --- .../video_compress/VideoCompressPlugin.kt | 5 ++++- example/android/app/build.gradle | 12 +++++++++++- .../android/app/src/debug/AndroidManifest.xml | 3 +-- .../android/app/src/main/AndroidManifest.xml | 4 +++- .../app/src/profile/AndroidManifest.xml | 3 +-- example/android/build.gradle | 4 ++-- example/android/gradle.properties | 4 ++++ .../gradle/wrapper/gradle-wrapper.properties | 6 +++--- example/ios/Flutter/Flutter.podspec | 18 ------------------ example/macos/Runner.xcodeproj/project.pbxproj | 11 ++++++----- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- 11 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 example/ios/Flutter/Flutter.podspec diff --git a/android/src/main/kotlin/com/spectora/video_compress/VideoCompressPlugin.kt b/android/src/main/kotlin/com/spectora/video_compress/VideoCompressPlugin.kt index ab851e45..30ab48b9 100644 --- a/android/src/main/kotlin/com/spectora/video_compress/VideoCompressPlugin.kt +++ b/android/src/main/kotlin/com/spectora/video_compress/VideoCompressPlugin.kt @@ -140,7 +140,10 @@ class VideoCompressPlugin : MethodCallHandler, FlutterPlugin { val dataSource = if (startTime != null || duration != null){ val source = UriDataSource(context, Uri.parse(path)) - TrimDataSource(source, (1000 * 1000 * (startTime ?: 0)).toLong(), (1000 * 1000 * (duration ?: 0)).toLong()) + val startTimeInMillis = (1000 * 1000 * (startTime ?: 0.0)).toLong() + val durationInMillis = (1000 * 1000 * (duration ?: 0.0)).toLong() + TrimDataSource(source, startTimeInMillis, durationInMillis) + // TrimDataSource(source, (1000 * 1000 * (startTime ?: 0)).toLong(), (1000 * 1000 * (duration ?: 0)).toLong()) }else{ UriDataSource(context, Uri.parse(path)) } diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 42329ab9..5755c624 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -26,7 +26,9 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 31 + + + compileSdkVersion 33 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -53,6 +55,13 @@ android { signingConfig signingConfigs.debug } } + namespace "com.example.video_compress_example" + + + + + + } flutter { @@ -61,6 +70,7 @@ flutter { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'com.otaliastudios:transcoder:0.10.5' testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test:runner:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' diff --git a/example/android/app/src/debug/AndroidManifest.xml b/example/android/app/src/debug/AndroidManifest.xml index 8d6c2e59..f880684a 100644 --- a/example/android/app/src/debug/AndroidManifest.xml +++ b/example/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index bc57e571..172d38c7 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ +> diff --git a/example/android/build.gradle b/example/android/build.gradle index 1c4cdaa2..3402903d 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.8.10' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.1' + classpath 'com.android.tools.build:gradle:7.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/example/android/gradle.properties b/example/android/gradle.properties index b6e61b62..b4979fd4 100644 --- a/example/android/gradle.properties +++ b/example/android/gradle.properties @@ -2,3 +2,7 @@ android.enableJetifier=true android.useAndroidX=true org.gradle.jvmargs=-Xmx1536M android.enableR8=true +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false + diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index fed8471d..8f79fd39 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri May 17 10:22:14 CST 2019 +#Wed Jul 19 10:11:06 WAT 2023 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/example/ios/Flutter/Flutter.podspec b/example/ios/Flutter/Flutter.podspec deleted file mode 100644 index 663d5b29..00000000 --- a/example/ios/Flutter/Flutter.podspec +++ /dev/null @@ -1,18 +0,0 @@ -# -# NOTE: This podspec is NOT to be published. It is only used as a local source! -# This is a generated file; do not edit or check into version control. -# - -Pod::Spec.new do |s| - s.name = 'Flutter' - s.version = '1.0.0' - s.summary = 'High-performance, high-fidelity mobile apps.' - s.homepage = 'https://flutter.io' - s.license = { :type => 'MIT' } - s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } - s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s } - s.ios.deployment_target = '9.0' - # Framework linking is handled by Flutter tooling, not CocoaPods. - # Add a placeholder to satisfy `s.dependency 'Flutter'` plugin podspecs. - s.vendored_frameworks = 'path/to/nothing' -end diff --git a/example/macos/Runner.xcodeproj/project.pbxproj b/example/macos/Runner.xcodeproj/project.pbxproj index 060cec7b..c47b05af 100644 --- a/example/macos/Runner.xcodeproj/project.pbxproj +++ b/example/macos/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 51; + objectVersion = 54; objects = { /* Begin PBXAggregateTarget section */ @@ -203,7 +203,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = ""; TargetAttributes = { 33CC10EC2044A3C60003C045 = { @@ -278,6 +278,7 @@ }; 3399D490228B24CF009A79C7 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -404,7 +405,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -483,7 +484,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -530,7 +531,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.14; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; diff --git a/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index ae8ff59d..7fd7126b 100644 --- a/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@