feat(android): Adjust Foldable screen nuget package naming

BREAKING CHANGE: Move `Uno.UI.DualScreen` to `Uno.UI.Foldable`
unoplatform · Nov 15, 2021 · db1d7ae · db1d7ae
1 parent dcbcb14
commit db1d7ae
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 21 deletions.
diff --git a/doc/articles/updating-to-winui3.md b/doc/articles/updating-to-winui3.md
@@ -10,7 +10,7 @@ Uno Platform supports authoring apps using [WinUI 3's API](uwp-vs-winui3.md). Th
     - `Uno.UI` becomes `Uno.WinUI`
     - `Uno.UI.RemoteControl` becomes `Uno.WinUI.RemoteControl`
     - `Uno.UI.Lottie` becomes `Uno.WinUI.Lottie`
-    - `Uno.UI.DualScreen` becomes `Uno.WinUI.DualScreen`
+    - `Uno.UI.Foldable` becomes `Uno.WinUI.Foldable`
 - **String replacements:**
     - `Windows.UI.Xaml` becomes `Microsoft.UI.Xaml`
     - `Windows.UI.Composition` becomes `Microsoft.UI.Composition`
@@ -37,4 +37,4 @@ Some WinRT APIs are unsupported in WinUI 3 Desktop apps, notably `CoreDispatcher
 
 ## Creating an application from the templates
 
-Instructions are available [here](get-started-winui3.md) for creating a new Uno Platform application targeting WinUI 3.
+Instructions are available [here](get-started-winui3.md) for creating a new Uno Platform application targeting WinUI 3.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -97,7 +97,7 @@
 	<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Toolkit.Skia.csproj</_AdjustedOutputProjects>
 	<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Toolkit.net6.csproj</_AdjustedOutputProjects>
 
-	<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.DualScreen.net6.csproj</_AdjustedOutputProjects>
+	<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Foldable.net6.csproj</_AdjustedOutputProjects>
 
 	<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.Wasm.csproj</_AdjustedOutputProjects>
 	<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.Skia.csproj</_AdjustedOutputProjects>

diff --git a/src/SamplesApp/SamplesApp.Droid/SamplesApp.Droid.csproj b/src/SamplesApp/SamplesApp.Droid/SamplesApp.Droid.csproj
@@ -125,9 +125,9 @@
       <Project>{528AE586-5DF3-4DAD-AA5C-F12F4D5E0605}</Project>
       <Name>Uno.Foundation</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Uno.UI.DualScreen\Uno.UI.DualScreen.csproj">
+    <ProjectReference Include="..\..\Uno.UI.Foldable\Uno.UI.Foldable.csproj">
       <Project>{c187cd35-e5b4-4054-99c2-5d85ad9d6c73}</Project>
-      <Name>Uno.UI.DualScreen</Name>
+      <Name>Uno.UI.Foldable</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\Uno.UI.Maps\Uno.UI.Maps.csproj">
       <Project>{f25ccf70-5a21-4245-ae4e-342bc55f9e86}</Project>

diff --git a/src/SamplesApp/SamplesApp.net6mobile/SamplesApp.net6mobile.csproj b/src/SamplesApp/SamplesApp.net6mobile/SamplesApp.net6mobile.csproj
@@ -101,9 +101,11 @@
 		<ProjectReference Include="..\..\Uno.UI.RuntimeTests\Uno.UI.RuntimeTests.net6.csproj" />
 		<ProjectReference Include="..\..\Uno.UI.FluentTheme\Uno.UI.FluentTheme.net6.csproj" />
 		<ProjectReference Include="..\..\AddIns\Uno.UI.MSAL\Uno.UI.MSAL.net6.csproj" />
-		<ProjectReference Include="..\..\Uno.UI.DualScreen\Uno.UI.DualScreen.net6.csproj"/>
 		<ProjectReference Include="..\..\Uno.UI.Adapter.Microsoft.Extensions.Logging\Uno.UI.Adapter.Microsoft.Extensions.Logging.net6.csproj" />
-			<!--
+		<ProjectReference Include="..\..\Uno.UI.Foldable\Uno.UI.Foldable.net6.csproj"/>
+
+		<!--
+		<!--
 		<ProjectReference Include="..\..\Uno.UI.Maps\Uno.UI.Maps.net6.csproj"/>
 		<ProjectReference Include="..\..\Uno.UI.RemoteControl\Uno.UI.RemoteControl.net6.csproj"/>
 		-->

diff --git a/src/Uno.UI-Android-only.slnf b/src/Uno.UI-Android-only.slnf
@@ -19,7 +19,7 @@
       "Uno.Foundation\\Uno.Foundation.csproj",
       "Uno.UI.Adapter.Microsoft.Extensions.Logging\\Uno.UI.Adapter.Microsoft.Extensions.Logging.csproj",
       "Uno.UI.BindingHelper.Android\\Uno.UI.BindingHelper.Android.csproj",
-      "Uno.UI.DualScreen\\Uno.UI.DualScreen.csproj",
+      "Uno.UI.Foldable\\Uno.UI.Foldable.csproj",
       "Uno.UI.FluentTheme.v1\\Uno.UI.FluentTheme.v1.csproj",
       "Uno.UI.FluentTheme.v2\\Uno.UI.FluentTheme.v2.csproj",
       "Uno.UI.FluentTheme\\Uno.UI.FluentTheme.csproj",

diff --git a/src/Uno.UI-net6-only.slnf b/src/Uno.UI-net6-only.slnf
@@ -18,7 +18,7 @@
       "Uno.Foundation\\Uno.Foundation.net6.csproj",
       "Uno.UI.Adapter.Microsoft.Extensions.Logging\\Uno.UI.Adapter.Microsoft.Extensions.Logging.net6.csproj",
       "Uno.UI.BindingHelper.Android\\Uno.UI.BindingHelper.Android.net6.csproj",
-      "Uno.UI.DualScreen\\Uno.UI.DualScreen.net6.csproj",
+      "Uno.UI.Foldable\\Uno.UI.Foldable.net6.csproj",
       "Uno.UI.FluentTheme.v1\\Uno.UI.FluentTheme.v1.net6.csproj",
       "Uno.UI.FluentTheme.v2\\Uno.UI.FluentTheme.v2.net6.csproj",
       "Uno.UI.FluentTheme\\Uno.UI.FluentTheme.net6.csproj",

diff --git a/src/Uno.UI-packages-no-net6.slnf b/src/Uno.UI-packages-no-net6.slnf
@@ -37,13 +37,13 @@
       "Uno.UI.Adapter.Microsoft.Extensions.Logging\\Uno.UI.Adapter.Microsoft.Extensions.Logging.csproj",
       "Uno.UI.AssemblyComparer\\Uno.UI.AssemblyComparer.csproj",
       "Uno.UI.BindingHelper.Android\\Uno.UI.BindingHelper.Android.csproj",
-      "Uno.UI.DualScreen\\Uno.UI.DualScreen.csproj",
       "Uno.UI.FluentTheme.v1\\Uno.UI.FluentTheme.v1.Skia.csproj",
       "Uno.UI.FluentTheme.v1\\Uno.UI.FluentTheme.v1.Wasm.csproj",
       "Uno.UI.FluentTheme.v1\\Uno.UI.FluentTheme.v1.csproj",
       "Uno.UI.FluentTheme.v2\\Uno.UI.FluentTheme.v2.Skia.csproj",
       "Uno.UI.FluentTheme.v2\\Uno.UI.FluentTheme.v2.Wasm.csproj",
       "Uno.UI.FluentTheme.v2\\Uno.UI.FluentTheme.v2.csproj",
+      "Uno.UI.Foldable\\Uno.UI.Foldable.csproj",
       "Uno.UI.FluentTheme\\Uno.UI.FluentTheme.Skia.csproj",
       "Uno.UI.FluentTheme\\Uno.UI.FluentTheme.Wasm.csproj",
       "Uno.UI.FluentTheme\\Uno.UI.FluentTheme.csproj",

diff --git a/src/Uno.UI.DualScreen/AssemblyInfo.cs → src/Uno.UI.Foldable/AssemblyInfo.cs b/src/Uno.UI.DualScreen/AssemblyInfo.cs → src/Uno.UI.Foldable/AssemblyInfo.cs
@@ -1,7 +1,7 @@
 using Windows.UI.ViewManagement;
 using Uno.Devices.Sensors;
 using Uno.Foundation.Extensibility;
-using Uno.UI.DualScreen;
+using Uno.UI.Foldable;
 
 #if __ANDROID__
 [assembly: ApiExtension(typeof(IApplicationViewSpanningRects), typeof(FoldableApplicationViewSpanningRects))]

diff --git a/...leApplicationViewSpanningRects.Android.cs → ...leApplicationViewSpanningRects.Android.cs b/...leApplicationViewSpanningRects.Android.cs → ...leApplicationViewSpanningRects.Android.cs
@@ -10,7 +10,7 @@
 using Windows.Graphics.Display;
 using Windows.UI.ViewManagement;
 
-namespace Uno.UI.DualScreen
+namespace Uno.UI.Foldable
 {
     /// <summary>
     /// Provides two Rect that represent the two screen dimensions when

diff --git a/...ationViewSpanningRectsConsumer.Android.cs → ...ationViewSpanningRectsConsumer.Android.cs b/...ationViewSpanningRectsConsumer.Android.cs → ...ationViewSpanningRectsConsumer.Android.cs
@@ -14,7 +14,7 @@
 using Windows.Graphics.Display;
 using Windows.UI.ViewManagement;
 
-namespace Uno.UI.DualScreen
+namespace Uno.UI.Foldable
 {
 	/// <summary>
 	/// Provides two Rect that represent the two screen dimensions when

diff --git a/...creen/FoldableHingeAngleSensor.Android.cs → ...dable/FoldableHingeAngleSensor.Android.cs b/...creen/FoldableHingeAngleSensor.Android.cs → ...dable/FoldableHingeAngleSensor.Android.cs
@@ -7,7 +7,7 @@
 using Uno.Devices.Sensors;
 using Uno.Devices.Sensors.Helpers;
 
-namespace Uno.UI.DualScreen
+namespace Uno.UI.Foldable
 {
 	/// <summary>
 	/// Uses sensor manager to listen for hinge or fold angle changes

diff --git a/...no.UI.DualScreen/Uno.UI.DualScreen.csproj → src/Uno.UI.Foldable/Uno.UI.Foldable.csproj b/...no.UI.DualScreen/Uno.UI.DualScreen.csproj → src/Uno.UI.Foldable/Uno.UI.Foldable.csproj
@@ -59,7 +59,7 @@
 
 		<PropertyGroup>
 			<_OverrideTargetFramework>$(TargetFramework)</_OverrideTargetFramework>
-			<_TargetNugetFolder>$(USERPROFILE)\.nuget\packages\Uno.UI.DualScreen\$(UnoNugetOverrideVersion)\lib\$(_OverrideTargetFramework)</_TargetNugetFolder>
+			<_TargetNugetFolder>$(USERPROFILE)\.nuget\packages\Uno.UI.Foldable\$(UnoNugetOverrideVersion)\lib\$(_OverrideTargetFramework)</_TargetNugetFolder>
 		</PropertyGroup>
 		<ItemGroup>
 			<_OutputFiles Include="$(TargetDir)**" />

diff --git a/....DualScreen/Uno.UI.DualScreen.net6.csproj → ...o.UI.Foldable/Uno.UI.Foldable.net6.csproj b/....DualScreen/Uno.UI.DualScreen.net6.csproj → ...o.UI.Foldable/Uno.UI.Foldable.net6.csproj
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
 		<TargetFrameworksCI>net6.0-android;net6.0-ios</TargetFrameworksCI>
-		<AssemblyName>Uno.UI.DualScreen</AssemblyName>
+		<AssemblyName>Uno.UI.Foldable</AssemblyName>
 
 		<TargetFrameworks>$(TargetFrameworks);net6.0-maccatalyst;net6.0-macos</TargetFrameworks>
 		<TargetFrameworksCI>$(TargetFrameworks);net6.0-maccatalyst;net6.0-macos</TargetFrameworksCI>
@@ -54,7 +54,7 @@
 
 		<PropertyGroup>
 			<_OverrideTargetFramework>$(TargetFramework)</_OverrideTargetFramework>
-			<_TargetNugetFolder>$(USERPROFILE)\.nuget\packages\Uno.UI.DualScreen\$(UnoNugetOverrideVersion)\lib\$(_OverrideTargetFramework)</_TargetNugetFolder>
+			<_TargetNugetFolder>$(USERPROFILE)\.nuget\packages\Uno.UI.Foldable\$(UnoNugetOverrideVersion)\lib\$(_OverrideTargetFramework)</_TargetNugetFolder>
 		</PropertyGroup>
 		<ItemGroup>
 			<_OutputFiles Include="$(TargetDir)**" />

diff --git a/src/Uno.UI.sln b/src/Uno.UI.sln
@@ -137,7 +137,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Samples.UITest.Generato
 EndProject
 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}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.DualScreen", "Uno.UI.DualScreen\Uno.UI.DualScreen.csproj", "{C187CD35-E5B4-4054-99C2-5D85AD9D6C73}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.Foldable", "Uno.UI.Foldable\Uno.UI.Foldable.csproj", "{C187CD35-E5B4-4054-99C2-5D85AD9D6C73}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.WinUIRevert", "Uno.WinUIRevert\Uno.WinUIRevert.csproj", "{C598D6FA-81F1-4B54-8028-ED8987F88FFA}"
 EndProject
@@ -265,7 +265,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.FluentTheme.v2.Skia"
 EndProject
 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}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.DualScreen.net6", "Uno.UI.DualScreen\Uno.UI.DualScreen.net6.csproj", "{CC0AF5E6-FA87-4A09-958A-95ADE1E5B946}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.Foldable.net6", "Uno.UI.Foldable\Uno.UI.Foldable.net6.csproj", "{CC0AF5E6-FA87-4A09-958A-95ADE1E5B946}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Foundation.Logging", "Uno.Foundation.Logging\Uno.Foundation.Logging.csproj", "{76875E6F-30F3-4225-821F-11A299BCBDB0}"
 EndProject

diff --git a/src/Uno.UI/AssemblyInfo.cs b/src/Uno.UI/AssemblyInfo.cs
@@ -1,7 +1,7 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("Uno.UI.DualScreen")]
+[assembly: InternalsVisibleTo("Uno.UI.Foldable")]
 [assembly: InternalsVisibleTo("Uno.UI.Tests")]
 [assembly: InternalsVisibleTo("Uno.UI.Tests.Performance")]
 [assembly: InternalsVisibleTo("Uno.UI.Toolkit")]

diff --git a/src/Uno.UWP/Devices/Sensors/HingeAngleSensor.Android.cs b/src/Uno.UWP/Devices/Sensors/HingeAngleSensor.Android.cs
@@ -83,7 +83,7 @@ private static void TryInitializeHingeAngleSensor(HingeAngleSensor owner)
 			{
 				if (_hingeAngleSensor == null && !ApiExtensibility.CreateInstance(owner, out _hingeAngleSensor))
 				{
-					owner.Log().Warn("You need to reference Uno.UI.DualScreen NuGet package from your project to use this feature.");
+					owner.Log().Warn("You need to reference Uno.UI.Foldable NuGet package from your project to use this feature.");
 				}
 			}
 		}
-Original file line number
+Diff line change
@@ Expand Up @@
     			{
     				if (_hingeAngleSensor == null && !ApiExtensibility.CreateInstance(owner, out _hingeAngleSensor))
     				{
-    					owner.Log().Warn("You need to reference Uno.UI.DualScreen NuGet package from your project to use this feature.");
+    					owner.Log().Warn("You need to reference Uno.UI.Foldable NuGet package from your project to use this feature.");
     				}
     			}
     		}
@@ Expand Down @@