diff --git a/packages/flutter_image_compress/example/ios/.gitignore b/packages/flutter_image_compress/example/ios/.gitignore index 1ebfcb3..72ea0be 100644 --- a/packages/flutter_image_compress/example/ios/.gitignore +++ b/packages/flutter_image_compress/example/ios/.gitignore @@ -13,6 +13,7 @@ GeneratedPluginRegistrant.h GeneratedPluginRegistrant.m .generated/ +Flutter/ephemeral/ *.pbxuser *.mode1v3 @@ -44,3 +45,4 @@ Icon? Pods/ Podfile.lock .symlinks/ +swiftpm diff --git a/packages/flutter_image_compress/example/ios/Flutter/AppFrameworkInfo.plist b/packages/flutter_image_compress/example/ios/Flutter/AppFrameworkInfo.plist index 9625e10..7c56964 100644 --- a/packages/flutter_image_compress/example/ios/Flutter/AppFrameworkInfo.plist +++ b/packages/flutter_image_compress/example/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 11.0 + 12.0 diff --git a/packages/flutter_image_compress/example/ios/Runner.xcodeproj/project.pbxproj b/packages/flutter_image_compress/example/ios/Runner.xcodeproj/project.pbxproj index 81df123..1af19a8 100644 --- a/packages/flutter_image_compress/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/flutter_image_compress/example/ios/Runner.xcodeproj/project.pbxproj @@ -9,6 +9,7 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; }; 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; 97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; }; @@ -56,6 +57,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, CCE73E2AE7041805F7C0FD33 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -148,13 +150,15 @@ 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - B8F1E14E975E1E84CECBEFD6 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); dependencies = ( ); name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); productName = Runner; productReference = 97C146EE1CF9000F007C117D /* Runner.app */; productType = "com.apple.product-type.application"; @@ -165,7 +169,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = "The Chromium Authors"; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -184,6 +188,9 @@ Base, ); mainGroup = 97C146E51CF9000F007C117D; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + ); productRefGroup = 97C146EF1CF9000F007C117D /* Products */; projectDirPath = ""; projectRoot = ""; @@ -216,6 +223,7 @@ files = ( ); inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", ); name = "Thin Binary"; outputPaths = ( @@ -257,34 +265,6 @@ 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; }; - B8F1E14E975E1E84CECBEFD6 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/Mantle/Mantle.framework", - "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", - "${BUILT_PRODUCTS_DIR}/SDWebImageWebPCoder/SDWebImageWebPCoder.framework", - "${BUILT_PRODUCTS_DIR}/flutter_image_compress_common/flutter_image_compress_common.framework", - "${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework", - "${BUILT_PRODUCTS_DIR}/path_provider_foundation/path_provider_foundation.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mantle.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImageWebPCoder.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_image_compress_common.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebp.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_foundation.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -496,6 +476,20 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; + }; +/* End XCLocalSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { + isa = XCSwiftPackageProductDependency; + productName = FlutterGeneratedPluginSwiftPackage; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 97C146E61CF9000F007C117D /* Project object */; } diff --git a/packages/flutter_image_compress/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/flutter_image_compress/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 82f4dcb..d229f5b 100644 --- a/packages/flutter_image_compress/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/flutter_image_compress/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,10 +1,28 @@ + + + + + + + + + + @@ -46,11 +65,13 @@ buildConfiguration = "Release" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" debugServiceExtension = "internal" + enableGPUValidationMode = "1" allowLocationSimulation = "YES"> diff --git a/packages/flutter_image_compress/example/macos/Runner.xcodeproj/project.pbxproj b/packages/flutter_image_compress/example/macos/Runner.xcodeproj/project.pbxproj index c806557..402de98 100644 --- a/packages/flutter_image_compress/example/macos/Runner.xcodeproj/project.pbxproj +++ b/packages/flutter_image_compress/example/macos/Runner.xcodeproj/project.pbxproj @@ -28,6 +28,7 @@ 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; }; 8A46D48CE2BD72B574A0D2EB /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E34A98A23043EB650D043D6E /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ @@ -103,6 +104,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */, 8A46D48CE2BD72B574A0D2EB /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -239,7 +241,6 @@ 33CC10EB2044A3C60003C045 /* Resources */, 33CC110E2044A8840003C045 /* Bundle Framework */, 3399D490228B24CF009A79C7 /* ShellScript */, - F8CD14B6F5CCA24A1D3EE72A /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -247,6 +248,9 @@ 33CC11202044C79F0003C045 /* PBXTargetDependency */, ); name = Runner; + packageProductDependencies = ( + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */, + ); productName = Runner; productReference = 33CC10ED2044A3C60003C045 /* example.app */; productType = "com.apple.product-type.application"; @@ -258,7 +262,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0920; - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1510; ORGANIZATIONNAME = ""; TargetAttributes = { 331C80D4294CF70F00263BE5 = { @@ -290,6 +294,9 @@ Base, ); mainGroup = 33CC10E42044A3C60003C045; + packageReferences = ( + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */, + ); productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -403,23 +410,6 @@ 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; }; - F8CD14B6F5CCA24A1D3EE72A /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -788,6 +778,20 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ + +/* Begin XCLocalSwiftPackageReference section */ + 781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = { + isa = XCLocalSwiftPackageReference; + relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; + }; +/* End XCLocalSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = { + isa = XCSwiftPackageProductDependency; + productName = FlutterGeneratedPluginSwiftPackage; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = 33CC10E52044A3C60003C045 /* Project object */; } diff --git a/packages/flutter_image_compress/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/flutter_image_compress/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 8fedab6..ee5d00f 100644 --- a/packages/flutter_image_compress/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/flutter_image_compress/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,10 +1,28 @@ + + + + + + + + + + diff --git a/packages/flutter_image_compress/example/macos/Runner/AppDelegate.swift b/packages/flutter_image_compress/example/macos/Runner/AppDelegate.swift index d53ef64..b3c1761 100644 --- a/packages/flutter_image_compress/example/macos/Runner/AppDelegate.swift +++ b/packages/flutter_image_compress/example/macos/Runner/AppDelegate.swift @@ -1,9 +1,13 @@ import Cocoa import FlutterMacOS -@NSApplicationMain +@main class AppDelegate: FlutterAppDelegate { override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { return true } + + override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool { + return true + } } diff --git a/packages/flutter_image_compress_common/ios/.gitignore b/packages/flutter_image_compress_common/ios/.gitignore index 47bf118..1041915 100644 --- a/packages/flutter_image_compress_common/ios/.gitignore +++ b/packages/flutter_image_compress_common/ios/.gitignore @@ -35,3 +35,6 @@ Icon? /Flutter/Generated.xcconfig /Flutter/flutter_export_environment.sh + +.build/ +.swiftpm/ diff --git a/packages/flutter_image_compress_common/ios/Assets/.gitkeep b/packages/flutter_image_compress_common/ios/Assets/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/packages/flutter_image_compress_common/ios/flutter_image_compress_common.podspec b/packages/flutter_image_compress_common/ios/flutter_image_compress_common.podspec index 4b938c0..673be53 100644 --- a/packages/flutter_image_compress_common/ios/flutter_image_compress_common.podspec +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common.podspec @@ -9,10 +9,10 @@ Compress image with native Objective-C with faster speed. s.license = { :file => '../LICENSE' } s.author = { 'fluttercandies' => 'email@example.com' } s.source = { :path => '.' } - s.ios.deployment_target = '9.0' + s.ios.deployment_target = '12.0' - s.source_files = 'Classes/**/*' - s.public_header_files = 'Classes/**/*.h' + s.source_files = 'flutter_image_compress_common/Sources/flutter_image_compress_common/**/*' + s.public_header_files = 'flutter_image_compress_common/Sources/flutter_image_compress_common/include/**/*.h' s.dependency 'Flutter' s.dependency 'Mantle' diff --git a/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Package.resolved b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Package.resolved new file mode 100644 index 0000000..ca9d408 --- /dev/null +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Package.resolved @@ -0,0 +1,41 @@ +{ + "pins" : [ + { + "identity" : "libwebp-xcode", + "kind" : "remoteSourceControl", + "location" : "https://github.com/SDWebImage/libwebp-Xcode.git", + "state" : { + "revision" : "0d60654eeefd5d7d2bef3835804892c40225e8b2", + "version" : "1.5.0" + } + }, + { + "identity" : "mantle", + "kind" : "remoteSourceControl", + "location" : "https://github.com/Mantle/Mantle", + "state" : { + "revision" : "16f72bfe72a2ab29654ba894da1c32b17524e1a6", + "version" : "2.2.0" + } + }, + { + "identity" : "sdwebimage", + "kind" : "remoteSourceControl", + "location" : "https://github.com/SDWebImage/SDWebImage", + "state" : { + "revision" : "b62cb63bf4ed1f04c961a56c9c6c9d5ab8524ec6", + "version" : "5.21.1" + } + }, + { + "identity" : "sdwebimagewebpcoder", + "kind" : "remoteSourceControl", + "location" : "https://github.com/SDWebImage/SDWebImageWebPCoder", + "state" : { + "revision" : "f534cfe830a7807ecc3d0332127a502426cfa067", + "version" : "0.14.6" + } + } + ], + "version" : 2 +} diff --git a/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Package.swift b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Package.swift new file mode 100644 index 0000000..21a84ff --- /dev/null +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Package.swift @@ -0,0 +1,32 @@ +// swift-tools-version: 5.9 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "flutter_image_compress_common", + platforms: [ + .iOS("12.0"), + ], + products: [ + .library(name: "flutter-image-compress-common", targets: ["flutter_image_compress_common"]) + ], + dependencies: [ + .package(url: "https://github.com/Mantle/Mantle", .upToNextMajor(from: "2.2.0")), + .package(url: "https://github.com/SDWebImage/SDWebImage", .upToNextMajor(from: "5.21.1")), + .package(url: "https://github.com/SDWebImage/SDWebImageWebPCoder", .upToNextMajor(from: "0.14.6")), + ], + targets: [ + .target( + name: "flutter_image_compress_common", + dependencies: [ + .product(name: "Mantle", package: "Mantle"), + .product(name: "SDWebImage", package: "SDWebImage"), + .product(name: "SDWebImageWebPCoder", package: "SDWebImageWebPCoder") + ], + cSettings: [ + .headerSearchPath("include/flutter_image_compress_common") + ] + ) + ] +) diff --git a/packages/flutter_image_compress_common/ios/Classes/CompressFileHandler.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/CompressFileHandler.m similarity index 94% rename from packages/flutter_image_compress_common/ios/Classes/CompressFileHandler.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/CompressFileHandler.m index fecb511..ad6a0a9 100644 --- a/packages/flutter_image_compress_common/ios/Classes/CompressFileHandler.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/CompressFileHandler.m @@ -2,10 +2,10 @@ // Created by cjl on 2018/9/8. // -#import "CompressFileHandler.h" -#import "CompressHandler.h" -#import "SYMetadata.h" -#import +#import "./include/flutter_image_compress_common/CompressFileHandler.h" +#import "./include/flutter_image_compress_common/CompressHandler.h" +#import "./include/flutter_image_compress_common/SYPictureMetadata/SYMetadata.h" +@import SDWebImageWebPCoder; #import @implementation CompressFileHandler { diff --git a/packages/flutter_image_compress_common/ios/Classes/CompressHandler.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/CompressHandler.m similarity index 93% rename from packages/flutter_image_compress_common/ios/Classes/CompressHandler.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/CompressHandler.m index 6fbd422..ff40845 100644 --- a/packages/flutter_image_compress_common/ios/Classes/CompressHandler.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/CompressHandler.m @@ -2,11 +2,11 @@ // Created by cjl on 2018/9/8. // -#import "CompressHandler.h" -#import "UIImage+scale.h" +#import "./include/flutter_image_compress_common/CompressHandler.h" +#import "./include/flutter_image_compress_common/UIImage+scale.h" #import "UIImage+WebP.h" -#import "ImageCompressPlugin.h" -#import +#import "./include/flutter_image_compress_common/ImageCompressPlugin.h" +@import SDWebImageWebPCoder; @implementation CompressHandler { diff --git a/packages/flutter_image_compress_common/ios/Classes/CompressListHandler.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/CompressListHandler.m similarity index 83% rename from packages/flutter_image_compress_common/ios/Classes/CompressListHandler.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/CompressListHandler.m index 944e45f..597473b 100644 --- a/packages/flutter_image_compress_common/ios/Classes/CompressListHandler.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/CompressListHandler.m @@ -6,9 +6,9 @@ // #import -#import "CompressListHandler.h" -#import "CompressHandler.h" -#import "SYMetadata.h" +#import "./include/flutter_image_compress_common/CompressListHandler.h" +#import "./include/flutter_image_compress_common/CompressHandler.h" +#import "./include/flutter_image_compress_common/SYPictureMetadata/SYMetadata.h" @implementation CompressListHandler diff --git a/packages/flutter_image_compress_common/ios/Classes/ImageCompressPlugin.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/ImageCompressPlugin.m similarity index 89% rename from packages/flutter_image_compress_common/ios/Classes/ImageCompressPlugin.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/ImageCompressPlugin.m index 989ab2c..956b747 100644 --- a/packages/flutter_image_compress_common/ios/Classes/ImageCompressPlugin.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/ImageCompressPlugin.m @@ -1,6 +1,6 @@ -#import "ImageCompressPlugin.h" -#import "CompressListHandler.h" -#import "CompressFileHandler.h" +#import "./include/flutter_image_compress_common/ImageCompressPlugin.h" +#import "./include/flutter_image_compress_common/CompressListHandler.h" +#import "./include/flutter_image_compress_common/CompressFileHandler.h" BOOL showLog = false; diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/NSDictionary+SY.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/NSDictionary+SY.m similarity index 97% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/NSDictionary+SY.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/NSDictionary+SY.m index a0424c7..7ee0a1d 100755 --- a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/NSDictionary+SY.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/NSDictionary+SY.m @@ -6,7 +6,7 @@ // Copyright © 2017 Syan. All rights reserved. // -#import "NSDictionary+SY.h" +#import "../include/flutter_image_compress_common/SYPictureMetadata/NSDictionary+SY.h" @implementation NSDictionary (SY) diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadata.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadata.m similarity index 98% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadata.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadata.m index 7bb9ac0..7444a44 100755 --- a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadata.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadata.m @@ -7,8 +7,8 @@ // #import -#import "SYMetadata.h" -#import "NSDictionary+SY.h" +#import "../include/flutter_image_compress_common/SYPictureMetadata/SYMetadata.h" +#import "../include/flutter_image_compress_common/SYPictureMetadata/NSDictionary+SY.h" #if !TARGET_OS_TV #import diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadata8BIM.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadata8BIM.m similarity index 83% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadata8BIM.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadata8BIM.m index e7abc4d..df7bfc2 100755 --- a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadata8BIM.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadata8BIM.m @@ -6,7 +6,7 @@ // Copyright (c) 2012 Syan. All rights reserved. // -#import "SYMetadata8BIM.h" +#import "../include/flutter_image_compress_common/SYPictureMetadata/SYMetadata8BIM.h" #import @implementation SYMetadata8BIM @@ -19,4 +19,3 @@ + (NSDictionary *)JSONKeyPathsByPropertyKey } @end - diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataBase.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataBase.m similarity index 98% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataBase.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataBase.m index c863774..17a3261 100755 --- a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataBase.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataBase.m @@ -6,7 +6,7 @@ // Copyright (c) 2012 Syan. All rights reserved. // -#import "SYMetadataBase.h" +#import "../include/flutter_image_compress_common/SYPictureMetadata/SYMetadataBase.h" #import #import @@ -164,4 +164,3 @@ - (Class)sy_dictionaryTransformerModelClass } @end - diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataCIFF.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataCIFF.m similarity index 96% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataCIFF.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataCIFF.m index 18a42fc..56757c3 100755 --- a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataCIFF.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataCIFF.m @@ -6,7 +6,7 @@ // Copyright (c) 2012 Syan. All rights reserved. // -#import "SYMetadataCIFF.h" +#import "../include/flutter_image_compress_common/SYPictureMetadata/SYMetadataCIFF.h" #import @implementation SYMetadataCIFF diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataDNG.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataDNG.m similarity index 91% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataDNG.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataDNG.m index 0b83238..a9f7f03 100755 --- a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataDNG.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataDNG.m @@ -6,7 +6,7 @@ // Copyright (c) 2012 Syan. All rights reserved. // -#import "SYMetadataDNG.h" +#import "../include/flutter_image_compress_common/SYPictureMetadata/SYMetadataDNG.h" #import @implementation SYMetadataDNG diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataExif.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataExif.m similarity index 98% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataExif.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataExif.m index a5183a9..8cc5255 100755 --- a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataExif.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataExif.m @@ -6,7 +6,7 @@ //Copyright (c2012 Syan. All rights reserved. // -#import "SYMetadataEXIF.h" +#import "../include/flutter_image_compress_common/SYPictureMetadata/SYMetadataEXIF.h" #import @implementation SYMetadataExif diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataExifAux.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataExifAux.m similarity index 94% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataExifAux.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataExifAux.m index 01d60d4..f2d39d5 100755 --- a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataExifAux.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataExifAux.m @@ -7,7 +7,7 @@ // #import -#import "SYMetadataExifAux.h" +#import "../include/flutter_image_compress_common/SYPictureMetadata/SYMetadataExifAux.h" @implementation SYMetadataExifAux diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataGIF.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataGIF.m similarity index 89% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataGIF.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataGIF.m index 7a99676..f7ba3df 100755 --- a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataGIF.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataGIF.m @@ -6,7 +6,7 @@ // Copyright (c) 2012 Syan. All rights reserved. // -#import "SYMetadataGIF.h" +#import "../include/flutter_image_compress_common/SYPictureMetadata/SYMetadataGIF.h" #import @implementation SYMetadataGIF diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataGPS.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataGPS.m similarity index 97% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataGPS.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataGPS.m index 5f4b6e8..a694bd1 100755 --- a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataGPS.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataGPS.m @@ -6,7 +6,7 @@ // Copyright (c) 2012 Syan. All rights reserved. // -#import "SYMetadataGPS.h" +#import "../include/flutter_image_compress_common/SYPictureMetadata/SYMetadataGPS.h" #import @implementation SYMetadataGPS diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataIPTC.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataIPTC.m similarity index 98% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataIPTC.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataIPTC.m index 952b29c..682fe50 100755 --- a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataIPTC.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataIPTC.m @@ -6,7 +6,7 @@ // Copyright (c) 2012 Syan. All rights reserved. // -#import "SYMetadataIPTC.h" +#import "../include/flutter_image_compress_common/SYPictureMetadata/SYMetadataIPTC.h" #import @implementation SYMetadataIPTC diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataIPTCContactInfo.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataIPTCContactInfo.m similarity index 91% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataIPTCContactInfo.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataIPTCContactInfo.m index 4ba9852..0d99729 100755 --- a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataIPTCContactInfo.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataIPTCContactInfo.m @@ -6,7 +6,7 @@ // Copyright (c) 2012 Syan. All rights reserved. // -#import "SYMetadataIPTCContactInfo.h" +#import "../include/flutter_image_compress_common/SYPictureMetadata/SYMetadataIPTCContactInfo.h" #import @implementation SYMetadataIPTCContactInfo diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataJFIF.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataJFIF.m similarity index 89% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataJFIF.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataJFIF.m index 9c68fc4..fbd772d 100755 --- a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataJFIF.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataJFIF.m @@ -6,7 +6,7 @@ // Copyright (c) 2012 Syan. All rights reserved. // -#import "SYMetadataJFIF.h" +#import "../include/flutter_image_compress_common/SYPictureMetadata/SYMetadataJFIF.h" #import @implementation SYMetadataJFIF diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerCanon.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerCanon.m similarity index 94% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerCanon.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerCanon.m index c9b1627..5c3038c 100755 --- a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerCanon.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerCanon.m @@ -6,7 +6,7 @@ // Copyright (c) 2012 Syan. All rights reserved. // -#import "SYMetadataMakerCanon.h" +#import "../include/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerCanon.h" #import @implementation SYMetadataMakerCanon @@ -32,4 +32,3 @@ + (NSDictionary *)JSONKeyPathsByPropertyKey } @end - diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerFuji.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerFuji.m similarity index 68% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerFuji.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerFuji.m index 101f2f1..fe7a9f3 100755 --- a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerFuji.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerFuji.m @@ -6,7 +6,7 @@ // Copyright (c) 2012 Syan. All rights reserved. // -#import "SYMetadataMakerFuji.h" +#import "../include/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerFuji.h" @implementation SYMetadataMakerFuji diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerMinolta.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerMinolta.m similarity index 68% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerMinolta.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerMinolta.m index f9030b1..42b9b08 100755 --- a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerMinolta.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerMinolta.m @@ -6,7 +6,7 @@ // Copyright (c) 2012 Syan. All rights reserved. // -#import "SYMetadataMakerMinolta.h" +#import "../include/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerMinolta.h" @implementation SYMetadataMakerMinolta diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerNikon.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerNikon.m similarity index 95% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerNikon.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerNikon.m index f27c4b3..e685e27 100755 --- a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerNikon.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerNikon.m @@ -6,7 +6,7 @@ // Copyright (c) 2012 Syan. All rights reserved. // -#import "SYMetadataMakerNikon.h" +#import "../include/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerNikon.h" #import @implementation SYMetadataMakerNikon diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerOlympus.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerOlympus.m similarity index 68% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerOlympus.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerOlympus.m index cf18ce2..de3fe2c 100755 --- a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerOlympus.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerOlympus.m @@ -6,7 +6,7 @@ // Copyright (c) 2012 Syan. All rights reserved. // -#import "SYMetadataMakerOlympus.h" +#import "../include/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerOlympus.h" @implementation SYMetadataMakerOlympus diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerPentax.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerPentax.m similarity index 68% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerPentax.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerPentax.m index d707d03..0332d74 100755 --- a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerPentax.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerPentax.m @@ -6,7 +6,7 @@ // Copyright (c) 2012 Syan. All rights reserved. // -#import "SYMetadataMakerPentax.h" +#import "../include/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerPentax.h" @implementation SYMetadataMakerPentax diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataPNG.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataPNG.m similarity index 95% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataPNG.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataPNG.m index 41927e1..5671327 100755 --- a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataPNG.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataPNG.m @@ -6,7 +6,7 @@ // Copyright (c) 2012 Syan. All rights reserved. // -#import "SYMetadataPNG.h" +#import "../include/flutter_image_compress_common/SYPictureMetadata/SYMetadataPNG.h" #import @implementation SYMetadataPNG diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataRaw.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataRaw.m similarity index 69% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataRaw.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataRaw.m index 51f3a1b..6651ef5 100755 --- a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataRaw.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataRaw.m @@ -6,7 +6,7 @@ // Copyright (c) 2012 Syan. All rights reserved. // -#import "SYMetadataRaw.h" +#import "../include/flutter_image_compress_common/SYPictureMetadata/SYMetadataRaw.h" @implementation SYMetadataRaw diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataTIFF.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataTIFF.m similarity index 96% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataTIFF.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataTIFF.m index 52d5727..d5f92aa 100755 --- a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataTIFF.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/SYPictureMetadata/SYMetadataTIFF.m @@ -6,7 +6,7 @@ // Copyright (c) 2012 Syan. All rights reserved. // -#import "SYMetadataTIFF.h" +#import "../include/flutter_image_compress_common/SYPictureMetadata/SYMetadataTIFF.h" #import @implementation SYMetadataTIFF diff --git a/packages/flutter_image_compress_common/ios/Classes/UIImage+scale.m b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/UIImage+scale.m similarity index 94% rename from packages/flutter_image_compress_common/ios/Classes/UIImage+scale.m rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/UIImage+scale.m index d5fa5ce..1969430 100644 --- a/packages/flutter_image_compress_common/ios/Classes/UIImage+scale.m +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/UIImage+scale.m @@ -2,8 +2,8 @@ // Created by cjl on 2018/9/8. // -#import "UIImage+scale.h" -#import "ImageCompressPlugin.h" +#import "./include/flutter_image_compress_common/UIImage+scale.h" +#import "./include/flutter_image_compress_common/ImageCompressPlugin.h" @implementation UIImage (scale) -(UIImage *)scaleWithMinWidth: (CGFloat)minWidth minHeight:(CGFloat)minHeight { diff --git a/packages/flutter_image_compress_common/ios/Classes/CompressFileHandler.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/CompressFileHandler.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/CompressFileHandler.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/CompressFileHandler.h diff --git a/packages/flutter_image_compress_common/ios/Classes/CompressHandler.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/CompressHandler.h similarity index 96% rename from packages/flutter_image_compress_common/ios/Classes/CompressHandler.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/CompressHandler.h index 6dc90cc..0d6885e 100644 --- a/packages/flutter_image_compress_common/ios/Classes/CompressHandler.h +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/CompressHandler.h @@ -3,6 +3,7 @@ // #import +#import @interface CompressHandler : NSObject diff --git a/packages/flutter_image_compress_common/ios/Classes/CompressListHandler.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/CompressListHandler.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/CompressListHandler.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/CompressListHandler.h diff --git a/packages/flutter_image_compress_common/ios/Classes/ImageCompressPlugin.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/ImageCompressPlugin.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/ImageCompressPlugin.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/ImageCompressPlugin.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/NSDictionary+SY.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/NSDictionary+SY.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/NSDictionary+SY.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/NSDictionary+SY.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadata.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadata.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadata.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadata.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadata8BIM.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadata8BIM.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadata8BIM.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadata8BIM.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataBase.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataBase.h similarity index 98% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataBase.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataBase.h index 6ed894e..6fea0e0 100755 --- a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataBase.h +++ b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataBase.h @@ -7,7 +7,7 @@ // #import -#import +@import Mantle; #define SYPaste1(a,b) a##b #define SYPaste(a,b) SYPaste1(a,b) diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataCIFF.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataCIFF.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataCIFF.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataCIFF.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataDNG.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataDNG.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataDNG.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataDNG.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataExif.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataExif.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataExif.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataExif.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataExifAux.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataExifAux.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataExifAux.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataExifAux.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataGIF.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataGIF.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataGIF.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataGIF.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataGPS.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataGPS.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataGPS.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataGPS.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataIPTC.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataIPTC.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataIPTC.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataIPTC.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataIPTCContactInfo.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataIPTCContactInfo.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataIPTCContactInfo.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataIPTCContactInfo.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataJFIF.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataJFIF.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataJFIF.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataJFIF.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerCanon.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerCanon.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerCanon.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerCanon.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerFuji.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerFuji.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerFuji.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerFuji.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerMinolta.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerMinolta.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerMinolta.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerMinolta.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerNikon.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerNikon.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerNikon.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerNikon.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerOlympus.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerOlympus.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerOlympus.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerOlympus.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerPentax.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerPentax.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataMakerPentax.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataMakerPentax.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataPNG.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataPNG.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataPNG.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataPNG.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataRaw.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataRaw.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataRaw.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataRaw.h diff --git a/packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataTIFF.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataTIFF.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/SYPictureMetadata/SYMetadataTIFF.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/SYPictureMetadata/SYMetadataTIFF.h diff --git a/packages/flutter_image_compress_common/ios/Classes/UIImage+scale.h b/packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/UIImage+scale.h similarity index 100% rename from packages/flutter_image_compress_common/ios/Classes/UIImage+scale.h rename to packages/flutter_image_compress_common/ios/flutter_image_compress_common/Sources/flutter_image_compress_common/include/flutter_image_compress_common/UIImage+scale.h diff --git a/packages/flutter_image_compress_macos/macos/flutter_image_compress_macos.podspec b/packages/flutter_image_compress_macos/macos/flutter_image_compress_macos.podspec index d7f0faa..9a6c981 100644 --- a/packages/flutter_image_compress_macos/macos/flutter_image_compress_macos.podspec +++ b/packages/flutter_image_compress_macos/macos/flutter_image_compress_macos.podspec @@ -14,7 +14,7 @@ Pod::Spec.new do |s| s.author = { 'Caijinglong' => 'cjl_spy@163.com' } s.source = { :path => '.' } - s.source_files = 'Classes/**/*' + s.source_files = 'flutter_image_compress_macos/Sources/**/*' s.dependency 'FlutterMacOS' s.platform = :osx, '10.15' diff --git a/packages/flutter_image_compress_macos/macos/flutter_image_compress_macos/Package.swift b/packages/flutter_image_compress_macos/macos/flutter_image_compress_macos/Package.swift new file mode 100644 index 0000000..8d8db79 --- /dev/null +++ b/packages/flutter_image_compress_macos/macos/flutter_image_compress_macos/Package.swift @@ -0,0 +1,21 @@ +// swift-tools-version: 5.9 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "flutter_image_compress_macos", + platforms: [ + .macOS("10.15"), + ], + products: [ + .library(name: "flutter-image-compress-macos", targets: ["flutter_image_compress_macos"]) + ], + dependencies: [], + targets: [ + .target( + name: "flutter_image_compress_macos", + dependencies: [] + ) + ] +) diff --git a/packages/flutter_image_compress_macos/macos/Classes/FlutterImageCompressMacosPlugin.swift b/packages/flutter_image_compress_macos/macos/flutter_image_compress_macos/Sources/flutter_image_compress_macos/FlutterImageCompressMacosPlugin.swift similarity index 100% rename from packages/flutter_image_compress_macos/macos/Classes/FlutterImageCompressMacosPlugin.swift rename to packages/flutter_image_compress_macos/macos/flutter_image_compress_macos/Sources/flutter_image_compress_macos/FlutterImageCompressMacosPlugin.swift