Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Animations #1436

Merged
merged 13 commits into from
Jun 24, 2021
Merged

Animations #1436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a507f70
Initial Animations Pass
Clancey Jun 22, 2021
2d198f8
Added more lerps. Cleaned up the old ones
Clancey Jun 23, 2021
cc30823
Cleaned up animation initialization
Clancey Jun 23, 2021
7083927
Fixed so many tests
Clancey Jun 23, 2021
530f4b8
fixed final animation tests
Clancey Jun 23, 2021
ef012db
Fixed version mangling by VSMac
Clancey Jun 23, 2021
70a1fdf
Updated the Windows Native Ticker
Clancey Jun 24, 2021
96a6741
Fixed null crap
Clancey Jun 24, 2021
35f3a7f
Update NativeTicker.cs
Clancey Jun 24, 2021
ddd148c
fix tests
Clancey Jun 24, 2021
69e9ddf
Update src/Core/src/Platform/Android/NativeTicker.cs
Jun 24, 2021
98b16a8
Fixed nullability
Clancey Jun 24, 2021
608a1e2
Code cleanup
Clancey Jun 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 0 additions & 120 deletions src/Compatibility/Core/src/Android/AndroidTicker.cs
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions src/Compatibility/Core/src/Android/Forms.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,6 @@ static void SetupInit(
Device.SetFlags(s_flags);

Profile.FramePartition("AndroidTicker");
Ticker.SetDefault(null);

Profile.FramePartition("RegisterAll");

Expand Down Expand Up @@ -670,11 +669,6 @@ public void BeginInvokeOnMainThread(Action action)
s_handler.Post(action);
}

public Ticker CreateTicker()
{
return new AndroidTicker();
}

public Assembly[] GetAssemblies()
{
return AppDomain.CurrentDomain.GetAssemblies();
Expand Down
3 changes: 2 additions & 1 deletion src/Compatibility/Core/src/Android/PowerSaveModeBroadcastReceiver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Android.Content;
using Microsoft.Maui.Animations;
using Microsoft.Maui.Controls.Internals;

namespace Microsoft.Maui.Controls.Compatibility.Platform.Android
Expand All @@ -13,7 +14,7 @@ public override void OnReceive(Context context, Intent intent)

public void CheckAnimationEnabledStatus()
{
((AndroidTicker)Ticker.Default).CheckAnimationEnabledStatus();
NativeTicker.CheckPowerSaveModeStatus();
}
}
}
2 changes: 1 addition & 1 deletion src/Compatibility/Core/src/Compatibility.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<Compile Include="RendererToHandlerShim.cs" />
</ItemGroup>

<ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
Expand Down
5 changes: 0 additions & 5 deletions src/Compatibility/Core/src/WinUI/WindowsBasePlatformServices.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,6 @@ public void BeginInvokeOnMainThread(Action action)
//await TryAllDispatchers(action);
}

public Ticker CreateTicker()
{
return new WindowsTicker();
}

public virtual Assembly[] GetAssemblies()
{

Expand Down
45 changes: 0 additions & 45 deletions src/Compatibility/Core/src/WinUI/WindowsTicker.cs
View file
Open in desktop

This file was deleted.

67 changes: 0 additions & 67 deletions src/Compatibility/Core/src/iOS/CADisplayLinkTicker.cs
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions src/Compatibility/Core/src/iOS/Forms.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
using Microsoft.Maui.Controls.PlatformConfiguration;
using Microsoft.Maui.Controls.PlatformConfiguration.iOSSpecific;
using Microsoft.Maui.Graphics;
using Microsoft.Maui.Animations;

#if __MOBILE__
using UIKit;
Expand Down Expand Up @@ -330,11 +331,6 @@ public void BeginInvokeOnMainThread(Action action)
NSRunLoop.Main.BeginInvokeOnMainThread(action.Invoke);
}

public Ticker CreateTicker()
{
return new CADisplayLinkTicker();
}

public Assembly[] GetAssemblies()
{
return AppDomain.CurrentDomain.GetAssemblies();
Expand Down
2 changes: 1 addition & 1 deletion src/Compatibility/Core/src/iOS/VisualElementTracker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ void update()

#if __MOBILE__
if (thread)
CADisplayLinkTicker.Default.Invoke(update);
view.Dispatcher.Dispatch(update);
else
update();
#else
Expand Down
4 changes: 2 additions & 2 deletions src/Controls/samples/Controls.Sample.Droid/Controls.Sample.Droid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Compatibility\Core\src\Compatibility.csproj">
<Project>{8e86f0da-ed1c-409e-a7a9-df3e58498620}</Project>
<Project>{9FAA9654-80E6-4664-9702-47998A04E8FE}</Project>
<Name>Compatibility</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Essentials\src\Essentials.csproj">
Expand All @@ -99,7 +99,7 @@
<Name>Core</Name>
</ProjectReference>
<ProjectReference Include="..\Controls.Sample\Controls.Sample.csproj">
<Project>{90b727dd-4c7b-4462-950f-61842a87de8a}</Project>
<Project>{8e86f0da-ed1c-409e-a7a9-df3e58498620}</Project>
<Name>Controls.Sample</Name>
</ProjectReference>
</ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Controls/src/Core/AnimatableKey.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using Microsoft.Maui.Animations;

namespace Microsoft.Maui.Controls
{
Expand Down
Loading