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

Jump to bottom

Refactored Drawable helper to Uno project #1308

Merged
merged 17 commits into from
Aug 9, 2019
Merged

Refactored Drawable helper to Uno project #1308

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0b7091b
Refactored Drawable helper to Uno.UWP
MartinZikmund Jul 27, 2019
145b39e
Updated BindableImageSource to use DrawableHelper
MartinZikmund Jul 27, 2019
7e8f8f6
Updated release notes
MartinZikmund Jul 27, 2019
d682706
Removed BindableImageSource
MartinZikmund Jul 28, 2019
50d9479
PackageDiffIgnore for DrawableHelper, ImageSource
MartinZikmund Jul 29, 2019
675b609
Erroneous change of Uno.csproj
MartinZikmund Jul 29, 2019
59cd00d
Merge branch 'master' into dev/mazi/drawable-helper
MartinZikmund Jul 31, 2019
da2a0bf
Fixed BarometerTests sample warning
MartinZikmund Jul 31, 2019
cf2d7b7
Merge branch 'dev/mazi/drawable-helper' of https://github.com/MartinZ…
MartinZikmund Jul 31, 2019
5325272
Previously removed properties and methods working with drawables now …
MartinZikmund Jul 31, 2019
7ebacac
Removing now-unnecessary entries in PackageDiffignore
MartinZikmund Jul 31, 2019
9b09ba5
EditorBrowsable
MartinZikmund Jul 31, 2019
7bbaab2
Moved DrawableHelper to Helpers namespace, editor hidden UI.DrawableH…
MartinZikmund Aug 9, 2019
422a969
Accidental change reverted, whitespace change
MartinZikmund Aug 9, 2019
53326d6
Whitespace fix
MartinZikmund Aug 9, 2019
2bf3c78
Reverting vs addition in Uno.UI.csproj
MartinZikmund Aug 9, 2019
5f37003
Updated exception message
MartinZikmund Aug 9, 2019
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
1 change: 1 addition & 0 deletions doc/ReleaseNotes/_ReleaseNotes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Next version
### Features
* Refactored `DrawableHelper` to the `Uno` project
* Add full implementation of `Windows.UI.Xaml.Input.InputScopeNameValue` on all platforms.
* Add support for `Windows.Devices.Sensors.Accelerometer` APIs on iOS, Android and WASM
* `ReadingChanged`
Expand Down
3 changes: 3 additions & 0 deletions src/SamplesApp/UITests.Shared/UITests.Shared.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4113,6 +4113,9 @@
<Compile Update="$(MSBuildThisFileDirectory)Windows_Devices\AccelerometerTests.xaml.cs">
<DependentUpon>AccelerometerTests.xaml</DependentUpon>
</Compile>
<Compile Update="$(MSBuildThisFileDirectory)Windows_Devices\BarometerTests.xaml.cs">
<DependentUpon>BarometerTests.xaml</DependentUpon>
</Compile>
<Compile Update="$(MSBuildThisFileDirectory)Windows_UI_Xaml\Resources\XamlGlobalResources.xaml.cs">
<DependentUpon>XamlGlobalResources.xaml</DependentUpon>
</Compile>
Expand Down
2 changes: 1 addition & 1 deletion src/SourceGenerators/Uno.UI.SourceGenerators/XamlGenerator/XamlFileGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ private void BuildApplicationInitializerBody(IndentedStringBuilder writer, XamlO
writer.AppendLineInvariant($"global::Uno.UI.DataBinding.BindableMetadata.Provider = new global::{_defaultNamespace}.BindableMetadataProvider();");

writer.AppendLineInvariant($"#if __ANDROID__");
writer.AppendLineInvariant($"global::Windows.UI.Xaml.Media.ImageSource.Drawables = typeof(global::{_defaultNamespace}.Resource.Drawable);");
writer.AppendLineInvariant($"global::Uno.Helpers.DrawableHelper.Drawables = typeof(global::{_defaultNamespace}.Resource.Drawable);");
writer.AppendLineInvariant($"#endif");

RegisterResources(topLevelControl);
Expand Down
352 changes: 0 additions & 352 deletions src/Uno.UI/Controls/BindableImageSource.Android.cs
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion src/Uno.UI/DebugHelper.Android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using Java.Lang;
Expand All @@ -10,7 +11,7 @@ public static partial class DebugHelper
{
/// <summary>
/// Returns the complete current native stack. Useful in advanced debugging scenarios.
/// </summary>
/// </summary>
public static string[] NativeStackTrace => Thread.CurrentThread().GetStackTrace().Select(ste => ste.ToString()).ToArray();
}
}
Loading