CommunityToolkit
/
Lottie-Windows
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Namespace migration and WinUI3 package MicrosoftToolkit.WinUI.Lottie (#500)

This commit is contained in:
aborziak-ms 2022-05-25 10:18:30 -07:00 коммит произвёл GitHub
Родитель 63b9ad09f2
Коммит 9cec91294d
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
379 изменённых файлов: 959 добавлений и 785 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

39
Lottie-Windows-WinUI3/Lottie-Windows-WinUI3.csproj Normal file
Просмотреть файл

@ -0,0 +1,39 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Library</OutputType>
<RootNamespace>CommunityToolkit.WinUI.Lottie</RootNamespace>
<AssemblyName>CommunityToolkit.WinUI.Lottie</AssemblyName>
<PackageId>CommunityToolkit.WinUI.Lottie</PackageId>
<TargetFramework>net5.0-windows10.0.18362.0</TargetFramework>
<Nullable>enable</Nullable>
<CsWinRTIncludes>Microsoft</CsWinRTIncludes>
<Platforms>x64;x86</Platforms>
<DefineConstants>WINAPPSDK</DefineConstants>
<SignAssembly>False</SignAssembly>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.3.1" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.3" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.194" />
<PackageReference Include="System.Runtime.InteropServices.WindowsRuntime" Version="4.3.0" />
</ItemGroup>
<Import Project="..\source\Animatables\Animatables.projitems" Label="Shared" />
<Import Project="..\source\DotLottie\DotLottie.projitems" Label="Shared" />
<Import Project="..\source\CompMetadata\CompMetadata.projitems" Label="Shared" />
<Import Project="..\source\GenericData\GenericData.projitems" Label="Shared" />
<Import Project="..\source\Lottie\Lottie.projitems" Label="Shared" />
<Import Project="..\source\LottieData\LottieData.projitems" Label="Shared" />
<Import Project="..\source\LottieMetadata\LottieMetadata.projitems" Label="Shared" />
<Import Project="..\source\LottieReader\LottieReader.projitems" Label="Shared" />
<Import Project="..\source\LottieToWinComp\LottieToWinComp.projitems" Label="Shared" />
<Import Project="..\source\NullablesAttributes\NullablesAttributes.projitems" Label="Shared" />
<Import Project="..\source\UIData\UIData.projitems" Label="Shared" />
<Import Project="..\source\WinCompData\WinCompData.projitems" Label="Shared" />
<Import Project="..\source\WinStorageStreamsData\WinStorageStreamsData.projitems" Label="Shared" />
<Import Project="..\source\WinUIXamlMediaData\WinUIXamlMediaData.projitems" Label="Shared" />
<Import Project="..\source\YamlData\YamlData.projitems" Label="Shared" />
</Project>

245
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

9
Lottie-Windows/Lottie-Windows.csproj
Просмотреть файл

@ -9,8 +9,9 @@
<Description>This library provides the LottieVisualSource which is consumed by the Microsoft.UI.Xaml.Controls.AnimatedVisualPlayer to render Lottie JSON files.</Description>
<PackageTags>UWP Toolkit Windows Animations Lottie XAML</PackageTags>
<RootNamespace>Microsoft.Toolkit.Uwp.UI.Lottie</RootNamespace>
<AssemblyName>Microsoft.Toolkit.Uwp.UI.Lottie</AssemblyName>
<RootNamespace>CommunityToolkit.WinUI.Lottie</RootNamespace>
<AssemblyName>CommunityToolkit.WinUI.Lottie</AssemblyName>
<PackageId>CommunityToolkit.Uwp.Lottie</PackageId>
<!-- Enable the latest C# language features -->
@ -18,12 +19,12 @@
<!--
Turn off debugging information for now. It is causing errors with winmd generation because
the build system is creating Microsoft.Toolkit.Uwp.UI.Lottie.compile.pdb but the winmdexp
the build system is creating CommunityToolkit.WinUI.Lottie.compile.pdb but the winmdexp
task expects the name without the "compile." in it.
-->
<DebugType>none</DebugType>
<DocumentationFile>bin\AnyCPU\Release\Microsoft.Toolkit.Uwp.UI.Lottie.xml</DocumentationFile>
<DocumentationFile>bin\AnyCPU\Release\CommunityToolkit.WinUI.Lottie.xml</DocumentationFile>
</PropertyGroup>

6
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.

2
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);
}

