diff --git a/Example/Pods/Pods.xcodeproj/xcuserdata/brandonwithrow.xcuserdatad/xcschemes/Pods-lottie-ios_Example.xcscheme b/Example/Pods/Pods.xcodeproj/xcuserdata/brandonwithrow.xcuserdatad/xcschemes/Pods-lottie-ios_Example.xcscheme new file mode 100644 index 0000000000..d76fbcd60e --- /dev/null +++ b/Example/Pods/Pods.xcodeproj/xcuserdata/brandonwithrow.xcuserdatad/xcschemes/Pods-lottie-ios_Example.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Example/Pods/Pods.xcodeproj/xcuserdata/brandonwithrow.xcuserdatad/xcschemes/Pods-lottie-ios_Tests.xcscheme b/Example/Pods/Pods.xcodeproj/xcuserdata/brandonwithrow.xcuserdatad/xcschemes/Pods-lottie-ios_Tests.xcscheme new file mode 100644 index 0000000000..42f0cd823a --- /dev/null +++ b/Example/Pods/Pods.xcodeproj/xcuserdata/brandonwithrow.xcuserdatad/xcschemes/Pods-lottie-ios_Tests.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Example/Pods/Pods.xcodeproj/xcuserdata/brandonwithrow.xcuserdatad/xcschemes/lottie-ios.xcscheme b/Example/Pods/Pods.xcodeproj/xcuserdata/brandonwithrow.xcuserdatad/xcschemes/lottie-ios.xcscheme new file mode 100644 index 0000000000..d4b45ed87b --- /dev/null +++ b/Example/Pods/Pods.xcodeproj/xcuserdata/brandonwithrow.xcuserdatad/xcschemes/lottie-ios.xcscheme @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Example/Pods/Pods.xcodeproj/xcuserdata/brandonwithrow.xcuserdatad/xcschemes/xcschememanagement.plist b/Example/Pods/Pods.xcodeproj/xcuserdata/brandonwithrow.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000000..05afe55129 --- /dev/null +++ b/Example/Pods/Pods.xcodeproj/xcuserdata/brandonwithrow.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,42 @@ + + + + + SchemeUserState + + Pods-lottie-ios_Example.xcscheme + + orderHint + 2 + + Pods-lottie-ios_Tests.xcscheme + + orderHint + 3 + + lottie-ios.xcscheme + + orderHint + 1 + + + SuppressBuildableAutocreation + + 6DDA5F5406B3D3858519245405C1FC95 + + primary + + + 83ADD99A263B92A7CBD14D1B3DBE0C7B + + primary + + + F3E5C6CFC617C98C9BC4AFE6F3D2DFBE + + primary + + + + + diff --git a/Example/lottie-ios.xcodeproj/project.pbxproj b/Example/lottie-ios.xcodeproj/project.pbxproj index ec204c86e1..04e6877570 100644 --- a/Example/lottie-ios.xcodeproj/project.pbxproj +++ b/Example/lottie-ios.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 48A852311E3A9E71000AD155 /* lottie_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 48A852301E3A9E71000AD155 /* lottie_logo.png */; }; 6003F58E195388D20070C39A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58D195388D20070C39A /* Foundation.framework */; }; 6003F590195388D20070C39A /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F58F195388D20070C39A /* CoreGraphics.framework */; }; 6003F592195388D20070C39A /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6003F591195388D20070C39A /* UIKit.framework */; }; @@ -86,8 +87,9 @@ /* Begin PBXFileReference section */ 05ACBD6FE5DF79DB2906251A /* Pods-lottie-ios_Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-lottie-ios_Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-lottie-ios_Tests/Pods-lottie-ios_Tests.debug.xcconfig"; sourceTree = ""; }; 278F8B6FD5D7B8D80A860E31 /* Pods-lottie-ios_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-lottie-ios_Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-lottie-ios_Tests/Pods-lottie-ios_Tests.release.xcconfig"; sourceTree = ""; }; + 48A852301E3A9E71000AD155 /* lottie_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = lottie_logo.png; sourceTree = ""; }; 4EBDFEA18138A27DD5A89337 /* Pods_lottie_ios_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_lottie_ios_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 6003F58A195388D20070C39A /* lottie-ios_Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "lottie-ios_Example.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 6003F58A195388D20070C39A /* Lottie.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Lottie.app; sourceTree = BUILT_PRODUCTS_DIR; }; 6003F58D195388D20070C39A /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 6003F58F195388D20070C39A /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 6003F591195388D20070C39A /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; @@ -220,7 +222,7 @@ 6003F58B195388D20070C39A /* Products */ = { isa = PBXGroup; children = ( - 6003F58A195388D20070C39A /* lottie-ios_Example.app */, + 6003F58A195388D20070C39A /* Lottie.app */, 6003F5AE195388D20070C39A /* lottie-ios_Tests.xctest */, ); name = Products; @@ -261,6 +263,7 @@ 6003F594195388D20070C39A /* Supporting Files */ = { isa = PBXGroup; children = ( + 48A852301E3A9E71000AD155 /* lottie_logo.png */, 6003F595195388D20070C39A /* lottie-ios-Info.plist */, 6003F596195388D20070C39A /* InfoPlist.strings */, 6003F599195388D20070C39A /* main.m */, @@ -383,9 +386,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 6003F589195388D20070C39A /* lottie-ios_Example */ = { + 6003F589195388D20070C39A /* Lottie */ = { isa = PBXNativeTarget; - buildConfigurationList = 6003F5BF195388D20070C39A /* Build configuration list for PBXNativeTarget "lottie-ios_Example" */; + buildConfigurationList = 6003F5BF195388D20070C39A /* Build configuration list for PBXNativeTarget "Lottie" */; buildPhases = ( 78E5C1D6C759603709200120 /* [CP] Check Pods Manifest.lock */, 6003F586195388D20070C39A /* Sources */, @@ -398,9 +401,9 @@ ); dependencies = ( ); - name = "lottie-ios_Example"; + name = Lottie; productName = "lottie-ios"; - productReference = 6003F58A195388D20070C39A /* lottie-ios_Example.app */; + productReference = 6003F58A195388D20070C39A /* Lottie.app */; productType = "com.apple.product-type.application"; }; 6003F5AD195388D20070C39A /* lottie-ios_Tests */ = { @@ -452,7 +455,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 6003F589195388D20070C39A /* lottie-ios_Example */, + 6003F589195388D20070C39A /* Lottie */, 6003F5AD195388D20070C39A /* lottie-ios_Tests */, ); }; @@ -467,6 +470,7 @@ 62B254B61E3A90040035A842 /* H.json in Resources */, 62B254B41E3A90040035A842 /* F.json in Resources */, 62B254AD1E3A90040035A842 /* B.json in Resources */, + 48A852311E3A9E71000AD155 /* lottie_logo.png in Resources */, 62B254B01E3A90040035A842 /* Colon.json in Resources */, 62B254C51E3A90040035A842 /* W.json in Resources */, 873B8AEB1B1F5CCA007FD442 /* Main.storyboard in Resources */, @@ -644,7 +648,7 @@ /* Begin PBXTargetDependency section */ 6003F5B4195388D20070C39A /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 6003F589195388D20070C39A /* lottie-ios_Example */; + target = 6003F589195388D20070C39A /* Lottie */; targetProxy = 6003F5B3195388D20070C39A /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -836,7 +840,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 6003F5BF195388D20070C39A /* Build configuration list for PBXNativeTarget "lottie-ios_Example" */ = { + 6003F5BF195388D20070C39A /* Build configuration list for PBXNativeTarget "Lottie" */ = { isa = XCConfigurationList; buildConfigurations = ( 6003F5C0195388D20070C39A /* Debug */, diff --git a/Example/lottie-ios.xcodeproj/xcshareddata/xcschemes/lottie-ios-Example.xcscheme b/Example/lottie-ios.xcodeproj/xcshareddata/xcschemes/lottie-ios-Example.xcscheme index cc150386b2..16395895eb 100644 --- a/Example/lottie-ios.xcodeproj/xcshareddata/xcschemes/lottie-ios-Example.xcscheme +++ b/Example/lottie-ios.xcodeproj/xcshareddata/xcschemes/lottie-ios-Example.xcscheme @@ -15,8 +15,8 @@ @@ -43,8 +43,8 @@ @@ -66,8 +66,8 @@ @@ -85,8 +85,8 @@ diff --git a/Example/lottie-ios.xcodeproj/xcuserdata/brandonwithrow.xcuserdatad/xcschemes/xcschememanagement.plist b/Example/lottie-ios.xcodeproj/xcuserdata/brandonwithrow.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000000..46fd0c1067 --- /dev/null +++ b/Example/lottie-ios.xcodeproj/xcuserdata/brandonwithrow.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,27 @@ + + + + + SchemeUserState + + lottie-ios-Example.xcscheme_^#shared#^_ + + orderHint + 0 + + + SuppressBuildableAutocreation + + 6003F589195388D20070C39A + + primary + + + 6003F5AD195388D20070C39A + + primary + + + + + diff --git a/Example/lottie-ios/Base.lproj/LaunchScreen.storyboard b/Example/lottie-ios/Base.lproj/LaunchScreen.storyboard index 66a768191c..12e0512c56 100644 --- a/Example/lottie-ios/Base.lproj/LaunchScreen.storyboard +++ b/Example/lottie-ios/Base.lproj/LaunchScreen.storyboard @@ -1,8 +1,12 @@ - - + + + + + - + + @@ -14,14 +18,23 @@ - + - + + + + + + + - + + + + diff --git a/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Contents.json b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Contents.json index d7070bc5c0..296e4da507 100644 --- a/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,88 +1,105 @@ { "images" : [ { - "idiom" : "iphone", "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@2x-1.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@3x.png", "scale" : "3x" }, { - "idiom" : "iphone", "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@2x-1.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@3x.png", "scale" : "3x" }, { - "idiom" : "iphone", "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@2x-1.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@3x.png", "scale" : "3x" }, { - "idiom" : "iphone", "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@2x.png", "scale" : "2x" }, { - "idiom" : "iphone", "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@3x.png", "scale" : "3x" }, { - "idiom" : "ipad", "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@1x.png", "scale" : "1x" }, { - "idiom" : "ipad", "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@2x.png", "scale" : "2x" }, { - "idiom" : "ipad", "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@1x.png", "scale" : "1x" }, { - "idiom" : "ipad", "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@2x.png", "scale" : "2x" }, { - "idiom" : "ipad", "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@1x.png", "scale" : "1x" }, { - "idiom" : "ipad", "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@2x.png", "scale" : "2x" }, { - "idiom" : "ipad", "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@1x.png", "scale" : "1x" }, { - "idiom" : "ipad", "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@2x.png", "scale" : "2x" }, { - "idiom" : "ipad", "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-App-83.5x83.5@2x.png", "scale" : "2x" } ], @@ -90,4 +107,4 @@ "version" : 1, "author" : "xcode" } -} +} \ No newline at end of file diff --git a/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png new file mode 100644 index 0000000000..4c1caa6f8e Binary files /dev/null and b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x-1.png b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x-1.png new file mode 100644 index 0000000000..f00013b2bf Binary files /dev/null and b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x-1.png differ diff --git a/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png new file mode 100644 index 0000000000..f00013b2bf Binary files /dev/null and b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 0000000000..6198cfc573 Binary files /dev/null and b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png new file mode 100644 index 0000000000..007a7ba283 Binary files /dev/null and b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-1.png b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-1.png new file mode 100644 index 0000000000..a21f3da5b8 Binary files /dev/null and b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x-1.png differ diff --git a/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 0000000000..a21f3da5b8 Binary files /dev/null and b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png new file mode 100644 index 0000000000..51f0acdc14 Binary files /dev/null and b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png new file mode 100644 index 0000000000..f00013b2bf Binary files /dev/null and b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x-1.png b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x-1.png new file mode 100644 index 0000000000..04774137fd Binary files /dev/null and b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x-1.png differ diff --git a/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 0000000000..04774137fd Binary files /dev/null and b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png new file mode 100644 index 0000000000..d328eb7416 Binary files /dev/null and b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 0000000000..d328eb7416 Binary files /dev/null and b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 0000000000..2ac204df67 Binary files /dev/null and b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png new file mode 100644 index 0000000000..045e2abe64 Binary files /dev/null and b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png new file mode 100644 index 0000000000..e236e6a3da Binary files /dev/null and b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png new file mode 100644 index 0000000000..8108ecc598 Binary files /dev/null and b/Example/lottie-ios/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/Example/lottie-ios/lottie-ios-Info.plist b/Example/lottie-ios/lottie-ios-Info.plist index 7576a0dc45..683cf92bad 100644 --- a/Example/lottie-ios/lottie-ios-Info.plist +++ b/Example/lottie-ios/lottie-ios-Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion en CFBundleDisplayName - ${PRODUCT_NAME} + Lottie CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier diff --git a/Example/lottie-ios/lottie_logo.png b/Example/lottie-ios/lottie_logo.png new file mode 100644 index 0000000000..665b66fe62 Binary files /dev/null and b/Example/lottie-ios/lottie_logo.png differ diff --git a/README.md b/README.md index 29484fada2..e50c125bb5 100644 --- a/README.md +++ b/README.md @@ -113,7 +113,7 @@ File github issues for anything that is unexpectedly broken. If an After Effects ## Roadmap - Add support for interactive animated transitions - Add support for parenting programatically added layers, moving/scaling -- Support for the After Effects Trim Paths feature +- Support for the After Effects Trim Paths Offset feature - Animation Syncing - Programatically alter animations