Skip to content

Commit db1d7ae

Browse files
jeromelabanjeromelaban
committed
feat(android): Adjust Foldable screen nuget package naming
BREAKING CHANGE: Move `Uno.UI.DualScreen` to `Uno.UI.Foldable`
1 parent dcbcb14 commit db1d7ae

16 files changed

+23
-21
lines changed

‎doc/articles/updating-to-winui3.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Uno Platform supports authoring apps using [WinUI 3's API](uwp-vs-winui3.md). Th
1010
- `Uno.UI` becomes `Uno.WinUI`
1111
- `Uno.UI.RemoteControl` becomes `Uno.WinUI.RemoteControl`
1212
- `Uno.UI.Lottie` becomes `Uno.WinUI.Lottie`
13-
- `Uno.UI.DualScreen` becomes `Uno.WinUI.DualScreen`
13+
- `Uno.UI.Foldable` becomes `Uno.WinUI.Foldable`
1414
- **String replacements:**
1515
- `Windows.UI.Xaml` becomes `Microsoft.UI.Xaml`
1616
- `Windows.UI.Composition` becomes `Microsoft.UI.Composition`
@@ -37,4 +37,4 @@ Some WinRT APIs are unsupported in WinUI 3 Desktop apps, notably `CoreDispatcher
3737

3838
## Creating an application from the templates
3939

40-
Instructions are available [here](get-started-winui3.md) for creating a new Uno Platform application targeting WinUI 3.
40+
Instructions are available [here](get-started-winui3.md) for creating a new Uno Platform application targeting WinUI 3.

‎src/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Toolkit.Skia.csproj</_AdjustedOutputProjects>
9898
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Toolkit.net6.csproj</_AdjustedOutputProjects>
9999

100-
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.DualScreen.net6.csproj</_AdjustedOutputProjects>
100+
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Foldable.net6.csproj</_AdjustedOutputProjects>
101101

102102
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.Wasm.csproj</_AdjustedOutputProjects>
103103
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.Skia.csproj</_AdjustedOutputProjects>

‎src/SamplesApp/SamplesApp.Droid/SamplesApp.Droid.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@
125125
<Project>{528AE586-5DF3-4DAD-AA5C-F12F4D5E0605}</Project>
126126
<Name>Uno.Foundation</Name>
127127
</ProjectReference>
128-
<ProjectReference Include="..\..\Uno.UI.DualScreen\Uno.UI.DualScreen.csproj">
128+
<ProjectReference Include="..\..\Uno.UI.Foldable\Uno.UI.Foldable.csproj">
129129
<Project>{c187cd35-e5b4-4054-99c2-5d85ad9d6c73}</Project>
130-
<Name>Uno.UI.DualScreen</Name>
130+
<Name>Uno.UI.Foldable</Name>
131131
</ProjectReference>
132132
<ProjectReference Include="..\..\Uno.UI.Maps\Uno.UI.Maps.csproj">
133133
<Project>{f25ccf70-5a21-4245-ae4e-342bc55f9e86}</Project>

‎src/SamplesApp/SamplesApp.net6mobile/SamplesApp.net6mobile.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,11 @@
101101
<ProjectReference Include="..\..\Uno.UI.RuntimeTests\Uno.UI.RuntimeTests.net6.csproj" />
102102
<ProjectReference Include="..\..\Uno.UI.FluentTheme\Uno.UI.FluentTheme.net6.csproj" />
103103
<ProjectReference Include="..\..\AddIns\Uno.UI.MSAL\Uno.UI.MSAL.net6.csproj" />
104-
<ProjectReference Include="..\..\Uno.UI.DualScreen\Uno.UI.DualScreen.net6.csproj"/>
105104
<ProjectReference Include="..\..\Uno.UI.Adapter.Microsoft.Extensions.Logging\Uno.UI.Adapter.Microsoft.Extensions.Logging.net6.csproj" />
106-
<!--
105+
<ProjectReference Include="..\..\Uno.UI.Foldable\Uno.UI.Foldable.net6.csproj"/>
106+
107+
<!--
108+
<!--
107109
<ProjectReference Include="..\..\Uno.UI.Maps\Uno.UI.Maps.net6.csproj"/>
108110
<ProjectReference Include="..\..\Uno.UI.RemoteControl\Uno.UI.RemoteControl.net6.csproj"/>
109111
-->

‎src/Uno.UI-Android-only.slnf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"Uno.Foundation\\Uno.Foundation.csproj",
2020
"Uno.UI.Adapter.Microsoft.Extensions.Logging\\Uno.UI.Adapter.Microsoft.Extensions.Logging.csproj",
2121
"Uno.UI.BindingHelper.Android\\Uno.UI.BindingHelper.Android.csproj",
22-
"Uno.UI.DualScreen\\Uno.UI.DualScreen.csproj",
22+
"Uno.UI.Foldable\\Uno.UI.Foldable.csproj",
2323
"Uno.UI.FluentTheme.v1\\Uno.UI.FluentTheme.v1.csproj",
2424
"Uno.UI.FluentTheme.v2\\Uno.UI.FluentTheme.v2.csproj",
2525
"Uno.UI.FluentTheme\\Uno.UI.FluentTheme.csproj",

‎src/Uno.UI-net6-only.slnf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"Uno.Foundation\\Uno.Foundation.net6.csproj",
1919
"Uno.UI.Adapter.Microsoft.Extensions.Logging\\Uno.UI.Adapter.Microsoft.Extensions.Logging.net6.csproj",
2020
"Uno.UI.BindingHelper.Android\\Uno.UI.BindingHelper.Android.net6.csproj",
21-
"Uno.UI.DualScreen\\Uno.UI.DualScreen.net6.csproj",
21+
"Uno.UI.Foldable\\Uno.UI.Foldable.net6.csproj",
2222
"Uno.UI.FluentTheme.v1\\Uno.UI.FluentTheme.v1.net6.csproj",
2323
"Uno.UI.FluentTheme.v2\\Uno.UI.FluentTheme.v2.net6.csproj",
2424
"Uno.UI.FluentTheme\\Uno.UI.FluentTheme.net6.csproj",

‎src/Uno.UI-packages-no-net6.slnf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@
3737
"Uno.UI.Adapter.Microsoft.Extensions.Logging\\Uno.UI.Adapter.Microsoft.Extensions.Logging.csproj",
3838
"Uno.UI.AssemblyComparer\\Uno.UI.AssemblyComparer.csproj",
3939
"Uno.UI.BindingHelper.Android\\Uno.UI.BindingHelper.Android.csproj",
40-
"Uno.UI.DualScreen\\Uno.UI.DualScreen.csproj",
4140
"Uno.UI.FluentTheme.v1\\Uno.UI.FluentTheme.v1.Skia.csproj",
4241
"Uno.UI.FluentTheme.v1\\Uno.UI.FluentTheme.v1.Wasm.csproj",
4342
"Uno.UI.FluentTheme.v1\\Uno.UI.FluentTheme.v1.csproj",
4443
"Uno.UI.FluentTheme.v2\\Uno.UI.FluentTheme.v2.Skia.csproj",
4544
"Uno.UI.FluentTheme.v2\\Uno.UI.FluentTheme.v2.Wasm.csproj",
4645
"Uno.UI.FluentTheme.v2\\Uno.UI.FluentTheme.v2.csproj",
46+
"Uno.UI.Foldable\\Uno.UI.Foldable.csproj",
4747
"Uno.UI.FluentTheme\\Uno.UI.FluentTheme.Skia.csproj",
4848
"Uno.UI.FluentTheme\\Uno.UI.FluentTheme.Wasm.csproj",
4949
"Uno.UI.FluentTheme\\Uno.UI.FluentTheme.csproj",

‎src/Uno.UI.DualScreen/AssemblyInfo.cs renamed to ‎src/Uno.UI.Foldable/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Windows.UI.ViewManagement;
22
using Uno.Devices.Sensors;
33
using Uno.Foundation.Extensibility;
4-
using Uno.UI.DualScreen;
4+
using Uno.UI.Foldable;
55

66
#if __ANDROID__
77
[assembly: ApiExtension(typeof(IApplicationViewSpanningRects), typeof(FoldableApplicationViewSpanningRects))]

‎src/Uno.UI.DualScreen/FoldableApplicationViewSpanningRects.Android.cs renamed to ‎src/Uno.UI.Foldable/FoldableApplicationViewSpanningRects.Android.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using Windows.Graphics.Display;
1111
using Windows.UI.ViewManagement;
1212

13-
namespace Uno.UI.DualScreen
13+
namespace Uno.UI.Foldable
1414
{
1515
/// <summary>
1616
/// Provides two Rect that represent the two screen dimensions when

‎src/Uno.UI.DualScreen/FoldableApplicationViewSpanningRectsConsumer.Android.cs renamed to ‎src/Uno.UI.Foldable/FoldableApplicationViewSpanningRectsConsumer.Android.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
using Windows.Graphics.Display;
1515
using Windows.UI.ViewManagement;
1616

17-
namespace Uno.UI.DualScreen
17+
namespace Uno.UI.Foldable
1818
{
1919
/// <summary>
2020
/// Provides two Rect that represent the two screen dimensions when

‎src/Uno.UI.DualScreen/FoldableHingeAngleSensor.Android.cs renamed to ‎src/Uno.UI.Foldable/FoldableHingeAngleSensor.Android.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using Uno.Devices.Sensors;
88
using Uno.Devices.Sensors.Helpers;
99

10-
namespace Uno.UI.DualScreen
10+
namespace Uno.UI.Foldable
1111
{
1212
/// <summary>
1313
/// Uses sensor manager to listen for hinge or fold angle changes

‎src/Uno.UI.DualScreen/Uno.UI.DualScreen.csproj renamed to ‎src/Uno.UI.Foldable/Uno.UI.Foldable.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959

6060
<PropertyGroup>
6161
<_OverrideTargetFramework>$(TargetFramework)</_OverrideTargetFramework>
62-
<_TargetNugetFolder>$(USERPROFILE)\.nuget\packages\Uno.UI.DualScreen\$(UnoNugetOverrideVersion)\lib\$(_OverrideTargetFramework)</_TargetNugetFolder>
62+
<_TargetNugetFolder>$(USERPROFILE)\.nuget\packages\Uno.UI.Foldable\$(UnoNugetOverrideVersion)\lib\$(_OverrideTargetFramework)</_TargetNugetFolder>
6363
</PropertyGroup>
6464
<ItemGroup>
6565
<_OutputFiles Include="$(TargetDir)**" />

‎src/Uno.UI.DualScreen/Uno.UI.DualScreen.net6.csproj renamed to ‎src/Uno.UI.Foldable/Uno.UI.Foldable.net6.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
44
<TargetFrameworksCI>net6.0-android;net6.0-ios</TargetFrameworksCI>
5-
<AssemblyName>Uno.UI.DualScreen</AssemblyName>
5+
<AssemblyName>Uno.UI.Foldable</AssemblyName>
66

77
<TargetFrameworks>$(TargetFrameworks);net6.0-maccatalyst;net6.0-macos</TargetFrameworks>
88
<TargetFrameworksCI>$(TargetFrameworks);net6.0-maccatalyst;net6.0-macos</TargetFrameworksCI>
@@ -54,7 +54,7 @@
5454

5555
<PropertyGroup>
5656
<_OverrideTargetFramework>$(TargetFramework)</_OverrideTargetFramework>
57-
<_TargetNugetFolder>$(USERPROFILE)\.nuget\packages\Uno.UI.DualScreen\$(UnoNugetOverrideVersion)\lib\$(_OverrideTargetFramework)</_TargetNugetFolder>
57+
<_TargetNugetFolder>$(USERPROFILE)\.nuget\packages\Uno.UI.Foldable\$(UnoNugetOverrideVersion)\lib\$(_OverrideTargetFramework)</_TargetNugetFolder>
5858
</PropertyGroup>
5959
<ItemGroup>
6060
<_OutputFiles Include="$(TargetDir)**" />

‎src/Uno.UI.sln

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Samples.UITest.Generato
137137
EndProject
138138
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.SourceGenerators.Tests", "SourceGenerators\Uno.UI.SourceGenerators.Tests\Uno.UI.SourceGenerators.Tests.csproj", "{34DB4266-6184-4889-8D16-92F22C43BB15}"
139139
EndProject
140-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.DualScreen", "Uno.UI.DualScreen\Uno.UI.DualScreen.csproj", "{C187CD35-E5B4-4054-99C2-5D85AD9D6C73}"
140+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.Foldable", "Uno.UI.Foldable\Uno.UI.Foldable.csproj", "{C187CD35-E5B4-4054-99C2-5D85AD9D6C73}"
141141
EndProject
142142
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.WinUIRevert", "Uno.WinUIRevert\Uno.WinUIRevert.csproj", "{C598D6FA-81F1-4B54-8028-ED8987F88FFA}"
143143
EndProject
@@ -265,7 +265,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.FluentTheme.v2.Skia"
265265
EndProject
266266
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.FluentTheme.v2.Wasm", "Uno.UI.FluentTheme.v2\Uno.UI.FluentTheme.v2.Wasm.csproj", "{AD35E340-34DF-4FA9-B545-B9FBB72D3A2E}"
267267
EndProject
268-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.DualScreen.net6", "Uno.UI.DualScreen\Uno.UI.DualScreen.net6.csproj", "{CC0AF5E6-FA87-4A09-958A-95ADE1E5B946}"
268+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.Foldable.net6", "Uno.UI.Foldable\Uno.UI.Foldable.net6.csproj", "{CC0AF5E6-FA87-4A09-958A-95ADE1E5B946}"
269269
EndProject
270270
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Foundation.Logging", "Uno.Foundation.Logging\Uno.Foundation.Logging.csproj", "{76875E6F-30F3-4225-821F-11A299BCBDB0}"
271271
EndProject

‎src/Uno.UI/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Reflection;
22
using System.Runtime.CompilerServices;
33

4-
[assembly: InternalsVisibleTo("Uno.UI.DualScreen")]
4+
[assembly: InternalsVisibleTo("Uno.UI.Foldable")]
55
[assembly: InternalsVisibleTo("Uno.UI.Tests")]
66
[assembly: InternalsVisibleTo("Uno.UI.Tests.Performance")]
77
[assembly: InternalsVisibleTo("Uno.UI.Toolkit")]

‎src/Uno.UWP/Devices/Sensors/HingeAngleSensor.Android.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private static void TryInitializeHingeAngleSensor(HingeAngleSensor owner)
8383
{
8484
if (_hingeAngleSensor == null && !ApiExtensibility.CreateInstance(owner, out _hingeAngleSensor))
8585
{
86-
owner.Log().Warn("You need to reference Uno.UI.DualScreen NuGet package from your project to use this feature.");
86+
owner.Log().Warn("You need to reference Uno.UI.Foldable NuGet package from your project to use this feature.");
8787
}
8888
}
8989
}

0 commit comments

Comments
 (0)