2
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

2
LottieGen/win-x64/LottieGen.win-x64.csproj
Просмотреть файл

@ -30,7 +30,7 @@
<PropertyGroup>
<_SourceDir>..\..\source\</_SourceDir>
<StartupObject>Microsoft.Toolkit.Uwp.UI.Lottie.LottieGenExe.Program</StartupObject>
<StartupObject>CommunityToolkit.WinUI.Lottie.LottieGenExe.Program</StartupObject>
</PropertyGroup>
<Import Project="..\Common.proj" />

2
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);
}

2
LottieViewer/LottieViewer.csproj
Просмотреть файл

@ -229,7 +229,7 @@
<Version>5.0.1</Version>
</PackageReference>
<PackageReference Include="Win2D.uwp">
<Version>1.25.0</Version>
<Version>1.26.0</Version>
</PackageReference>
</ItemGroup>
<Import Project="..\source\CompMetadata\CompMetadata.projitems" Label="Shared" />

2
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"

6
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) =>

2
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"

6
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

2
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
{
/// <summary>
/// A value that may be animated.

2
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
{
/// <summary>
/// An animatable Vector2 value expressed as a single animatable Vector2 value.

2
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

2
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
{
/// <summary>
/// An animatable Vector3 value expressed as a single animatable Vector3 value.

2
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

2
source/Animatables/AnimatableXY.cs
Просмотреть файл

@ -4,7 +4,7 @@
using System;
namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
namespace CommunityToolkit.WinUI.Lottie.Animatables
{
/// <summary>
/// An animatable Vector3 value expressed as 2 animatable floating point values.

2
source/Animatables/AnimatableXYZ.cs
Просмотреть файл

@ -4,7 +4,7 @@
using System;
namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
namespace CommunityToolkit.WinUI.Lottie.Animatables
{
/// <summary>
/// An animatable Vector3 value expressed as 3 animatable floating point values.

4
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
{
/// <summary>
/// A segment defined as a cubic Bezier curve from <see cref="ControlPoint0"/> to <see cref="ControlPoint3"/>.

2
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

2
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

2
source/Animatables/CubicBezier.cs
Просмотреть файл

@ -6,7 +6,7 @@
using System;
namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
namespace CommunityToolkit.WinUI.Lottie.Animatables
{
/// <summary>
/// Describes a cubic Bezier function as the 2nd and 3rd control points where

2
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

4
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

2
source/Animatables/Enum.cs
Просмотреть файл

@ -6,7 +6,7 @@
using System;
namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
namespace CommunityToolkit.WinUI.Lottie.Animatables
{
/// <summary>
/// Wraps an enum, but implemented as a struct so that

2
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
{

2
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

2
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

2
source/Animatables/HoldEasing.cs
Просмотреть файл

@ -6,7 +6,7 @@
using System;
namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
namespace CommunityToolkit.WinUI.Lottie.Animatables
{
/// <summary>
/// An easing that holds the current value until the key frame time, then

2
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

2
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

2
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

2
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

2
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

2
source/Animatables/KeyFrame.cs
Просмотреть файл

@ -6,7 +6,7 @@
using System;
namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
namespace CommunityToolkit.WinUI.Lottie.Animatables
{
/// <summary>
/// Describes a value at a particular point in time, and an optional easing function to

2
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

2
source/Animatables/Opacity.cs
Просмотреть файл

@ -6,7 +6,7 @@
using System;
namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
namespace CommunityToolkit.WinUI.Lottie.Animatables
{
/// <summary>
/// An opacity value. 0 is transparent, 1 is opaque.

2
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

2
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
{
/// <summary>
/// A sequence of <see cref="BezierSegment"/>s that describes the shape of a path.

2
source/Animatables/Rotation.cs
Просмотреть файл

@ -6,7 +6,7 @@
using System;
namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
namespace CommunityToolkit.WinUI.Lottie.Animatables
{
/// <summary>
/// A rotation value.

2
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
{
/// <summary>
/// A sequence of items.

2
source/Animatables/Trim.cs
Просмотреть файл

@ -5,7 +5,7 @@
#nullable enable
using System;
namespace Microsoft.Toolkit.Uwp.UI.Lottie.Animatables
namespace CommunityToolkit.WinUI.Lottie.Animatables
{
/// <summary>
/// A trimming amount. Used to describe how much of a path should be trimmed.

2
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

2
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

4
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
{
/// <summary>
/// Describes a name bound to a value in a CompositionPropertySet.

2
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
{
/// <summary>
/// Provides access to the contents of a .lottie file.

2
source/DotLottie/DotLottieFileAnimation.cs
Просмотреть файл

@ -6,7 +6,7 @@
using System.IO;
namespace Microsoft.Toolkit.Uwp.UI.Lottie.DotLottie
namespace CommunityToolkit.WinUI.Lottie.DotLottie
{
/// <summary>
/// Describes an animation in a .lottie file. Animations

2
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
{

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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";
#>

2
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";
#>

2
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";
#>

11
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
{
/// <summary>
/// Information from which a composition's content can be instantiated. Contains the WinCompData

13
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; }

10
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
{
/// <summary>
/// Loads files that conform to the .lottie spec. See: https://dotlottie.io/.

4
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
{

12
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
{
/// <summary>
/// A delegate that returns an <see cref="ICompositionSurface"/> for the given image uri.
@ -15,7 +20,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Lottie
/// <returns>A surface for the image referenced by <paramref name="imageUri"/>
/// or null.</returns>
/// <remarks>Users can provide an <see cref="ImageAssetHandler"/> in order to
/// provide a bitmap for an image referenced in a Lottie file.
/// <seealso cref="LottieVisualSource.SetImageAssetHandler(ImageAssetHandler?)"/></remarks>
/// provide a bitmap for an image referenced in a Lottie file. </remarks>
public delegate ICompositionSurface? ImageAssetHandler(Uri imageUri);
}

9
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
{
/// <summary>
/// A loader that loads from an <see cref="IInputStream"/>.

24
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
{
/// <summary>
/// Creates instances of a <see cref="Windows.UI.Composition.Visual"/> tree from a description
/// Creates instances of a <see cref="Wc.Visual"/> tree from a description
/// of the tree.
/// </summary>
sealed class Instantiator
@ -53,7 +59,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Lottie
bool GetExisting<T>(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<object>
{
bool IEqualityComparer<object>.Equals(object x, object y) => ReferenceEquals(x, y);
bool IEqualityComparer<object>.Equals(object? x, object? y) => ReferenceEquals(x, y);
int IEqualityComparer<object>.GetHashCode(object obj) => obj.GetHashCode();
}

2
source/Lottie/Issue.cs
Просмотреть файл

@ -4,7 +4,7 @@
#nullable enable
namespace Microsoft.Toolkit.Uwp.UI.Lottie
namespace CommunityToolkit.WinUI.Lottie
{
/// <summary>
/// An issue that was discovered while reading or translating a Lottie JSON file.

19
source/Lottie/Loader.cs
Просмотреть файл

@ -10,15 +10,20 @@ using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.Toolkit.Uwp.UI.Lottie.CompMetadata;
using Microsoft.Toolkit.Uwp.UI.Lottie.LottieData;
using Microsoft.Toolkit.Uwp.UI.Lottie.LottieData.Optimization;
using Microsoft.Toolkit.Uwp.UI.Lottie.LottieData.Serialization;
using Microsoft.Toolkit.Uwp.UI.Lottie.LottieToWinComp;
using CommunityToolkit.WinUI.Lottie.CompMetadata;
using CommunityToolkit.WinUI.Lottie.LottieData;
using CommunityToolkit.WinUI.Lottie.LottieData.Optimization;
using CommunityToolkit.WinUI.Lottie.LottieData.Serialization;
using CommunityToolkit.WinUI.Lottie.LottieToWinComp;
using Windows.Foundation.Metadata;
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
{
/// <summary>
/// Handles loading a composition from a Lottie file. The result of the load

13
source/Lottie/LottieVisualDiagnostics.cs
Просмотреть файл

@ -6,11 +6,16 @@
using System;
using System.Collections.Generic;
using Microsoft.Toolkit.Uwp.UI.Lottie.CompMetadata;
using Microsoft.Toolkit.Uwp.UI.Lottie.LottieData;
using Windows.UI.Composition;
using CommunityToolkit.WinUI.Lottie.CompMetadata;
using CommunityToolkit.WinUI.Lottie.LottieData;
namespace Microsoft.Toolkit.Uwp.UI.Lottie
#if WINAPPSDK
using Microsoft.UI.Composition;
#else
using Windows.UI.Composition;
#endif
namespace CommunityToolkit.WinUI.Lottie
{
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member

2
source/Lottie/LottieVisualOptions.cs
Просмотреть файл

@ -4,7 +4,7 @@
using System;
namespace Microsoft.Toolkit.Uwp.UI.Lottie
namespace CommunityToolkit.WinUI.Lottie
{
/// <summary>
/// Options for controlling how the <see cref="LottieVisualSource"/> processes a Lottie file.

34
source/Lottie/LottieVisualSource.cs
Просмотреть файл

@ -5,17 +5,25 @@
#nullable enable
using System;
using System.Collections.Generic;
using System.Runtime.InteropServices.WindowsRuntime;
using System.Threading.Tasks;
using CommunityToolkit.WinUI.Lottie;
using Microsoft.UI.Xaml.Controls;
using Windows.Foundation;
using Windows.Foundation.Metadata;
using Windows.Storage;
using Windows.Storage.Streams;
#if WINAPPSDK
using Microsoft.UI.Composition;
using Microsoft.UI.Xaml;
#else
using Windows.UI.Composition;
using Windows.UI.Xaml;
#endif
namespace Microsoft.Toolkit.Uwp.UI.Lottie
namespace CommunityToolkit.WinUI.Lottie
{
/// <summary>
/// An <see cref="IAnimatedVisualSource"/> for a Lottie composition. This allows
@ -23,7 +31,12 @@ namespace Microsoft.Toolkit.Uwp.UI.Lottie
/// </summary>
public sealed class LottieVisualSource : DependencyObject, IDynamicAnimatedVisualSource
{
#if WINAPPSDK
HashSet<TypedEventHandler<IDynamicAnimatedVisualSource?, object?>> _compositionInvalidatedEventTokenTable = new HashSet<TypedEventHandler<IDynamicAnimatedVisualSource?, object?>>();
#else
EventRegistrationTokenTable<TypedEventHandler<IDynamicAnimatedVisualSource?, object?>>? _compositionInvalidatedEventTokenTable;
#endif
int _loadVersion;
Uri? _uriSource;
AnimatedVisualFactory? _animatedVisualFactory;
@ -146,16 +159,24 @@ namespace Microsoft.Toolkit.Uwp.UI.Lottie
{
add
{
#if WINAPPSDK
_compositionInvalidatedEventTokenTable.Add(value);
#else
return EventRegistrationTokenTable<TypedEventHandler<IDynamicAnimatedVisualSource?, object?>>
.GetOrCreateEventRegistrationTokenTable(ref _compositionInvalidatedEventTokenTable)
.AddEventHandler(value);
#endif
}
remove
{
#if WINAPPSDK
_compositionInvalidatedEventTokenTable.Remove(value);
#else
EventRegistrationTokenTable<TypedEventHandler<IDynamicAnimatedVisualSource?, object?>>
.GetOrCreateEventRegistrationTokenTable(ref _compositionInvalidatedEventTokenTable)
.RemoveEventHandler(value);
#endif
}
}
@ -190,7 +211,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Lottie
// No content has been loaded yet.
// Return an IAnimatedVisual that produces nothing.
diagnostics = null;
return new DisposableAnimatedVisual(null);
return null;
}
else
{
@ -203,9 +224,16 @@ namespace Microsoft.Toolkit.Uwp.UI.Lottie
void NotifyListenersThatCompositionChanged()
{
#if WINAPPSDK
foreach (var v in _compositionInvalidatedEventTokenTable)
{
v.Invoke(this, null);
}
#else
EventRegistrationTokenTable<TypedEventHandler<IDynamicAnimatedVisualSource?, object?>>
.GetOrCreateEventRegistrationTokenTable(ref _compositionInvalidatedEventTokenTable)
.InvocationList?.Invoke(this, null);
#endif
}
// Called when the UriSource property is updated.
@ -286,6 +314,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Lottie
}
}
#if !WINAPPSDK
/// <summary>
/// Returns a string representation of the <see cref="LottieVisualSource"/> for debugging purposes.
/// </summary>
@ -295,5 +324,6 @@ namespace Microsoft.Toolkit.Uwp.UI.Lottie
var identity = _uriSource?.ToString() ?? string.Empty;
return $"LottieVisualSource({identity})";
}
#endif
}
}

9
source/Lottie/StorageFileLoader.cs
Просмотреть файл

@ -10,9 +10,14 @@ using System.Diagnostics.CodeAnalysis;
using System.IO;
using System.Threading.Tasks;
using Windows.Storage;
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
{
/// <summary>
/// Loads files from a <see cref="StorageFile"/>. Supports raw

13
source/Lottie/UriLoader.cs
Просмотреть файл

@ -7,9 +7,16 @@
using System;
using System.IO;
using System.Threading.Tasks;
using Windows.UI.Composition;
namespace Microsoft.Toolkit.Uwp.UI.Lottie
#if WINAPPSDK
using Microsoft.UI.Composition;
#else
using Windows.UI.Composition;
#endif
using Wwh = Windows.Web.Http;
namespace CommunityToolkit.WinUI.Lottie
{
/// <summary>
/// Loads files from a Uri.
@ -56,7 +63,7 @@ namespace Microsoft.Toolkit.Uwp.UI.Lottie
var absoluteUri = Uris.GetAbsoluteUri(uri);
if (absoluteUri is not null)
{
var winrtClient = new Windows.Web.Http.HttpClient();
var winrtClient = new Wwh.HttpClient();
var response = await winrtClient.GetAsync(absoluteUri);
var result = await response.Content.ReadAsInputStreamAsync();

2
source/Lottie/Uris.cs
Просмотреть файл

@ -7,7 +7,7 @@
using System;
using System.Diagnostics.CodeAnalysis;
namespace Microsoft.Toolkit.Uwp.UI.Lottie
namespace CommunityToolkit.WinUI.Lottie
{
static class Uris
{

2
source/LottieData/Asset.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.LottieData
namespace CommunityToolkit.WinUI.Lottie.LottieData
{
#if PUBLIC_LottieData
public

2
source/LottieData/AssetCollection.cs
Просмотреть файл

@ -8,7 +8,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Linq;
namespace Microsoft.Toolkit.Uwp.UI.Lottie.LottieData
namespace CommunityToolkit.WinUI.Lottie.LottieData
{
#if PUBLIC_LottieData
public

2
source/LottieData/BlendMode.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.LottieData
namespace CommunityToolkit.WinUI.Lottie.LottieData
{
#if PUBLIC_LottieData
public

2
source/LottieData/BlurDimension.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.LottieData
namespace CommunityToolkit.WinUI.Lottie.LottieData
{
/// <summary>
/// The dimensions affected by a blur.

2
source/LottieData/Char.cs
Просмотреть файл

@ -4,7 +4,7 @@
using System.Collections.Generic;
namespace Microsoft.Toolkit.Uwp.UI.Lottie.LottieData
namespace CommunityToolkit.WinUI.Lottie.LottieData
{
#if PUBLIC_LottieData
public

2
source/LottieData/DrawingDirection.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.LottieData
namespace CommunityToolkit.WinUI.Lottie.LottieData
{
/// <summary>
/// The direction in which a path is to be drawn. This affects

4
source/LottieData/DropShadowEffect.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.Animatables;
using CommunityToolkit.WinUI.Lottie.Animatables;
namespace Microsoft.Toolkit.Uwp.UI.Lottie.LottieData
namespace CommunityToolkit.WinUI.Lottie.LottieData
{
/// <summary>
/// A drop shadow effect.

2
source/LottieData/Effect.cs
Просмотреть файл

@ -4,7 +4,7 @@
using System;
namespace Microsoft.Toolkit.Uwp.UI.Lottie.LottieData
namespace CommunityToolkit.WinUI.Lottie.LottieData
{
/// <summary>
/// An effect applied to a layer.

4
source/LottieData/Ellipse.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.Animatables;
using CommunityToolkit.WinUI.Lottie.Animatables;
namespace Microsoft.Toolkit.Uwp.UI.Lottie.LottieData
namespace CommunityToolkit.WinUI.Lottie.LottieData
{
#if PUBLIC_LottieData
public

2
source/LottieData/EmbeddedImageAsset.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.LottieData
namespace CommunityToolkit.WinUI.Lottie.LottieData
{
/// <summary>
/// An image embedded in the Lottie file.

2
source/LottieData/ExtensionMethods.cs
Просмотреть файл

@ -8,7 +8,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
namespace Microsoft.Toolkit.Uwp.UI.Lottie.LottieData
namespace CommunityToolkit.WinUI.Lottie.LottieData
{
/// <summary>
/// Extension methods for <see cref="IReadOnlyList{T}"/>.

2
source/LottieData/ExternalImageAsset.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.LottieData
namespace CommunityToolkit.WinUI.Lottie.LottieData
{
/// <summary>
/// A reference to an image.

2
source/LottieData/Font.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.LottieData
namespace CommunityToolkit.WinUI.Lottie.LottieData
{
#if PUBLIC_LottieData
public

4
source/LottieData/GaussianBlurEffect.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.Animatables;
using CommunityToolkit.WinUI.Lottie.Animatables;
namespace Microsoft.Toolkit.Uwp.UI.Lottie.LottieData
namespace CommunityToolkit.WinUI.Lottie.LottieData
{
/// <summary>
/// A Gaussian blur effect.

2
source/LottieData/ImageAsset.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.LottieData
namespace CommunityToolkit.WinUI.Lottie.LottieData
{
/// <summary>
/// An image.

2
source/LottieData/ImageLayer.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.LottieData
namespace CommunityToolkit.WinUI.Lottie.LottieData
{
#if PUBLIC_LottieData
public

2
source/LottieData/Layer.cs
Просмотреть файл

@ -4,7 +4,7 @@
using System.Collections.Generic;
namespace Microsoft.Toolkit.Uwp.UI.Lottie.LottieData
namespace CommunityToolkit.WinUI.Lottie.LottieData
{
/// <summary>
/// Base class for layer objects.

2
source/LottieData/LayerCollection.cs
Просмотреть файл

@ -8,7 +8,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
namespace Microsoft.Toolkit.Uwp.UI.Lottie.LottieData
namespace CommunityToolkit.WinUI.Lottie.LottieData
{
/// <summary>
/// A collection of <see cref="Layer"/>s in drawing order.

2
source/LottieData/LayerCollectionAsset.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.LottieData
namespace CommunityToolkit.WinUI.Lottie.LottieData
{
/// <summary>
/// A <see cref="LayerCollection"/> stored in the assets section of a <see cref="LottieComposition"/>.

4
source/LottieData/LinearGradientFill.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.Animatables;
using CommunityToolkit.WinUI.Lottie.Animatables;
namespace Microsoft.Toolkit.Uwp.UI.Lottie.LottieData
namespace CommunityToolkit.WinUI.Lottie.LottieData
{
#if PUBLIC_LottieData
public

4
source/LottieData/LinearGradientStroke.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.Animatables;
using CommunityToolkit.WinUI.Lottie.Animatables;
namespace Microsoft.Toolkit.Uwp.UI.Lottie.LottieData
namespace CommunityToolkit.WinUI.Lottie.LottieData
{
#if PUBLIC_LottieData
public

4
source/LottieData/LottieComposition.cs
Просмотреть файл

@ -5,9 +5,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.Toolkit.Uwp.UI.Lottie.GenericData;
using CommunityToolkit.WinUI.Lottie.GenericData;
namespace Microsoft.Toolkit.Uwp.UI.Lottie.LottieData
namespace CommunityToolkit.WinUI.Lottie.LottieData
{
#if PUBLIC_LottieData
public

2
source/LottieData/LottieCompositionValidator.cs
Просмотреть файл

@ -6,7 +6,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
namespace Microsoft.Toolkit.Uwp.UI.Lottie.LottieData
namespace CommunityToolkit.WinUI.Lottie.LottieData
{
/// <summary>
/// Validates a <see cref="LottieComposition"/> against various rules.

2
source/LottieData/LottieObject.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.LottieData
namespace CommunityToolkit.WinUI.Lottie.LottieData
{
#if PUBLIC_LottieData
public

2
source/LottieData/LottieObjectType.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.LottieData
namespace CommunityToolkit.WinUI.Lottie.LottieData
{
#if PUBLIC_LottieData
public

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше