From 9cec91294d17e97b2a67053f6391f330b43faec4 Mon Sep 17 00:00:00 2001
From: aborziak-ms <83784664+aborziak-ms@users.noreply.github.com>
Date: Wed, 25 May 2022 10:18:30 -0700
Subject: [PATCH] Namespace migration and WinUI3 package
MicrosoftToolkit.WinUI.Lottie (#500)
---
.../Lottie-Windows-WinUI3.csproj | 39 +++
Lottie-Windows.sln | 245 +++++++++++-------
Lottie-Windows/Lottie-Windows.csproj | 9 +-
Lottie-Windows/README.md | 6 +-
LottieGen/DotnetTool/Program.cs | 2 +-
LottieGen/README.md | 2 +-
LottieGen/win-x64/LottieGen.win-x64.csproj | 2 +-
LottieGen/win-x64/Program.cs | 2 +-
LottieViewer/LottieViewer.csproj | 2 +-
LottieViewer/MainPage.xaml | 2 +-
LottieViewer/PaletteColorPicker.xaml.cs | 6 +-
LottieViewer/Stage.xaml | 2 +-
.../LottieVisualDiagnosticsViewModel.cs | 6 +-
source/Animatables/Animatable.cs | 2 +-
source/Animatables/AnimatableVector2.cs | 2 +-
source/Animatables/AnimatableVector2Type.cs | 2 +-
source/Animatables/AnimatableVector3.cs | 2 +-
source/Animatables/AnimatableVector3Type.cs | 2 +-
source/Animatables/AnimatableXY.cs | 2 +-
source/Animatables/AnimatableXYZ.cs | 2 +-
source/Animatables/BezierSegment.cs | 4 +-
source/Animatables/Color.cs | 2 +-
source/Animatables/ColorGradientStop.cs | 2 +-
source/Animatables/CubicBezier.cs | 2 +-
source/Animatables/CubicBezierEasing.cs | 2 +-
source/Animatables/Easing.cs | 4 +-
source/Animatables/Enum.cs | 2 +-
source/Animatables/Exceptions.cs | 2 +-
source/Animatables/ExtensionMethods.cs | 2 +-
source/Animatables/GradientStop.cs | 2 +-
source/Animatables/HoldEasing.cs | 2 +-
source/Animatables/IAnimatableValue.cs | 2 +-
source/Animatables/IAnimatableVector2.cs | 2 +-
source/Animatables/IAnimatableVector3.cs | 2 +-
source/Animatables/IGradient.cs | 2 +-
source/Animatables/IRadialGradient.cs | 2 +-
source/Animatables/KeyFrame.cs | 2 +-
source/Animatables/LinearEasing.cs | 2 +-
source/Animatables/Opacity.cs | 2 +-
source/Animatables/OpacityGradientStop.cs | 2 +-
source/Animatables/PathGeometry.cs | 2 +-
source/Animatables/Rotation.cs | 2 +-
source/Animatables/Sequence.cs | 2 +-
source/Animatables/Trim.cs | 2 +-
source/Animatables/Vector2.cs | 2 +-
source/Animatables/Vector3.cs | 2 +-
source/CompMetadata/PropertyBinding.cs | 4 +-
source/DotLottie/DotLottieFile.cs | 2 +-
source/DotLottie/DotLottieFileAnimation.cs | 2 +-
.../DotLottie/InvalidLottieFileException.cs | 2 +-
source/GenericData/GenericDataBool.cs | 2 +-
source/GenericData/GenericDataList.cs | 2 +-
source/GenericData/GenericDataMap.cs | 2 +-
source/GenericData/GenericDataNumber.cs | 2 +-
source/GenericData/GenericDataObject.cs | 2 +-
source/GenericData/GenericDataObjectType.cs | 2 +-
source/GenericData/GenericDataString.cs | 2 +-
source/Issues/ParsingIssues.tt | 2 +-
source/Issues/TranslationIssues.tt | 2 +-
source/Issues/ValidationIssues.tt | 2 +-
source/Lottie/AnimatedVisualFactory.cs | 11 +-
source/Lottie/DisposableAnimatedVisual.cs | 13 +-
source/Lottie/DotLottieLoader.cs | 10 +-
source/Lottie/GenericDataToJson.cs | 4 +-
source/Lottie/ImageAssetHandler.cs | 12 +-
source/Lottie/InputStreamLoader.cs | 9 +-
source/Lottie/Instantiator.cs | 24 +-
source/Lottie/Issue.cs | 2 +-
source/Lottie/Loader.cs | 19 +-
source/Lottie/LottieVisualDiagnostics.cs | 13 +-
source/Lottie/LottieVisualOptions.cs | 2 +-
source/Lottie/LottieVisualSource.cs | 34 ++-
source/Lottie/StorageFileLoader.cs | 9 +-
source/Lottie/UriLoader.cs | 13 +-
source/Lottie/Uris.cs | 2 +-
source/LottieData/Asset.cs | 2 +-
source/LottieData/AssetCollection.cs | 2 +-
source/LottieData/BlendMode.cs | 2 +-
source/LottieData/BlurDimension.cs | 2 +-
source/LottieData/Char.cs | 2 +-
source/LottieData/DrawingDirection.cs | 2 +-
source/LottieData/DropShadowEffect.cs | 4 +-
source/LottieData/Effect.cs | 2 +-
source/LottieData/Ellipse.cs | 4 +-
source/LottieData/EmbeddedImageAsset.cs | 2 +-
source/LottieData/ExtensionMethods.cs | 2 +-
source/LottieData/ExternalImageAsset.cs | 2 +-
source/LottieData/Font.cs | 2 +-
source/LottieData/GaussianBlurEffect.cs | 4 +-
source/LottieData/ImageAsset.cs | 2 +-
source/LottieData/ImageLayer.cs | 2 +-
source/LottieData/Layer.cs | 2 +-
source/LottieData/LayerCollection.cs | 2 +-
source/LottieData/LayerCollectionAsset.cs | 2 +-
source/LottieData/LinearGradientFill.cs | 4 +-
source/LottieData/LinearGradientStroke.cs | 4 +-
source/LottieData/LottieComposition.cs | 4 +-
.../LottieData/LottieCompositionValidator.cs | 2 +-
source/LottieData/LottieObject.cs | 2 +-
source/LottieData/LottieObjectType.cs | 2 +-
source/LottieData/Marker.cs | 2 +-
source/LottieData/Mask.cs | 4 +-
source/LottieData/MergePaths.cs | 2 +-
source/LottieData/NullLayer.cs | 2 +-
.../Optimization/CollapsePreCompsOptimizer.cs | 2 +-
.../Optimization/GradientStopOptimizer.cs | 4 +-
source/LottieData/Optimization/LayerGroup.cs | 2 +-
source/LottieData/Optimization/LayersGraph.cs | 2 +-
.../Optimization/LayersIndexMapper.cs | 2 +-
.../Optimization/LottieMergeOptimizer.cs | 2 +-
source/LottieData/Optimization/MergeHelper.cs | 8 +-
source/LottieData/Optimization/MergeResult.cs | 2 +-
source/LottieData/Optimization/Optimizer.cs | 4 +-
source/LottieData/Optimization/TimeRange.cs | 2 +-
source/LottieData/Path.cs | 4 +-
source/LottieData/Polystar.cs | 4 +-
source/LottieData/PreCompLayer.cs | 2 +-
source/LottieData/RadialGradientFill.cs | 4 +-
source/LottieData/RadialGradientStroke.cs | 4 +-
source/LottieData/Rectangle.cs | 4 +-
source/LottieData/Repeater.cs | 4 +-
source/LottieData/RepeaterTransform.cs | 4 +-
source/LottieData/RoundCorners.cs | 4 +-
.../LottieCompositionYamlSerializer.cs | 6 +-
source/LottieData/Shape.cs | 2 +-
source/LottieData/ShapeContentType.cs | 2 +-
source/LottieData/ShapeFill.cs | 4 +-
source/LottieData/ShapeGroup.cs | 2 +-
source/LottieData/ShapeLayer.cs | 2 +-
source/LottieData/ShapeLayerContent.cs | 2 +-
source/LottieData/ShapeStroke.cs | 4 +-
source/LottieData/ShapeType.cs | 2 +-
source/LottieData/SolidColorFill.cs | 4 +-
source/LottieData/SolidColorStroke.cs | 4 +-
source/LottieData/SolidLayer.cs | 4 +-
source/LottieData/TextLayer.cs | 2 +-
source/LottieData/Tools/Stats.cs | 2 +-
source/LottieData/Transform.cs | 4 +-
source/LottieData/TrimPath.cs | 4 +-
source/LottieData/ValidationIssues.cs | 2 +-
source/LottieGen/CommandLineOptions.cs | 2 +-
source/LottieGen/CommandLineTokenizer.cs | 2 +-
source/LottieGen/DataTable.cs | 2 +-
source/LottieGen/FileProcessor.cs | 4 +-
source/LottieGen/Glob.cs | 2 +-
source/LottieGen/InfoType.cs | 2 +-
source/LottieGen/Language.cs | 2 +-
source/LottieGen/LottieGen.projitems | 2 +-
source/LottieGen/LottieJsonFileProcessor.cs | 28 +-
source/LottieGen/Profiler.cs | 2 +-
source/LottieGen/Reporter.cs | 2 +-
source/LottieGenExe/LottieGenExe.projitems | 2 +-
source/LottieGenExe/Main.cs | 6 +-
source/LottieGenExe/Usage.cs | 2 +-
source/LottieMetadata/Duration.cs | 2 +-
source/LottieMetadata/Frame.cs | 2 +-
.../LottieCompositionMetadata.cs | 2 +-
source/LottieMetadata/Marker.cs | 2 +-
.../LottieReader/Serialization/Animatables.cs | 4 +-
.../Serialization/ArrayBuilder.cs | 2 +-
source/LottieReader/Serialization/Assets.cs | 2 +-
source/LottieReader/Serialization/Chars.cs | 2 +-
source/LottieReader/Serialization/Effects.cs | 4 +-
.../LottieReader/Serialization/EmptyList.cs | 2 +-
source/LottieReader/Serialization/Enums.cs | 2 +-
.../LottieReader/Serialization/Exceptions.cs | 2 +-
source/LottieReader/Serialization/Fonts.cs | 2 +-
source/LottieReader/Serialization/Layers.cs | 6 +-
.../Serialization/LottieCompositionReader.cs | 8 +-
.../LottieCompositionReaderException.cs | 2 +-
.../Serialization/LottieJsonArrayElement.cs | 4 +-
.../Serialization/LottieJsonDocument.cs | 2 +-
.../Serialization/LottieJsonElement.cs | 4 +-
.../Serialization/LottieJsonObjectElement.cs | 4 +-
source/LottieReader/Serialization/Markers.cs | 2 +-
.../Serialization/ParsingIssues.cs | 2 +-
source/LottieReader/Serialization/Reader.cs | 2 +-
.../Serialization/ShapeLayerContents.cs | 6 +-
.../AnimatableVector3Rewriter.cs | 4 +-
source/LottieToWinComp/Animate.cs | 10 +-
source/LottieToWinComp/Brushes.cs | 12 +-
.../LottieToWinComp/CanvasGeometryCombiner.cs | 2 +-
source/LottieToWinComp/CompositeOpacity.cs | 6 +-
source/LottieToWinComp/CompositionContext.cs | 4 +-
.../CompositionObjectFactory.cs | 12 +-
.../LottieToWinComp/ContainerShapeOrVisual.cs | 4 +-
source/LottieToWinComp/ConvertTo.cs | 10 +-
.../LottieToWinComp/CubicBezierFunction2.cs | 4 +-
source/LottieToWinComp/Effects.cs | 8 +-
source/LottieToWinComp/Ellipses.cs | 14 +-
source/LottieToWinComp/ExpressionFactory.cs | 8 +-
source/LottieToWinComp/Float32.cs | 2 +-
.../IDescribableExtensionMethods.cs | 4 +-
source/LottieToWinComp/ImageLayerContext.cs | 4 +-
source/LottieToWinComp/Images.cs | 6 +-
source/LottieToWinComp/LayerContext.cs | 4 +-
source/LottieToWinComp/LayerTranslator.cs | 4 +-
source/LottieToWinComp/Layers.cs | 6 +-
.../LottieToMultiVersionWinCompTranslator.cs | 4 +-
.../LottieToWinCompTranslator.cs | 6 +-
source/LottieToWinComp/Masks.cs | 10 +-
.../MultiVersionTranslationResult.cs | 2 +-
source/LottieToWinComp/Optimizer.cs | 10 +-
source/LottieToWinComp/PathGeometryGroup.cs | 8 +-
source/LottieToWinComp/Paths.cs | 16 +-
source/LottieToWinComp/PreCompLayerContext.cs | 4 +-
source/LottieToWinComp/PreComps.cs | 8 +-
source/LottieToWinComp/ProgressMapFactory.cs | 4 +-
source/LottieToWinComp/PropertyBindings.cs | 4 +-
.../LottieToWinComp/PropertyBindingsParser.cs | 2 +-
.../RectangleOrRoundedRectangleGeometry.cs | 4 +-
source/LottieToWinComp/Rectangles.cs | 14 +-
source/LottieToWinComp/ShapeContext.cs | 6 +-
source/LottieToWinComp/ShapeLayerContext.cs | 6 +-
source/LottieToWinComp/Shapes.cs | 18 +-
source/LottieToWinComp/SolidLayerContext.cs | 4 +-
source/LottieToWinComp/SolidLayers.cs | 4 +-
source/LottieToWinComp/TextLayerContext.cs | 4 +-
source/LottieToWinComp/TextLayers.cs | 2 +-
.../LottieToWinComp/ThemePropertyBindings.cs | 8 +-
source/LottieToWinComp/Transforms.cs | 10 +-
source/LottieToWinComp/TranslationContext.cs | 10 +-
source/LottieToWinComp/TranslationIssue.cs | 2 +-
source/LottieToWinComp/TranslationIssues.cs | 2 +-
source/LottieToWinComp/TranslationResult.cs | 4 +-
.../TranslatorConfiguration.cs | 6 +-
source/LottieToWinComp/TrimmedAnimatable.cs | 4 +-
source/LottieToWinComp/UapVersionRange.cs | 2 +-
.../NullablesAttributes.cs | 2 +
source/UIData/Tools/CanonicalizedNode.cs | 2 +-
source/UIData/Tools/Canonicalizer.cs | 16 +-
source/UIData/Tools/Graph.cs | 4 +-
source/UIData/Tools/GraphCompactor.cs | 10 +-
source/UIData/Tools/ObjectGraph.cs | 14 +-
source/UIData/Tools/Optimizer.cs | 16 +-
source/UIData/Tools/Properties.cs | 4 +-
source/UIData/Tools/PropertyId.cs | 2 +-
source/UIData/Tools/PropertyValueOptimizer.cs | 6 +-
source/UIData/Tools/Stats.cs | 4 +-
source/UIData/Tools/VisibilityAtProgress.cs | 2 +-
source/UIData/Tools/VisibilityDescription.cs | 2 +-
.../CodeGen/AlphanumericStringComparer.cs | 2 +-
.../CodeGen/CSharp/CSharpCodegenResult.cs | 2 +-
.../CSharp/CSharpInstantiatorGenerator.cs | 16 +-
.../CodeGen/CSharp/CSharpStringifier.cs | 8 +-
source/UIDataCodeGen/CodeGen/CodeBuilder.cs | 2 +-
.../CodeGen/CodegenConfiguration.cs | 4 +-
source/UIDataCodeGen/CodeGen/ConstantType.cs | 2 +-
.../Cppwinrt/CppNamespaceListBuilder.cs | 2 +-
.../CodeGen/Cppwinrt/CppwinrtCodegenResult.cs | 2 +-
.../Cppwinrt/CppwinrtInstantiatorGenerator.cs | 12 +-
.../CodeGen/Cppwinrt/CppwinrtStringifier.cs | 6 +-
.../CodeGen/Cx/CppNamespaceListBuilder.cs | 2 +-
.../CodeGen/Cx/CxCodegenResult.cs | 2 +-
.../CodeGen/Cx/CxInstantiatorGenerator.cs | 14 +-
.../UIDataCodeGen/CodeGen/Cx/CxStringifier.cs | 6 +-
.../UIDataCodeGen/CodeGen/Cx/HeaderBuilder.cs | 2 +-
.../CodeGen/IAnimatedVisualInfo.cs | 2 +-
.../CodeGen/IAnimatedVisualSourceInfo.cs | 2 +-
.../CodeGen/InstantiatorGeneratorBase.cs | 26 +-
.../CodeGen/LoadedImageSurfaceInfo.cs | 4 +-
source/UIDataCodeGen/CodeGen/MarkerInfo.cs | 4 +-
.../UIDataCodeGen/CodeGen/MatrixDecomposer.cs | 2 +-
source/UIDataCodeGen/CodeGen/NamedConstant.cs | 2 +-
source/UIDataCodeGen/CodeGen/NodeNamer.cs | 10 +-
.../UIDataCodeGen/CodeGen/SourceMetadata.cs | 6 +-
source/UIDataCodeGen/CodeGen/Stringifier.cs | 10 +-
.../CodeGen/Tables/ColumnData.cs | 2 +-
.../GraphStatsMonospaceTableFormatter.cs | 4 +-
.../LottieMarkersMonospaceTableFormatter.cs | 2 +-
.../CodeGen/Tables/MonospaceTableFormatter.cs | 2 +-
source/UIDataCodeGen/CodeGen/Tables/Row.cs | 2 +-
.../CodeGen/Tables/TextAlignment.cs | 2 +-
.../ThemePropertiesMonospaceTableFormatter.cs | 4 +-
source/UIDataCodeGen/CodeGen/TypeName.cs | 2 +-
.../CompositionObjectDgmlSerializer.cs | 8 +-
source/WinCompData/AnimationController.cs | 2 +-
.../WinCompData/BooleanKeyFrameAnimation.cs | 2 +-
source/WinCompData/ColorKeyFrameAnimation.cs | 2 +-
source/WinCompData/CompositionAnimation.cs | 2 +-
source/WinCompData/CompositionBorderMode.cs | 2 +-
source/WinCompData/CompositionBrush.cs | 2 +-
source/WinCompData/CompositionClip.cs | 2 +-
source/WinCompData/CompositionColorBrush.cs | 2 +-
.../CompositionColorGradientStop.cs | 2 +-
source/WinCompData/CompositionColorSpace.cs | 2 +-
.../WinCompData/CompositionContainerShape.cs | 2 +-
.../CompositionDropShadowSourcePolicy.cs | 2 +-
.../WinCompData/CompositionEasingFunction.cs | 2 +-
source/WinCompData/CompositionEffectBrush.cs | 4 +-
.../WinCompData/CompositionEffectFactory.cs | 4 +-
.../CompositionEffectSourceParameter.cs | 2 +-
.../WinCompData/CompositionEllipseGeometry.cs | 2 +-
.../WinCompData/CompositionGeometricClip.cs | 2 +-
source/WinCompData/CompositionGeometry.cs | 2 +-
.../WinCompData/CompositionGetValueStatus.cs | 2 +-
.../WinCompData/CompositionGradientBrush.cs | 2 +-
.../CompositionGradientExtendMode.cs | 2 +-
.../CompositionLinearGradientBrush.cs | 2 +-
source/WinCompData/CompositionMappingMode.cs | 2 +-
source/WinCompData/CompositionMaskBrush.cs | 2 +-
source/WinCompData/CompositionObject.cs | 2 +-
source/WinCompData/CompositionObjectType.cs | 2 +-
source/WinCompData/CompositionPath.cs | 2 +-
source/WinCompData/CompositionPathGeometry.cs | 2 +-
source/WinCompData/CompositionPropertySet.cs | 6 +-
.../CompositionRadialGradientBrush.cs | 2 +-
.../CompositionRectangleGeometry.cs | 2 +-
.../CompositionRoundedRectangleGeometry.cs | 2 +-
source/WinCompData/CompositionShadow.cs | 2 +-
source/WinCompData/CompositionShape.cs | 2 +-
source/WinCompData/CompositionSpriteShape.cs | 2 +-
source/WinCompData/CompositionStrokeCap.cs | 2 +-
.../WinCompData/CompositionStrokeLineJoin.cs | 2 +-
source/WinCompData/CompositionSurfaceBrush.cs | 2 +-
source/WinCompData/CompositionViewBox.cs | 2 +-
.../WinCompData/CompositionVisualSurface.cs | 2 +-
source/WinCompData/Compositor.cs | 6 +-
source/WinCompData/ContainerVisual.cs | 2 +-
.../WinCompData/CubicBezierEasingFunction.cs | 2 +-
source/WinCompData/DropShadow.cs | 4 +-
source/WinCompData/ExpressionAnimation.cs | 4 +-
source/WinCompData/Expressions/Boolean.cs | 2 +-
source/WinCompData/Expressions/Color.cs | 2 +-
source/WinCompData/Expressions/Expression.cs | 2 +-
.../WinCompData/Expressions/ExpressionType.cs | 2 +-
source/WinCompData/Expressions/Expression_.cs | 2 +-
source/WinCompData/Expressions/Matrix3x2.cs | 2 +-
source/WinCompData/Expressions/Precedence.cs | 2 +-
source/WinCompData/Expressions/Scalar.cs | 2 +-
source/WinCompData/Expressions/Vector2.cs | 2 +-
source/WinCompData/Expressions/Vector3.cs | 2 +-
source/WinCompData/Expressions/Vector4.cs | 2 +-
source/WinCompData/Expressions/Void.cs | 2 +-
source/WinCompData/ICompositionSurface.cs | 2 +-
source/WinCompData/IContainShapes.cs | 2 +-
source/WinCompData/IDescribable.cs | 2 +-
source/WinCompData/InsetClip.cs | 2 +-
source/WinCompData/KeyFrameAnimation.cs | 4 +-
source/WinCompData/KeyFrameAnimation_.cs | 4 +-
source/WinCompData/KeyFrameType.cs | 2 +-
source/WinCompData/LayerVisual.cs | 2 +-
source/WinCompData/LinearEasingFunction.cs | 2 +-
.../MetaData/PropertySetValueType.cs | 2 +-
.../MetaData/UapVersionAttribute.cs | 2 +-
source/WinCompData/Mgc/CanvasComposite.cs | 2 +-
source/WinCompData/Mgc/CanvasDevice.cs | 2 +-
source/WinCompData/Mgce/CompositeEffect.cs | 4 +-
source/WinCompData/Mgce/GaussianBlurEffect.cs | 2 +-
source/WinCompData/Mgce/GraphicsEffectBase.cs | 2 +-
source/WinCompData/Mgce/GraphicsEffectType.cs | 2 +-
source/WinCompData/Mgcg/CanvasFigureLoop.cs | 2 +-
.../Mgcg/CanvasFilledRegionDetermination.cs | 2 +-
source/WinCompData/Mgcg/CanvasGeometry.cs | 6 +-
.../WinCompData/Mgcg/CanvasGeometryCombine.cs | 2 +-
source/WinCompData/Mgcg/CanvasPathBuilder.cs | 4 +-
source/WinCompData/PathKeyFrameAnimation.cs | 2 +-
source/WinCompData/ScalarKeyFrameAnimation.cs | 2 +-
source/WinCompData/ShapeVisual.cs | 2 +-
source/WinCompData/SpriteVisual.cs | 2 +-
source/WinCompData/StepEasingFunction.cs | 2 +-
.../WinCompData/Vector2KeyFrameAnimation.cs | 2 +-
.../WinCompData/Vector3KeyFrameAnimation.cs | 2 +-
.../WinCompData/Vector4KeyFrameAnimation.cs | 2 +-
source/WinCompData/Visual.cs | 2 +-
source/WinCompData/Wg/IGeometrySource2D.cs | 2 +-
source/WinCompData/Wui/Color.cs | 6 +-
source/WinCompData/Wui/Colors.cs | 2 +-
.../IRandomAccessStream.cs | 2 +-
.../WinUIXamlMediaData/LoadedImageSurface.cs | 6 +-
.../LoadedImageSurfaceFromStream.cs | 2 +-
.../LoadedImageSurfaceFromUri.cs | 2 +-
source/YamlData/YamlFactory.cs | 2 +-
source/YamlData/YamlMap.cs | 2 +-
source/YamlData/YamlObject.cs | 2 +-
source/YamlData/YamlObjectKind.cs | 2 +-
source/YamlData/YamlScalar.cs | 2 +-
source/YamlData/YamlSequence.cs | 2 +-
source/YamlData/YamlWriter.cs | 2 +-
379 files changed, 959 insertions(+), 785 deletions(-)
create mode 100644 Lottie-Windows-WinUI3/Lottie-Windows-WinUI3.csproj
diff --git a/Lottie-Windows-WinUI3/Lottie-Windows-WinUI3.csproj b/Lottie-Windows-WinUI3/Lottie-Windows-WinUI3.csproj
new file mode 100644
index 0000000..1e19039
--- /dev/null
+++ b/Lottie-Windows-WinUI3/Lottie-Windows-WinUI3.csproj
@@ -0,0 +1,39 @@
+
+
+
+ Library
+ CommunityToolkit.WinUI.Lottie
+ CommunityToolkit.WinUI.Lottie
+ CommunityToolkit.WinUI.Lottie
+ net5.0-windows10.0.18362.0
+ enable
+ Microsoft
+ x64;x86
+ WINAPPSDK
+ False
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Lottie-Windows.sln b/Lottie-Windows.sln
index 02ed9fa..efcec22 100644
--- a/Lottie-Windows.sln
+++ b/Lottie-Windows.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29509.3
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32505.173
MinimumVisualStudioVersion = 10.0.40219.1
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Lottie", "source\Lottie\Lottie.shproj", "{8EF7BD77-28E9-4998-8DBB-8036F988FE65}"
EndProject
@@ -179,104 +179,9 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "LottieGenExe", "source\Lott
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LottieGen.MsBuild", "LottieGen\MSBuildTask\LottieGen.MsBuild.csproj", "{192FBD28-8531-4607-A17C-44A1A51A1565}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lottie-Windows-WinUI3", "Lottie-Windows-WinUI3\Lottie-Windows-WinUI3.csproj", "{C505CD2D-5D26-42EE-8FAA-41BB784821EF}"
+EndProject
Global
- GlobalSection(SharedMSBuildProjectFiles) = preSolution
- source\LottieToWinComp\LottieToWinComp.projitems*{0340244a-683c-405e-838b-f93872779532}*SharedItemsImports = 13
- source\LottieMetadata\LottieMetadata.projitems*{04b43a1a-ddfb-4a61-bf36-39f5e666c702}*SharedItemsImports = 13
- source\WinUIXamlMediaData\WinUIXamlMediaData.projitems*{12059276-646c-47a4-8d24-c92cfd99ec04}*SharedItemsImports = 5
- source\WinStorageStreamsData\WinStorageStreamsData.projitems*{1bbcfeed-5929-4ff7-8885-b94eaf65567c}*SharedItemsImports = 5
- source\WinStorageStreamsData\WinStorageStreamsData.projitems*{2202e218-dd9f-496a-aef4-3f07f0ea5b9d}*SharedItemsImports = 13
- source\LottieMetadata\LottieMetadata.projitems*{25ceb8b8-90e0-4d23-9978-0cd83889d4ac}*SharedItemsImports = 5
- source\WinUIXamlMediaData\WinUIXamlMediaData.projitems*{30059ca7-0745-4eec-8d11-b14850a70c98}*SharedItemsImports = 13
- source\YamlData\YamlData.projitems*{39c6b7f3-5e75-4019-82ab-00fd8a0a06e2}*SharedItemsImports = 13
- source\LottieReader\LottieReader.projitems*{4e7d8957-3f5f-46e1-99a8-2012b806c9b0}*SharedItemsImports = 13
- source\Animatables\Animatables.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
- source\CompMetadata\CompMetadata.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
- source\DotLottie\DotLottie.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
- source\GenericData\GenericData.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
- source\LottieData\LottieData.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
- source\LottieMetadata\LottieMetadata.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
- source\LottieReader\LottieReader.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
- source\LottieToWinComp\LottieToWinComp.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
- source\Lottie\Lottie.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
- source\NullablesAttributes\NullablesAttributes.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
- source\UIData\UIData.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
- source\WinCompData\WinCompData.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
- source\WinStorageStreamsData\WinStorageStreamsData.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
- source\WinUIXamlMediaData\WinUIXamlMediaData.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
- source\YamlData\YamlData.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
- source\LottieData\LottieData.projitems*{6221591a-e8f4-4a5e-8f0c-2651c24ad495}*SharedItemsImports = 5
- source\WinCompData\WinCompData.projitems*{68317393-f5a5-4b2c-918a-688db2c10f54}*SharedItemsImports = 5
- source\Animatables\Animatables.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
- source\CompMetadata\CompMetadata.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
- source\DotLottie\DotLottie.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
- source\GenericData\GenericData.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
- source\LottieData\LottieData.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
- source\LottieGenExe\LottieGenExe.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
- source\LottieGen\LottieGen.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
- source\LottieMetadata\LottieMetadata.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
- source\LottieReader\LottieReader.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
- source\LottieToWinComp\LottieToWinComp.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
- source\UIDataCodeGen\UIDataCodeGen.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
- source\UIData\UIData.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
- source\WinCompData\WinCompData.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
- source\WinStorageStreamsData\WinStorageStreamsData.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
- source\WinUIXamlMediaData\WinUIXamlMediaData.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
- source\YamlData\YamlData.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
- source\NullablesAttributes\NullablesAttributes.projitems*{6ab50ed0-6273-4919-9ade-50195664ef15}*SharedItemsImports = 4
- source\DotLottie\DotLottie.projitems*{7012420d-624c-4bd4-a1d2-1c6c1655ed3a}*SharedItemsImports = 13
- source\UIData\UIData.projitems*{74601e6c-2dfe-4842-b170-047941abff2c}*SharedItemsImports = 13
- source\LottieGen\LottieGen.projitems*{7654a857-9a99-4185-9f8e-dd0ce662af23}*SharedItemsImports = 13
- source\GenericData\GenericData.projitems*{77bcd724-8555-463b-985f-f8e8110164c4}*SharedItemsImports = 13
- source\Animatables\Animatables.projitems*{88c07427-e8af-4f9d-a4fe-07eb2d975723}*SharedItemsImports = 5
- source\Lottie\Lottie.projitems*{8ef7bd77-28e9-4998-8dbb-8036f988fe65}*SharedItemsImports = 13
- source\UIData\UIData.projitems*{9a99e690-71d2-4e26-9000-0e0920394dfe}*SharedItemsImports = 5
- source\UIDataCodeGen\UIDataCodeGen.projitems*{9b6c0b7f-0d0f-4086-9746-0d34d7667db5}*SharedItemsImports = 5
- source\CompMetadata\CompMetadata.projitems*{a262757c-9f1a-4f6e-9188-849f4b709d67}*SharedItemsImports = 5
- source\GenericData\GenericData.projitems*{a687177e-31ff-4f05-89c6-03657c96a166}*SharedItemsImports = 5
- source\DotLottie\DotLottie.projitems*{ab2acc11-de31-4e47-8a5b-895d6934684f}*SharedItemsImports = 5
- source\CompMetadata\CompMetadata.projitems*{b0197c19-bdf5-473e-a022-e21f6122eee5}*SharedItemsImports = 13
- source\LottieData\LottieData.projitems*{b3db16ee-a821-4474-a188-e64926529bbd}*SharedItemsImports = 13
- source\LottieReader\LottieReader.projitems*{bb081e5a-cf3c-490f-8f8e-450a79f6ca33}*SharedItemsImports = 5
- source\LottieToWinComp\LottieToWinComp.projitems*{bcedf904-f986-42ec-a22d-e0662777b7f9}*SharedItemsImports = 5
- source\YamlData\YamlData.projitems*{cb587630-3cfd-4bb3-867c-3f5b1ffbc738}*SharedItemsImports = 5
- source\WinCompData\WinCompData.projitems*{d02870de-7ded-4916-85d4-3175ceedef74}*SharedItemsImports = 13
- source\UIDataCodeGen\UIDataCodeGen.projitems*{d02be6c8-14db-4b4f-8600-f3c9b69c104d}*SharedItemsImports = 13
- source\LottieGenExe\LottieGenExe.projitems*{dc7f7a39-b7a7-40b4-937a-601460cae38c}*SharedItemsImports = 13
- source\NullablesAttributes\NullablesAttributes.projitems*{e32587a8-94e8-4b68-91ad-f3612a48a62b}*SharedItemsImports = 13
- source\Animatables\Animatables.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
- source\CompMetadata\CompMetadata.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
- source\DotLottie\DotLottie.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
- source\GenericData\GenericData.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
- source\LottieData\LottieData.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
- source\LottieMetadata\LottieMetadata.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
- source\LottieReader\LottieReader.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
- source\LottieToWinComp\LottieToWinComp.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
- source\Lottie\Lottie.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
- source\NullablesAttributes\NullablesAttributes.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
- source\UIData\UIData.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
- source\WinCompData\WinCompData.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
- source\WinStorageStreamsData\WinStorageStreamsData.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
- source\WinUIXamlMediaData\WinUIXamlMediaData.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
- source\YamlData\YamlData.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
- source\Animatables\Animatables.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
- source\CompMetadata\CompMetadata.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
- source\DotLottie\DotLottie.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
- source\GenericData\GenericData.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
- source\LottieData\LottieData.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
- source\LottieGenExe\LottieGenExe.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
- source\LottieGen\LottieGen.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
- source\LottieMetadata\LottieMetadata.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
- source\LottieReader\LottieReader.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
- source\LottieToWinComp\LottieToWinComp.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
- source\UIDataCodeGen\UIDataCodeGen.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
- source\UIData\UIData.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
- source\WinCompData\WinCompData.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
- source\WinStorageStreamsData\WinStorageStreamsData.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
- source\WinUIXamlMediaData\WinUIXamlMediaData.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
- source\YamlData\YamlData.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
- source\Animatables\Animatables.projitems*{fc89273a-b2da-4625-8a73-ef02a658d65e}*SharedItemsImports = 13
- EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
BETA|Any CPU = BETA|Any CPU
BETA|ARM = BETA|ARM
@@ -674,6 +579,36 @@ Global
{192FBD28-8531-4607-A17C-44A1A51A1565}.Release|ARM64.ActiveCfg = Release|Any CPU
{192FBD28-8531-4607-A17C-44A1A51A1565}.Release|x64.ActiveCfg = Release|Any CPU
{192FBD28-8531-4607-A17C-44A1A51A1565}.Release|x86.ActiveCfg = Release|Any CPU
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.BETA|Any CPU.ActiveCfg = Debug|x64
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.BETA|Any CPU.Build.0 = Debug|x64
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.BETA|ARM.ActiveCfg = Debug|x64
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.BETA|ARM.Build.0 = Debug|x64
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.BETA|ARM64.ActiveCfg = Debug|x64
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.BETA|ARM64.Build.0 = Debug|x64
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.BETA|x64.ActiveCfg = Debug|x64
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.BETA|x64.Build.0 = Debug|x64
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.BETA|x86.ActiveCfg = Debug|x86
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.BETA|x86.Build.0 = Debug|x86
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|Any CPU.ActiveCfg = Debug|x64
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|Any CPU.Build.0 = Debug|x64
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|ARM.ActiveCfg = Debug|x64
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|ARM.Build.0 = Debug|x64
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|ARM64.ActiveCfg = Debug|x64
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|ARM64.Build.0 = Debug|x64
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|x64.ActiveCfg = Debug|x64
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|x64.Build.0 = Debug|x64
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|x86.ActiveCfg = Debug|x86
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Debug|x86.Build.0 = Debug|x86
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|Any CPU.ActiveCfg = Release|x64
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|Any CPU.Build.0 = Release|x64
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|ARM.ActiveCfg = Release|x64
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|ARM.Build.0 = Release|x64
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|ARM64.ActiveCfg = Release|x64
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|ARM64.Build.0 = Release|x64
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|x64.ActiveCfg = Release|x64
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|x64.Build.0 = Release|x64
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|x86.ActiveCfg = Release|x86
+ {C505CD2D-5D26-42EE-8FAA-41BB784821EF}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -718,4 +653,116 @@ Global
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {51B9BB4C-5196-41CF-950C-12B04AD8A61C}
EndGlobalSection
+ GlobalSection(SharedMSBuildProjectFiles) = preSolution
+ source\LottieToWinComp\LottieToWinComp.projitems*{0340244a-683c-405e-838b-f93872779532}*SharedItemsImports = 13
+ source\LottieMetadata\LottieMetadata.projitems*{04b43a1a-ddfb-4a61-bf36-39f5e666c702}*SharedItemsImports = 13
+ source\WinUIXamlMediaData\WinUIXamlMediaData.projitems*{12059276-646c-47a4-8d24-c92cfd99ec04}*SharedItemsImports = 5
+ source\WinStorageStreamsData\WinStorageStreamsData.projitems*{1bbcfeed-5929-4ff7-8885-b94eaf65567c}*SharedItemsImports = 5
+ source\WinStorageStreamsData\WinStorageStreamsData.projitems*{2202e218-dd9f-496a-aef4-3f07f0ea5b9d}*SharedItemsImports = 13
+ source\LottieMetadata\LottieMetadata.projitems*{25ceb8b8-90e0-4d23-9978-0cd83889d4ac}*SharedItemsImports = 5
+ source\WinUIXamlMediaData\WinUIXamlMediaData.projitems*{30059ca7-0745-4eec-8d11-b14850a70c98}*SharedItemsImports = 13
+ source\YamlData\YamlData.projitems*{39c6b7f3-5e75-4019-82ab-00fd8a0a06e2}*SharedItemsImports = 13
+ source\LottieReader\LottieReader.projitems*{4e7d8957-3f5f-46e1-99a8-2012b806c9b0}*SharedItemsImports = 13
+ source\Animatables\Animatables.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
+ source\CompMetadata\CompMetadata.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
+ source\DotLottie\DotLottie.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
+ source\GenericData\GenericData.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
+ source\LottieData\LottieData.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
+ source\LottieMetadata\LottieMetadata.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
+ source\LottieReader\LottieReader.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
+ source\LottieToWinComp\LottieToWinComp.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
+ source\Lottie\Lottie.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
+ source\NullablesAttributes\NullablesAttributes.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
+ source\UIData\UIData.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
+ source\WinCompData\WinCompData.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
+ source\WinStorageStreamsData\WinStorageStreamsData.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
+ source\WinUIXamlMediaData\WinUIXamlMediaData.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
+ source\YamlData\YamlData.projitems*{5120efd7-a556-46bf-8d56-f65f1ef9a305}*SharedItemsImports = 4
+ source\LottieData\LottieData.projitems*{6221591a-e8f4-4a5e-8f0c-2651c24ad495}*SharedItemsImports = 5
+ source\WinCompData\WinCompData.projitems*{68317393-f5a5-4b2c-918a-688db2c10f54}*SharedItemsImports = 5
+ source\Animatables\Animatables.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
+ source\CompMetadata\CompMetadata.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
+ source\DotLottie\DotLottie.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
+ source\GenericData\GenericData.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
+ source\LottieData\LottieData.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
+ source\LottieGenExe\LottieGenExe.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
+ source\LottieGen\LottieGen.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
+ source\LottieMetadata\LottieMetadata.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
+ source\LottieReader\LottieReader.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
+ source\LottieToWinComp\LottieToWinComp.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
+ source\UIDataCodeGen\UIDataCodeGen.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
+ source\UIData\UIData.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
+ source\WinCompData\WinCompData.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
+ source\WinStorageStreamsData\WinStorageStreamsData.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
+ source\WinUIXamlMediaData\WinUIXamlMediaData.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
+ source\YamlData\YamlData.projitems*{6984af37-d580-4087-806b-480a04f2df77}*SharedItemsImports = 5
+ source\NullablesAttributes\NullablesAttributes.projitems*{6ab50ed0-6273-4919-9ade-50195664ef15}*SharedItemsImports = 4
+ source\DotLottie\DotLottie.projitems*{7012420d-624c-4bd4-a1d2-1c6c1655ed3a}*SharedItemsImports = 13
+ source\UIData\UIData.projitems*{74601e6c-2dfe-4842-b170-047941abff2c}*SharedItemsImports = 13
+ source\LottieGen\LottieGen.projitems*{7654a857-9a99-4185-9f8e-dd0ce662af23}*SharedItemsImports = 13
+ source\GenericData\GenericData.projitems*{77bcd724-8555-463b-985f-f8e8110164c4}*SharedItemsImports = 13
+ source\Animatables\Animatables.projitems*{88c07427-e8af-4f9d-a4fe-07eb2d975723}*SharedItemsImports = 5
+ source\Lottie\Lottie.projitems*{8ef7bd77-28e9-4998-8dbb-8036f988fe65}*SharedItemsImports = 13
+ source\UIData\UIData.projitems*{9a99e690-71d2-4e26-9000-0e0920394dfe}*SharedItemsImports = 5
+ source\UIDataCodeGen\UIDataCodeGen.projitems*{9b6c0b7f-0d0f-4086-9746-0d34d7667db5}*SharedItemsImports = 5
+ source\CompMetadata\CompMetadata.projitems*{a262757c-9f1a-4f6e-9188-849f4b709d67}*SharedItemsImports = 5
+ source\GenericData\GenericData.projitems*{a687177e-31ff-4f05-89c6-03657c96a166}*SharedItemsImports = 5
+ source\DotLottie\DotLottie.projitems*{ab2acc11-de31-4e47-8a5b-895d6934684f}*SharedItemsImports = 5
+ source\CompMetadata\CompMetadata.projitems*{b0197c19-bdf5-473e-a022-e21f6122eee5}*SharedItemsImports = 13
+ source\LottieData\LottieData.projitems*{b3db16ee-a821-4474-a188-e64926529bbd}*SharedItemsImports = 13
+ source\LottieReader\LottieReader.projitems*{bb081e5a-cf3c-490f-8f8e-450a79f6ca33}*SharedItemsImports = 5
+ source\LottieToWinComp\LottieToWinComp.projitems*{bcedf904-f986-42ec-a22d-e0662777b7f9}*SharedItemsImports = 5
+ source\Animatables\Animatables.projitems*{c505cd2d-5d26-42ee-8faa-41bb784821ef}*SharedItemsImports = 5
+ source\CompMetadata\CompMetadata.projitems*{c505cd2d-5d26-42ee-8faa-41bb784821ef}*SharedItemsImports = 5
+ source\DotLottie\DotLottie.projitems*{c505cd2d-5d26-42ee-8faa-41bb784821ef}*SharedItemsImports = 5
+ source\GenericData\GenericData.projitems*{c505cd2d-5d26-42ee-8faa-41bb784821ef}*SharedItemsImports = 5
+ source\LottieData\LottieData.projitems*{c505cd2d-5d26-42ee-8faa-41bb784821ef}*SharedItemsImports = 5
+ source\LottieMetadata\LottieMetadata.projitems*{c505cd2d-5d26-42ee-8faa-41bb784821ef}*SharedItemsImports = 5
+ source\LottieReader\LottieReader.projitems*{c505cd2d-5d26-42ee-8faa-41bb784821ef}*SharedItemsImports = 5
+ source\LottieToWinComp\LottieToWinComp.projitems*{c505cd2d-5d26-42ee-8faa-41bb784821ef}*SharedItemsImports = 5
+ source\Lottie\Lottie.projitems*{c505cd2d-5d26-42ee-8faa-41bb784821ef}*SharedItemsImports = 5
+ source\NullablesAttributes\NullablesAttributes.projitems*{c505cd2d-5d26-42ee-8faa-41bb784821ef}*SharedItemsImports = 5
+ source\UIData\UIData.projitems*{c505cd2d-5d26-42ee-8faa-41bb784821ef}*SharedItemsImports = 5
+ source\WinCompData\WinCompData.projitems*{c505cd2d-5d26-42ee-8faa-41bb784821ef}*SharedItemsImports = 5
+ source\WinStorageStreamsData\WinStorageStreamsData.projitems*{c505cd2d-5d26-42ee-8faa-41bb784821ef}*SharedItemsImports = 5
+ source\WinUIXamlMediaData\WinUIXamlMediaData.projitems*{c505cd2d-5d26-42ee-8faa-41bb784821ef}*SharedItemsImports = 5
+ source\YamlData\YamlData.projitems*{c505cd2d-5d26-42ee-8faa-41bb784821ef}*SharedItemsImports = 5
+ source\YamlData\YamlData.projitems*{cb587630-3cfd-4bb3-867c-3f5b1ffbc738}*SharedItemsImports = 5
+ source\WinCompData\WinCompData.projitems*{d02870de-7ded-4916-85d4-3175ceedef74}*SharedItemsImports = 13
+ source\UIDataCodeGen\UIDataCodeGen.projitems*{d02be6c8-14db-4b4f-8600-f3c9b69c104d}*SharedItemsImports = 13
+ source\LottieGenExe\LottieGenExe.projitems*{dc7f7a39-b7a7-40b4-937a-601460cae38c}*SharedItemsImports = 13
+ source\NullablesAttributes\NullablesAttributes.projitems*{e32587a8-94e8-4b68-91ad-f3612a48a62b}*SharedItemsImports = 13
+ source\Animatables\Animatables.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
+ source\CompMetadata\CompMetadata.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
+ source\DotLottie\DotLottie.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
+ source\GenericData\GenericData.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
+ source\LottieData\LottieData.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
+ source\LottieMetadata\LottieMetadata.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
+ source\LottieReader\LottieReader.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
+ source\LottieToWinComp\LottieToWinComp.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
+ source\Lottie\Lottie.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
+ source\NullablesAttributes\NullablesAttributes.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
+ source\UIData\UIData.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
+ source\WinCompData\WinCompData.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
+ source\WinStorageStreamsData\WinStorageStreamsData.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
+ source\WinUIXamlMediaData\WinUIXamlMediaData.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
+ source\YamlData\YamlData.projitems*{e392bad0-f936-4b64-a445-552597795cc7}*SharedItemsImports = 5
+ source\Animatables\Animatables.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
+ source\CompMetadata\CompMetadata.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
+ source\DotLottie\DotLottie.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
+ source\GenericData\GenericData.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
+ source\LottieData\LottieData.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
+ source\LottieGenExe\LottieGenExe.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
+ source\LottieGen\LottieGen.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
+ source\LottieMetadata\LottieMetadata.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
+ source\LottieReader\LottieReader.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
+ source\LottieToWinComp\LottieToWinComp.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
+ source\UIDataCodeGen\UIDataCodeGen.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
+ source\UIData\UIData.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
+ source\WinCompData\WinCompData.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
+ source\WinStorageStreamsData\WinStorageStreamsData.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
+ source\WinUIXamlMediaData\WinUIXamlMediaData.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
+ source\YamlData\YamlData.projitems*{e91e3cde-3088-4b12-8472-d2c1c05b7229}*SharedItemsImports = 5
+ source\Animatables\Animatables.projitems*{fc89273a-b2da-4625-8a73-ef02a658d65e}*SharedItemsImports = 13
+ EndGlobalSection
EndGlobal
diff --git a/Lottie-Windows/Lottie-Windows.csproj b/Lottie-Windows/Lottie-Windows.csproj
index 305fec4..c1880c7 100644
--- a/Lottie-Windows/Lottie-Windows.csproj
+++ b/Lottie-Windows/Lottie-Windows.csproj
@@ -9,8 +9,9 @@
This library provides the LottieVisualSource which is consumed by the Microsoft.UI.Xaml.Controls.AnimatedVisualPlayer to render Lottie JSON files.
UWP Toolkit Windows Animations Lottie XAML
- Microsoft.Toolkit.Uwp.UI.Lottie
- Microsoft.Toolkit.Uwp.UI.Lottie
+ CommunityToolkit.WinUI.Lottie
+ CommunityToolkit.WinUI.Lottie
+ CommunityToolkit.Uwp.Lottie
@@ -18,12 +19,12 @@
none
- bin\AnyCPU\Release\Microsoft.Toolkit.Uwp.UI.Lottie.xml
+ bin\AnyCPU\Release\CommunityToolkit.WinUI.Lottie.xml
diff --git a/Lottie-Windows/README.md b/Lottie-Windows/README.md
index 7567c3d..9c5b3e4 100644
--- a/Lottie-Windows/README.md
+++ b/Lottie-Windows/README.md
@@ -1,11 +1,11 @@
# Lottie-Windows
-Lottie-Windows provides the [`LottieVisualSource`](https://docs.microsoft.com/dotnet/api/microsoft.toolkit.uwp.ui.lottie.lottievisualsource) which is consumed by the [`Microsoft.UI.Xaml.Controls.AnimatedVisualPlayer`](https://docs.microsoft.com/uwp/api/microsoft.ui.xaml.controls.animatedvisualplayer) to render Lottie JSON files.
+Lottie-Windows provides the [`LottieVisualSource`](https://docs.microsoft.com/dotnet/api/CommunityToolkit.WinUI.lottie.lottievisualsource) which is consumed by the [`Microsoft.UI.Xaml.Controls.AnimatedVisualPlayer`](https://docs.microsoft.com/uwp/api/microsoft.ui.xaml.controls.animatedvisualplayer) to render Lottie JSON files.
The Lottie-Windows project generates a NuGet package for use by Windows apps.
## Package locations
-* The [latest release and pre-release versions are on NuGet](https://www.nuget.org/packages/Microsoft.Toolkit.Uwp.UI.Lottie).
-* The NuGets for the latest CI builds are published to Azure DevOps. Links here for the [main branch](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_packaging?_a=package&feed=WindowsCommunityToolkit-MainLatest&protocolType=NuGet&package=Microsoft.Toolkit.Uwp.UI.Lottie) and for [PRs](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_packaging?_a=package&feed=WindowsCommunityToolkit-PullRequests&protocolType=NuGet&package=Microsoft.Toolkit.Uwp.UI.Lottie).
+* The [latest release and pre-release versions are on NuGet](https://www.nuget.org/packages/CommunityToolkit.WinUI.Lottie).
+* The NuGets for the latest CI builds are published to Azure DevOps. Links here for the [main branch](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_packaging?_a=package&feed=WindowsCommunityToolkit-MainLatest&protocolType=NuGet&package=CommunityToolkit.WinUI.Lottie) and for [PRs](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_packaging?_a=package&feed=WindowsCommunityToolkit-PullRequests&protocolType=NuGet&package=CommunityToolkit.WinUI.Lottie).
See the [Windows Community Toolkit wiki](https://github.com/windows-toolkit/WindowsCommunityToolkit/wiki/Preview-Packages) for details.
* The latest local build is output to the bin\nupkg directory in your repo directory.
diff --git a/LottieGen/DotnetTool/Program.cs b/LottieGen/DotnetTool/Program.cs
index 54d1bf1..b5c2e0a 100644
--- a/LottieGen/DotnetTool/Program.cs
+++ b/LottieGen/DotnetTool/Program.cs
@@ -5,5 +5,5 @@
static class Program
{
static int Main(string[] args)
- => Microsoft.Toolkit.Uwp.UI.Lottie.LottieGenExe.Main.Run(args);
+ => CommunityToolkit.WinUI.Lottie.LottieGenExe.Main.Run(args);
}
diff --git a/LottieGen/README.md b/LottieGen/README.md
index dd50b65..0d94a59 100644
--- a/LottieGen/README.md
+++ b/LottieGen/README.md
@@ -34,7 +34,7 @@ CI builds can be installed from Azure DevOps. From the [main branch](https://dev
dotnet tool install -g LottieGen --add-source https://pkgs.dev.azure.com/dotnet/WindowsCommunityToolkit/_packaging/WindowsCommunityToolkit-MainLatest/nuget/v3/index.json --version 7.0.0-build.2
-From [PRs](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_packaging?_a=package&feed=WindowsCommunityToolkit-PullRequests&protocolType=NuGet&package=Microsoft.Toolkit.Uwp.UI.LottieGen):
+From [PRs](https://dev.azure.com/dotnet/WindowsCommunityToolkit/_packaging?_a=package&feed=WindowsCommunityToolkit-PullRequests&protocolType=NuGet&package=CommunityToolkit.WinUI.LottieGen):
dotnet tool install -g LottieGen --add-source https://pkgs.dev.azure.com/dotnet/WindowsCommunityToolkit/_packaging/WindowsCommunityToolkit-PullRequests/nuget/v3/index.json --version 7.0.0-build.2
diff --git a/LottieGen/win-x64/LottieGen.win-x64.csproj b/LottieGen/win-x64/LottieGen.win-x64.csproj
index 951cc3a..6d0dfe5 100644
--- a/LottieGen/win-x64/LottieGen.win-x64.csproj
+++ b/LottieGen/win-x64/LottieGen.win-x64.csproj
@@ -30,7 +30,7 @@
<_SourceDir>..\..\source\
- Microsoft.Toolkit.Uwp.UI.Lottie.LottieGenExe.Program
+ CommunityToolkit.WinUI.Lottie.LottieGenExe.Program
diff --git a/LottieGen/win-x64/Program.cs b/LottieGen/win-x64/Program.cs
index 54d1bf1..b5c2e0a 100644
--- a/LottieGen/win-x64/Program.cs
+++ b/LottieGen/win-x64/Program.cs
@@ -5,5 +5,5 @@
static class Program
{
static int Main(string[] args)
- => Microsoft.Toolkit.Uwp.UI.Lottie.LottieGenExe.Main.Run(args);
+ => CommunityToolkit.WinUI.Lottie.LottieGenExe.Main.Run(args);
}
diff --git a/LottieViewer/LottieViewer.csproj b/LottieViewer/LottieViewer.csproj
index aa24296..fd9bffc 100644
--- a/LottieViewer/LottieViewer.csproj
+++ b/LottieViewer/LottieViewer.csproj
@@ -229,7 +229,7 @@
5.0.1
- 1.25.0
+ 1.26.0
diff --git a/LottieViewer/MainPage.xaml b/LottieViewer/MainPage.xaml
index 7c21bec..93b9769 100644
--- a/LottieViewer/MainPage.xaml
+++ b/LottieViewer/MainPage.xaml
@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:LottieViewer"
- xmlns:lottie="using:Microsoft.Toolkit.Uwp.UI.Lottie"
+ xmlns:lottie="using:CommunityToolkit.WinUI.Lottie"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:viewmodel="using:LottieViewer.ViewModel"
Visibility="Visible"
mc:Ignorable="d"
diff --git a/LottieViewer/PaletteColorPicker.xaml.cs b/LottieViewer/PaletteColorPicker.xaml.cs
index 15d44d9..5c21ff5 100644
--- a/LottieViewer/PaletteColorPicker.xaml.cs
+++ b/LottieViewer/PaletteColorPicker.xaml.cs
@@ -8,9 +8,9 @@ using System;
using System.Collections.ObjectModel;
using System.Collections.Specialized;
using System.Numerics;
+using CommunityToolkit.WinUI.Lottie.CompMetadata;
+using CommunityToolkit.WinUI.Lottie.WinCompData.MetaData;
using LottieViewer.ViewModel;
-using Microsoft.Toolkit.Uwp.UI.Lottie.CompMetadata;
-using Microsoft.Toolkit.Uwp.UI.Lottie.WinCompData.MetaData;
using Windows.UI;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
@@ -102,7 +102,7 @@ namespace LottieViewer
{
if (item.ExposedType == PropertySetValueType.Color)
{
- var color = (Microsoft.Toolkit.Uwp.UI.Lottie.WinCompData.Wui.Color)item.DefaultValue;
+ var color = (CommunityToolkit.WinUI.Lottie.WinCompData.Wui.Color)item.DefaultValue;
var entry = new ColorPaletteEntry(Color.FromArgb(color.A, color.R, color.G, color.B), item.DisplayName);
PaletteEntries.Add(entry);
entry.PropertyChanged += (_, args) =>
diff --git a/LottieViewer/Stage.xaml b/LottieViewer/Stage.xaml
index ebb0c5b..9019e0d 100644
--- a/LottieViewer/Stage.xaml
+++ b/LottieViewer/Stage.xaml
@@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:LottieViewer"
- xmlns:lottie="using:Microsoft.Toolkit.Uwp.UI.Lottie"
+ xmlns:lottie="using:CommunityToolkit.WinUI.Lottie"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:viewmodel="using:LottieViewer.ViewModel"
diff --git a/LottieViewer/ViewModel/LottieVisualDiagnosticsViewModel.cs b/LottieViewer/ViewModel/LottieVisualDiagnosticsViewModel.cs
index f40b4a8..0c6185a 100644
--- a/LottieViewer/ViewModel/LottieVisualDiagnosticsViewModel.cs
+++ b/LottieViewer/ViewModel/LottieVisualDiagnosticsViewModel.cs
@@ -8,9 +8,9 @@ using System;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Linq;
-using Microsoft.Toolkit.Uwp.UI.Lottie;
-using Microsoft.Toolkit.Uwp.UI.Lottie.CompMetadata;
-using Microsoft.Toolkit.Uwp.UI.Lottie.LottieMetadata;
+using CommunityToolkit.WinUI.Lottie;
+using CommunityToolkit.WinUI.Lottie.CompMetadata;
+using CommunityToolkit.WinUI.Lottie.LottieMetadata;
using Windows.Media.Audio;
namespace LottieViewer.ViewModel
diff --git a/source/Animatables/Animatable.cs b/source/Animatables/Animatable.cs
index 06c2fdb..5b6c885 100644
--- a/source/Animatables/Animatable.cs
+++ b/source/Animatables/Animatable.cs
@@ -9,7 +9,7 @@ using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
///
/// A value that may be animated.
diff --git a/source/Animatables/AnimatableVector2.cs b/source/Animatables/AnimatableVector2.cs
index 88b7b7f..0138e07 100644
--- a/source/Animatables/AnimatableVector2.cs
+++ b/source/Animatables/AnimatableVector2.cs
@@ -6,7 +6,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
///
/// An animatable Vector2 value expressed as a single animatable Vector2 value.
diff --git a/source/Animatables/AnimatableVector2Type.cs b/source/Animatables/AnimatableVector2Type.cs
index 94470f1..a5ee36d 100644
--- a/source/Animatables/AnimatableVector2Type.cs
+++ b/source/Animatables/AnimatableVector2Type.cs
@@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
#if PUBLIC_Animatables
public
diff --git a/source/Animatables/AnimatableVector3.cs b/source/Animatables/AnimatableVector3.cs
index ccf1c3c..98b933d 100644
--- a/source/Animatables/AnimatableVector3.cs
+++ b/source/Animatables/AnimatableVector3.cs
@@ -6,7 +6,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
///
/// An animatable Vector3 value expressed as a single animatable Vector3 value.
diff --git a/source/Animatables/AnimatableVector3Type.cs b/source/Animatables/AnimatableVector3Type.cs
index 7b788da..19ffd94 100644
--- a/source/Animatables/AnimatableVector3Type.cs
+++ b/source/Animatables/AnimatableVector3Type.cs
@@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
#if PUBLIC_Animatables
public
diff --git a/source/Animatables/AnimatableXY.cs b/source/Animatables/AnimatableXY.cs
index 7daa5bc..653a903 100644
--- a/source/Animatables/AnimatableXY.cs
+++ b/source/Animatables/AnimatableXY.cs
@@ -4,7 +4,7 @@
using System;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
///
/// An animatable Vector3 value expressed as 2 animatable floating point values.
diff --git a/source/Animatables/AnimatableXYZ.cs b/source/Animatables/AnimatableXYZ.cs
index 3b525f3..cd3ae9c 100644
--- a/source/Animatables/AnimatableXYZ.cs
+++ b/source/Animatables/AnimatableXYZ.cs
@@ -4,7 +4,7 @@
using System;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
///
/// An animatable Vector3 value expressed as 3 animatable floating point values.
diff --git a/source/Animatables/BezierSegment.cs b/source/Animatables/BezierSegment.cs
index a57bafc..2d160ec 100644
--- a/source/Animatables/BezierSegment.cs
+++ b/source/Animatables/BezierSegment.cs
@@ -6,9 +6,9 @@
using System;
using System.Collections.Generic;
-using static Microsoft.Toolkit.Uwp.UI.Lottie.Animatables.Exceptions;
+using static CommunityToolkit.WinUI.Lottie.Animatables.Exceptions;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
///
/// A segment defined as a cubic Bezier curve from to .
diff --git a/source/Animatables/Color.cs b/source/Animatables/Color.cs
index f18657f..a63052f 100644
--- a/source/Animatables/Color.cs
+++ b/source/Animatables/Color.cs
@@ -6,7 +6,7 @@
using System;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
#if PUBLIC_Animatables
public
diff --git a/source/Animatables/ColorGradientStop.cs b/source/Animatables/ColorGradientStop.cs
index 53307d2..fdaf687 100644
--- a/source/Animatables/ColorGradientStop.cs
+++ b/source/Animatables/ColorGradientStop.cs
@@ -6,7 +6,7 @@
using System;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
#if PUBLIC_Animatables
public
diff --git a/source/Animatables/CubicBezier.cs b/source/Animatables/CubicBezier.cs
index 422c959..8dd4c00 100644
--- a/source/Animatables/CubicBezier.cs
+++ b/source/Animatables/CubicBezier.cs
@@ -6,7 +6,7 @@
using System;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
///
/// Describes a cubic Bezier function as the 2nd and 3rd control points where
diff --git a/source/Animatables/CubicBezierEasing.cs b/source/Animatables/CubicBezierEasing.cs
index 77af5b4..98756e4 100644
--- a/source/Animatables/CubicBezierEasing.cs
+++ b/source/Animatables/CubicBezierEasing.cs
@@ -8,7 +8,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
#if PUBLIC_Animatables
public
diff --git a/source/Animatables/Easing.cs b/source/Animatables/Easing.cs
index 30a132d..a4ce5fd 100644
--- a/source/Animatables/Easing.cs
+++ b/source/Animatables/Easing.cs
@@ -5,9 +5,9 @@
#nullable enable
using System;
-using static Microsoft.Toolkit.Uwp.UI.Lottie.Animatables.Exceptions;
+using static CommunityToolkit.WinUI.Lottie.Animatables.Exceptions;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
#if PUBLIC_Animatables
public
diff --git a/source/Animatables/Enum.cs b/source/Animatables/Enum.cs
index a08adda..7c79885 100644
--- a/source/Animatables/Enum.cs
+++ b/source/Animatables/Enum.cs
@@ -6,7 +6,7 @@
using System;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
///
/// Wraps an enum, but implemented as a struct so that
diff --git a/source/Animatables/Exceptions.cs b/source/Animatables/Exceptions.cs
index fddcc1c..69b4af0 100644
--- a/source/Animatables/Exceptions.cs
+++ b/source/Animatables/Exceptions.cs
@@ -4,7 +4,7 @@
using System;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
static class Exceptions
{
diff --git a/source/Animatables/ExtensionMethods.cs b/source/Animatables/ExtensionMethods.cs
index 4a250d7..959da10 100644
--- a/source/Animatables/ExtensionMethods.cs
+++ b/source/Animatables/ExtensionMethods.cs
@@ -6,7 +6,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
#if PUBLIC_Animatables
public
diff --git a/source/Animatables/GradientStop.cs b/source/Animatables/GradientStop.cs
index 69fb663..aa6dfb9 100644
--- a/source/Animatables/GradientStop.cs
+++ b/source/Animatables/GradientStop.cs
@@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
#if PUBLIC_Animatables
public
diff --git a/source/Animatables/HoldEasing.cs b/source/Animatables/HoldEasing.cs
index a614bd0..6bceadb 100644
--- a/source/Animatables/HoldEasing.cs
+++ b/source/Animatables/HoldEasing.cs
@@ -6,7 +6,7 @@
using System;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
///
/// An easing that holds the current value until the key frame time, then
diff --git a/source/Animatables/IAnimatableValue.cs b/source/Animatables/IAnimatableValue.cs
index 18aac7f..1b923a8 100644
--- a/source/Animatables/IAnimatableValue.cs
+++ b/source/Animatables/IAnimatableValue.cs
@@ -4,7 +4,7 @@
using System;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
#if PUBLIC_Animatables
public
diff --git a/source/Animatables/IAnimatableVector2.cs b/source/Animatables/IAnimatableVector2.cs
index 4b64782..e625ac7 100644
--- a/source/Animatables/IAnimatableVector2.cs
+++ b/source/Animatables/IAnimatableVector2.cs
@@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
#if PUBLIC_Animatables
public
diff --git a/source/Animatables/IAnimatableVector3.cs b/source/Animatables/IAnimatableVector3.cs
index 2a4bb8a..bb05bf6 100644
--- a/source/Animatables/IAnimatableVector3.cs
+++ b/source/Animatables/IAnimatableVector3.cs
@@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
#if PUBLIC_Animatables
public
diff --git a/source/Animatables/IGradient.cs b/source/Animatables/IGradient.cs
index 8dfda14..9dbec9f 100644
--- a/source/Animatables/IGradient.cs
+++ b/source/Animatables/IGradient.cs
@@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
#if PUBLIC_Animatables
public
diff --git a/source/Animatables/IRadialGradient.cs b/source/Animatables/IRadialGradient.cs
index d4e33c2..c4a7612 100644
--- a/source/Animatables/IRadialGradient.cs
+++ b/source/Animatables/IRadialGradient.cs
@@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
#if PUBLIC_Animatables
public
diff --git a/source/Animatables/KeyFrame.cs b/source/Animatables/KeyFrame.cs
index 06e0aaa..b37644a 100644
--- a/source/Animatables/KeyFrame.cs
+++ b/source/Animatables/KeyFrame.cs
@@ -6,7 +6,7 @@
using System;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
///
/// Describes a value at a particular point in time, and an optional easing function to
diff --git a/source/Animatables/LinearEasing.cs b/source/Animatables/LinearEasing.cs
index 28e842a..eb1e6ff 100644
--- a/source/Animatables/LinearEasing.cs
+++ b/source/Animatables/LinearEasing.cs
@@ -6,7 +6,7 @@
using System;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
#if PUBLIC_Animatables
public
diff --git a/source/Animatables/Opacity.cs b/source/Animatables/Opacity.cs
index bd4e3ac..449a36c 100644
--- a/source/Animatables/Opacity.cs
+++ b/source/Animatables/Opacity.cs
@@ -6,7 +6,7 @@
using System;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
///
/// An opacity value. 0 is transparent, 1 is opaque.
diff --git a/source/Animatables/OpacityGradientStop.cs b/source/Animatables/OpacityGradientStop.cs
index a1fd9d1..6075736 100644
--- a/source/Animatables/OpacityGradientStop.cs
+++ b/source/Animatables/OpacityGradientStop.cs
@@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
#if PUBLIC_Animatables
public
diff --git a/source/Animatables/PathGeometry.cs b/source/Animatables/PathGeometry.cs
index 839db04..ddfe813 100644
--- a/source/Animatables/PathGeometry.cs
+++ b/source/Animatables/PathGeometry.cs
@@ -8,7 +8,7 @@ using System;
using System.Diagnostics.Contracts;
using System.Linq;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
///
/// A sequence of s that describes the shape of a path.
diff --git a/source/Animatables/Rotation.cs b/source/Animatables/Rotation.cs
index 9f64d40..71471b8 100644
--- a/source/Animatables/Rotation.cs
+++ b/source/Animatables/Rotation.cs
@@ -6,7 +6,7 @@
using System;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
///
/// A rotation value.
diff --git a/source/Animatables/Sequence.cs b/source/Animatables/Sequence.cs
index 933869b..70ed184 100644
--- a/source/Animatables/Sequence.cs
+++ b/source/Animatables/Sequence.cs
@@ -9,7 +9,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Linq;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
///
/// A sequence of items.
diff --git a/source/Animatables/Trim.cs b/source/Animatables/Trim.cs
index 7c6a77b..5418200 100644
--- a/source/Animatables/Trim.cs
+++ b/source/Animatables/Trim.cs
@@ -5,7 +5,7 @@
#nullable enable
using System;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
///
/// A trimming amount. Used to describe how much of a path should be trimmed.
diff --git a/source/Animatables/Vector2.cs b/source/Animatables/Vector2.cs
index 81a59cd..424ed63 100644
--- a/source/Animatables/Vector2.cs
+++ b/source/Animatables/Vector2.cs
@@ -7,7 +7,7 @@
using System;
using SnVector2 = System.Numerics.Vector2;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
#if PUBLIC_Animatables
public
diff --git a/source/Animatables/Vector3.cs b/source/Animatables/Vector3.cs
index 89c9046..4ea30db 100644
--- a/source/Animatables/Vector3.cs
+++ b/source/Animatables/Vector3.cs
@@ -4,7 +4,7 @@
using System;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
+namespace CommunityToolkit.WinUI.Lottie.Animatables
{
#if PUBLIC_Animatables
public
diff --git a/source/CompMetadata/PropertyBinding.cs b/source/CompMetadata/PropertyBinding.cs
index 27b69cf..f24ae4a 100644
--- a/source/CompMetadata/PropertyBinding.cs
+++ b/source/CompMetadata/PropertyBinding.cs
@@ -2,9 +2,9 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-using Microsoft.Toolkit.Uwp.UI.Lottie.WinCompData.MetaData;
+using CommunityToolkit.WinUI.Lottie.WinCompData.MetaData;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.CompMetadata
+namespace CommunityToolkit.WinUI.Lottie.CompMetadata
{
///
/// Describes a name bound to a value in a CompositionPropertySet.
diff --git a/source/DotLottie/DotLottieFile.cs b/source/DotLottie/DotLottieFile.cs
index 8a86e62..7854719 100644
--- a/source/DotLottie/DotLottieFile.cs
+++ b/source/DotLottie/DotLottieFile.cs
@@ -12,7 +12,7 @@ using System.Linq;
using System.Text.Json;
using System.Threading.Tasks;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.DotLottie
+namespace CommunityToolkit.WinUI.Lottie.DotLottie
{
///
/// Provides access to the contents of a .lottie file.
diff --git a/source/DotLottie/DotLottieFileAnimation.cs b/source/DotLottie/DotLottieFileAnimation.cs
index 1f48fc5..5cb7a9a 100644
--- a/source/DotLottie/DotLottieFileAnimation.cs
+++ b/source/DotLottie/DotLottieFileAnimation.cs
@@ -6,7 +6,7 @@
using System.IO;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.DotLottie
+namespace CommunityToolkit.WinUI.Lottie.DotLottie
{
///
/// Describes an animation in a .lottie file. Animations
diff --git a/source/DotLottie/InvalidLottieFileException.cs b/source/DotLottie/InvalidLottieFileException.cs
index a2c0eea..ebc76f9 100644
--- a/source/DotLottie/InvalidLottieFileException.cs
+++ b/source/DotLottie/InvalidLottieFileException.cs
@@ -6,7 +6,7 @@
using System;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.DotLottie
+namespace CommunityToolkit.WinUI.Lottie.DotLottie
{
sealed class InvalidLottieFileException : Exception
{
diff --git a/source/GenericData/GenericDataBool.cs b/source/GenericData/GenericDataBool.cs
index 92a7d71..34ffdc2 100644
--- a/source/GenericData/GenericDataBool.cs
+++ b/source/GenericData/GenericDataBool.cs
@@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.GenericData
+namespace CommunityToolkit.WinUI.Lottie.GenericData
{
#if PUBLIC_LottieData
public
diff --git a/source/GenericData/GenericDataList.cs b/source/GenericData/GenericDataList.cs
index 4babca0..aa953aa 100644
--- a/source/GenericData/GenericDataList.cs
+++ b/source/GenericData/GenericDataList.cs
@@ -9,7 +9,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Linq;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.GenericData
+namespace CommunityToolkit.WinUI.Lottie.GenericData
{
#if PUBLIC_LottieData
public
diff --git a/source/GenericData/GenericDataMap.cs b/source/GenericData/GenericDataMap.cs
index 90b69fd..4723534 100644
--- a/source/GenericData/GenericDataMap.cs
+++ b/source/GenericData/GenericDataMap.cs
@@ -8,7 +8,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Linq;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.GenericData
+namespace CommunityToolkit.WinUI.Lottie.GenericData
{
#if PUBLIC_LottieData
public
diff --git a/source/GenericData/GenericDataNumber.cs b/source/GenericData/GenericDataNumber.cs
index 94b4ae7..5276d9e 100644
--- a/source/GenericData/GenericDataNumber.cs
+++ b/source/GenericData/GenericDataNumber.cs
@@ -5,7 +5,7 @@
using System;
using System.Globalization;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.GenericData
+namespace CommunityToolkit.WinUI.Lottie.GenericData
{
#if PUBLIC_LottieData
public
diff --git a/source/GenericData/GenericDataObject.cs b/source/GenericData/GenericDataObject.cs
index d6ba564..d296db4 100644
--- a/source/GenericData/GenericDataObject.cs
+++ b/source/GenericData/GenericDataObject.cs
@@ -6,7 +6,7 @@
using System.Collections.Generic;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.GenericData
+namespace CommunityToolkit.WinUI.Lottie.GenericData
{
#if PUBLIC_LottieData
public
diff --git a/source/GenericData/GenericDataObjectType.cs b/source/GenericData/GenericDataObjectType.cs
index da18b5b..3dadf2b 100644
--- a/source/GenericData/GenericDataObjectType.cs
+++ b/source/GenericData/GenericDataObjectType.cs
@@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.GenericData
+namespace CommunityToolkit.WinUI.Lottie.GenericData
{
#if PUBLIC_LottieData
public
diff --git a/source/GenericData/GenericDataString.cs b/source/GenericData/GenericDataString.cs
index e62c8a1..34540ce 100644
--- a/source/GenericData/GenericDataString.cs
+++ b/source/GenericData/GenericDataString.cs
@@ -2,7 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
-namespace Microsoft.Toolkit.Uwp.UI.Lottie.GenericData
+namespace CommunityToolkit.WinUI.Lottie.GenericData
{
#if PUBLIC_LottieData
public
diff --git a/source/Issues/ParsingIssues.tt b/source/Issues/ParsingIssues.tt
index 5bcffd6..f95e249 100644
--- a/source/Issues/ParsingIssues.tt
+++ b/source/Issues/ParsingIssues.tt
@@ -1,6 +1,6 @@
<#@ include file="IssuesClassGenerator.t4" #>
<#+
const string className = "ParsingIssues";
- const string namespaceName = "Microsoft.Toolkit.Uwp.UI.Lottie.LottieData.Serialization";
+ const string namespaceName = "CommunityToolkit.WinUI.Lottie.LottieData.Serialization";
const string prefixFilter = "LP";
#>
\ No newline at end of file
diff --git a/source/Issues/TranslationIssues.tt b/source/Issues/TranslationIssues.tt
index 1148bdb..8490d5c 100644
--- a/source/Issues/TranslationIssues.tt
+++ b/source/Issues/TranslationIssues.tt
@@ -1,6 +1,6 @@
<#@ include file="IssuesClassGenerator.t4" #>
<#+
const string className = "TranslationIssues";
- const string namespaceName = "Microsoft.Toolkit.Uwp.UI.Lottie.LottieToWinComp";
+ const string namespaceName = "CommunityToolkit.WinUI.Lottie.LottieToWinComp";
const string prefixFilter = "LT";
#>
\ No newline at end of file
diff --git a/source/Issues/ValidationIssues.tt b/source/Issues/ValidationIssues.tt
index ce2b489..dcad172 100644
--- a/source/Issues/ValidationIssues.tt
+++ b/source/Issues/ValidationIssues.tt
@@ -1,6 +1,6 @@
<#@ include file="IssuesClassGenerator.t4" #>
<#+
const string className = "ValidationIssues";
- const string namespaceName = "Microsoft.Toolkit.Uwp.UI.Lottie.LottieData";
+ const string namespaceName = "CommunityToolkit.WinUI.Lottie.LottieData";
const string prefixFilter = "LV";
#>
\ No newline at end of file
diff --git a/source/Lottie/AnimatedVisualFactory.cs b/source/Lottie/AnimatedVisualFactory.cs
index 49f30ca..999998c 100644
--- a/source/Lottie/AnimatedVisualFactory.cs
+++ b/source/Lottie/AnimatedVisualFactory.cs
@@ -9,11 +9,16 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
-using Microsoft.Toolkit.Uwp.UI.Lottie.UIData.Tools;
+using CommunityToolkit.WinUI.Lottie.UIData.Tools;
using Microsoft.UI.Xaml.Controls;
-using Windows.UI.Composition;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie
+#if WINAPPSDK
+using Microsoft.UI.Composition;
+#else
+using Windows.UI.Composition;
+#endif
+
+namespace CommunityToolkit.WinUI.Lottie
{
///
/// Information from which a composition's content can be instantiated. Contains the WinCompData
diff --git a/source/Lottie/DisposableAnimatedVisual.cs b/source/Lottie/DisposableAnimatedVisual.cs
index 9d07e74..d1390e3 100644
--- a/source/Lottie/DisposableAnimatedVisual.cs
+++ b/source/Lottie/DisposableAnimatedVisual.cs
@@ -7,18 +7,23 @@
using System;
using System.Numerics;
using Microsoft.UI.Xaml.Controls;
-using Windows.UI.Composition;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie
+#if WINAPPSDK
+using Microsoft.UI.Composition;
+#else
+using Windows.UI.Composition;
+#endif
+
+namespace CommunityToolkit.WinUI.Lottie
{
sealed class DisposableAnimatedVisual : IAnimatedVisual, IDisposable
{
- internal DisposableAnimatedVisual(Visual? rootVisual)
+ internal DisposableAnimatedVisual(Visual rootVisual)
{
RootVisual = rootVisual;
}
- public Visual? RootVisual { get; }
+ public Visual RootVisual { get; }
public TimeSpan Duration { get; set; }
diff --git a/source/Lottie/DotLottieLoader.cs b/source/Lottie/DotLottieLoader.cs
index 5d0cdd7..82d9146 100644
--- a/source/Lottie/DotLottieLoader.cs
+++ b/source/Lottie/DotLottieLoader.cs
@@ -9,12 +9,18 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.IO.Compression;
using System.Threading.Tasks;
-using Microsoft.Toolkit.Uwp.UI.Lottie.DotLottie;
+using CommunityToolkit.WinUI.Lottie.DotLottie;
using Windows.Storage;
+
+#if WINAPPSDK
+using Microsoft.UI.Composition;
+using Microsoft.UI.Xaml.Media;
+#else
using Windows.UI.Composition;
using Windows.UI.Xaml.Media;
+#endif
-namespace Microsoft.Toolkit.Uwp.UI.Lottie
+namespace CommunityToolkit.WinUI.Lottie
{
///
/// Loads files that conform to the .lottie spec. See: https://dotlottie.io/.
diff --git a/source/Lottie/GenericDataToJson.cs b/source/Lottie/GenericDataToJson.cs
index 5dacb01..f706fa1 100644
--- a/source/Lottie/GenericDataToJson.cs
+++ b/source/Lottie/GenericDataToJson.cs
@@ -5,10 +5,10 @@
#nullable enable
using System;
-using Microsoft.Toolkit.Uwp.UI.Lottie.GenericData;
+using CommunityToolkit.WinUI.Lottie.GenericData;
using Windows.Data.Json;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie
+namespace CommunityToolkit.WinUI.Lottie
{
static class GenericDataToJson
{
diff --git a/source/Lottie/ImageAssetHandler.cs b/source/Lottie/ImageAssetHandler.cs
index 1f848ac..9b540e1 100644
--- a/source/Lottie/ImageAssetHandler.cs
+++ b/source/Lottie/ImageAssetHandler.cs
@@ -5,9 +5,14 @@
#nullable enable
using System;
-using Windows.UI.Composition;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie
+#if WINAPPSDK
+using Microsoft.UI.Composition;
+#else
+using Windows.UI.Composition;
+#endif
+
+namespace CommunityToolkit.WinUI.Lottie
{
///
/// A delegate that returns an for the given image uri.
@@ -15,7 +20,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Lottie
/// A surface for the image referenced by
/// or null.
/// Users can provide an in order to
- /// provide a bitmap for an image referenced in a Lottie file.
- ///
+ /// provide a bitmap for an image referenced in a Lottie file.
public delegate ICompositionSurface? ImageAssetHandler(Uri imageUri);
}
diff --git a/source/Lottie/InputStreamLoader.cs b/source/Lottie/InputStreamLoader.cs
index d9d12a0..46f8df4 100644
--- a/source/Lottie/InputStreamLoader.cs
+++ b/source/Lottie/InputStreamLoader.cs
@@ -9,9 +9,14 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Threading.Tasks;
using Windows.Storage.Streams;
-using Windows.UI.Composition;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie
+#if WINAPPSDK
+using Microsoft.UI.Composition;
+#else
+using Windows.UI.Composition;
+#endif
+
+namespace CommunityToolkit.WinUI.Lottie
{
///
/// A loader that loads from an .
diff --git a/source/Lottie/Instantiator.cs b/source/Lottie/Instantiator.cs
index 743bac7..3e61cdb 100644
--- a/source/Lottie/Instantiator.cs
+++ b/source/Lottie/Instantiator.cs
@@ -15,18 +15,24 @@ using System.Numerics;
using System.Runtime.InteropServices.WindowsRuntime;
using Microsoft.Graphics.Canvas.Geometry;
using Windows.Graphics.Effects;
-using Expr = Microsoft.Toolkit.Uwp.UI.Lottie.WinCompData.Expressions;
+using Expr = CommunityToolkit.WinUI.Lottie.WinCompData.Expressions;
using Mgc = Microsoft.Graphics.Canvas;
using Mgce = Microsoft.Graphics.Canvas.Effects;
+#if WINAPPSDK
+using Wc = Microsoft.UI.Composition;
+using Wm = Microsoft.UI.Xaml.Media;
+#else
using Wc = Windows.UI.Composition;
-using Wd = Microsoft.Toolkit.Uwp.UI.Lottie.WinCompData;
using Wm = Windows.UI.Xaml.Media;
-using Wmd = Microsoft.Toolkit.Uwp.UI.Lottie.WinUIXamlMediaData;
+#endif
+using Wd = CommunityToolkit.WinUI.Lottie.WinCompData;
+using Wmd = CommunityToolkit.WinUI.Lottie.WinUIXamlMediaData;
+using Wui = Windows.UI;
-namespace Microsoft.Toolkit.Uwp.UI.Lottie
+namespace CommunityToolkit.WinUI.Lottie
{
///
- /// Creates instances of a tree from a description
+ /// Creates instances of a tree from a description
/// of the tree.
///
sealed class Instantiator
@@ -53,7 +59,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Lottie
bool GetExisting(object key, [MaybeNullWhen(false)] out T result)
where T : class
{
- if (_cache.TryGetValue(key, out object cached))
+ if (_cache.TryGetValue(key, out object? cached))
{
result = (T)cached;
return true;
@@ -1607,8 +1613,8 @@ namespace Microsoft.Toolkit.Uwp.UI.Lottie
_ => throw new InvalidOperationException(),
};
- static Windows.UI.Color Color(Wd.Wui.Color color) =>
- Windows.UI.Color.FromArgb(color.A, color.R, color.G, color.B);
+ static Wui.Color Color(Wd.Wui.Color color) =>
+ Wui.Color.FromArgb(color.A, color.R, color.G, color.B);
static Wc.CompositionDropShadowSourcePolicy DropShadowSourcePolicy(Wd.CompositionDropShadowSourcePolicy value) =>
value switch
@@ -1694,7 +1700,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Lottie
sealed class ReferenceEqualsComparer : IEqualityComparer