Skip to content

Commit 2d9cdc7

Browse files
committed
fix!: Remove ResourcesService and ResourceHelper
BREAKING CHANGE: Remove `ResourcesService` and `ResourceHelper`
1 parent ade59d3 commit 2d9cdc7

File tree

8 files changed

+3
-146
lines changed

8 files changed

+3
-146
lines changed

build/PackageDiffIgnore.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9163,12 +9163,12 @@
91639163

91649164
<Member fullName="Uno.UI.IndexPath" reason="Api alignments" />
91659165
<Member fullName="Uno.UI.IResourcesService" reason="Api alignments" />
9166+
<Member fullName="Uno.UI.Services.ResourcesService" reason="Api alignments" />
91669167
<Member fullName="Uno.UI.Common.DelegateCommand" reason="Api alignments" />
91679168
<Member fullName="Uno.UI.Common.DelegateCommand`1" reason="Api alignments" />
91689169
<Member fullName="Windows.Foundation.SizeConverter" reason="Api alignments" />
91699170
<Member fullName="Windows.UI.Xaml.ResourceHelper" reason="Api alignments" />
91709171
<Member fullName="Uno.UI.Extensions.CollectionViewExtensions" reason="Api alignments" />
9171-
91729172
</Types>
91739173
<Events>
91749174
<Member fullName="Windows.Foundation.TypedEventHandler`2&lt;Microsoft.UI.Xaml.Controls.IInputValidationControl,Microsoft.UI.Xaml.Controls.HasValidationErrorsChangedEventArgs&gt; Microsoft.UI.Xaml.Controls.AutoSuggestBox::HasValidationErrorsChanged" reason="Not present in WinAppSDK 1.2" />
@@ -9599,7 +9599,7 @@
95999599
<Member fullName="Windows.UI.Xaml.Controls.VirtualizingPanelLayout/Line Windows.UI.Xaml.Controls.VirtualizingPanelLayout.CreateLine(Windows.UI.Xaml.Controls.Primitives.GeneratorDirection fillDirection, System.Int32 extentOffset, System.Int32 breadthOffset, System.Int32 availableBreadth, AndroidX.RecyclerView.Widget.RecyclerView/Recycler recycler, AndroidX.RecyclerView.Widget.RecyclerView/State state, Uno.UI.IndexPath nextVisibleItem, System.Boolean isNewGroup)" reason="Api alignments" />
96009600
<Member fullName="System.Nullable`1&lt;Uno.UI.IndexPath&gt; Windows.UI.Xaml.Controls.VirtualizingPanelLayout.GetDynamicSeedIndex(System.Nullable`1&lt;Uno.UI.IndexPath&gt; firstVisibleItem, System.Int32 availableBreadth)" reason="Api alignments" />
96019601
<Member fullName="System.String Uno.UI.Services.ResourcesService.Get(System.String id)" reason="Api alignments" />
9602-
9602+
96039603
<Member fullName="System.Void Windows.UI.Xaml.Window.set_Visible(System.Boolean value)" reason="Does not exist in UWP and WinUI" />
96049604
</Methods>
96059605
</IgnoreSet>

src/Uno.UI.RuntimeTests/Tests/Uno_UI_Services/Given_ResourceService.cs

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/Uno.UI/Services/ResourceService.iOSmacOS.cs

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/Uno.UI/Services/ResourcesService.Android.cs

Lines changed: 0 additions & 28 deletions
This file was deleted.

src/Uno.UI/UI/Xaml/Application.iOS.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public Application()
3838
{
3939
Current = this;
4040
SetCurrentLanguage();
41-
ResourceHelper.ResourcesService = new ResourcesService(new[] { NSBundle.MainBundle });
4241

4342
SubscribeBackgroundNotifications();
4443
}

src/Uno.UI/UI/Xaml/Application.macOS.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ public Application()
4242
{
4343
Current = this;
4444
SetCurrentLanguage();
45-
ResourceHelper.ResourcesService = new ResourcesService(new[] { NSBundle.MainBundle });
4645

4746
SubscribeBackgroundNotifications();
4847
}

src/Uno.UI/UI/Xaml/NativeApplication.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ public NativeApplication(AppBuilder appBuilder, IntPtr javaReference, Android.Ru
4242
// Android.App.Application.Context to be populated properly. This enables
4343
// APIs such as Windows.Storage.ApplicationData.Current.LocalSettings to function properly.
4444
_app = appBuilder();
45-
46-
ResourceHelper.ResourcesService = new ResourcesService(this);
4745
}
4846

4947
public override void OnCreate()
@@ -121,7 +119,7 @@ internal bool TryHandleIntent(Intent intent)
121119
}
122120

123121
/// <summary>
124-
/// This method is used by UI Test frameworks to get
122+
/// This method is used by UI Test frameworks to get
125123
/// the Xamarin compatible name for a control in Java.
126124
/// </summary>
127125
/// <param name="type">A type full name</param>

src/Uno.UI/UI/Xaml/ResourceHelper.cs

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)