feat(ExtendedSplashScreen): add android 12 splashscreen support

unoplatform · Mar 11, 2024 · 0b46928 · 0b46928
1 parent dfe2584
commit 0b46928
Show file tree

Hide file tree

Showing 15 changed files with 328 additions and 56 deletions.
diff --git a/samples/Directory.Packages.props b/samples/Directory.Packages.props
@@ -44,8 +44,8 @@
     <PackageVersion Include="Uno.WinUI.WebAssembly" Version="5.1.0-dev.975" />
     <PackageVersion Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.3" />
     <!-- Required to avoid warnings in 1.9.0.1 of Android.Material - https://github.com/xamarin/AndroidX/issues/727 -->
-    <PackageVersion Include="Xamarin.AndroidX.Annotation" Version="1.6.0.3" />
-    <PackageVersion Include="Xamarin.AndroidX.Browser" Version="1.4.0.2" />
+    <PackageVersion Include="Xamarin.AndroidX.Annotation" Version="1.7.1.1" />
+    <PackageVersion Include="Xamarin.AndroidX.Browser" Version="1.7.1.1" />
     <PackageVersion Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.3.1.1" />
     <PackageVersion Include="Xamarin.Google.Android.Material" Version="1.4.0.4" />
     <PackageVersion Include="Xamarin.Jetbrains.Annotations" Version="23.0.0.4" />

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Mobile/Android/AndroidManifest.xml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Mobile/Android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="uno.platform.toolkit-uwp" android:versionCode="1" android:versionName="1.0">
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="33" />
+  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
   <uses-permission android:name="android.permission.INTERNET" />
   <application android:label="Uno.Toolkit.Samples"></application>
 </manifest>
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Mobile/Android/MainActivity.Android.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Mobile/Android/MainActivity.Android.cs
@@ -5,6 +5,7 @@
 using Android.OS;
 using Android.Views;
 using Java.Interop;
+using Uno.Toolkit.UI;
 
 namespace Uno.Toolkit.Samples.Droid;
 

diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Shell.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Shell.xaml
@@ -18,53 +18,53 @@
 		</Grid.RowDefinitions>
 
 		<muxc:NavigationView Grid.Row="1"
-							 utu:SafeArea.Insets="VisibleBounds"
-							 x:Name="NavigationViewControl"
-							 OpenPaneLength="260"
-							 IsBackEnabled="False"
-							 IsBackButtonVisible="Collapsed"
-							 IsPaneToggleButtonVisible="True"
-							 PaneDisplayMode="Auto"
-							 DisplayModeChanged="NavigationViewControl_DisplayModeChanged"
-							 IsSettingsVisible="True"
-							 IsTabStop="False"
-							 Style="{StaticResource MaterialNavigationViewStyle}">
+						 utu:SafeArea.Insets="VisibleBounds"
+						 x:Name="NavigationViewControl"
+						 OpenPaneLength="260"
+						 IsBackEnabled="False"
+						 IsBackButtonVisible="Collapsed"
+						 IsPaneToggleButtonVisible="True"
+						 PaneDisplayMode="Auto"
+						 DisplayModeChanged="NavigationViewControl_DisplayModeChanged"
+						 IsSettingsVisible="True"
+						 IsTabStop="False"
+						 Style="{StaticResource MaterialNavigationViewStyle}">
 			<muxc:NavigationView.PaneHeader>
 				<!-- Left padding for overlay toggle button -->
 				<Grid Padding="24,8,0,0">
 					<!-- Image -->
 					<Image Source="ms-appx:///Assets/UnoLogo.png"
-						   Height="101"
-						   Width="75"
-						   HorizontalAlignment="Left"
-						   Margin="16,8,0,12" />
+					   Height="101"
+					   Width="75"
+					   HorizontalAlignment="Left"
+					   Margin="16,8,0,12" />
 
 					<ToggleButton x:Name="DarkModeToggle"
-								  Content="Light and Dark"
-								  Style="{StaticResource DarkLightToggleTheme}"
-								  Click="ToggleButton_Click"
-								  Margin="0,0,20,16"
-								  HorizontalAlignment="Right"
-								  VerticalAlignment="Bottom" />
+							  Content="Light and Dark"
+							  Style="{StaticResource DarkLightToggleTheme}"
+							  Click="ToggleButton_Click"
+							  Margin="0,0,20,16"
+							  HorizontalAlignment="Right"
+							  VerticalAlignment="Bottom" />
 				</Grid>
 			</muxc:NavigationView.PaneHeader>
 		</muxc:NavigationView>
 
 		<!-- Nested frame for samples that needs to be fullscreen -->
 		<Frame x:Name="NestedSampleFrame"
-			   AutomationProperties.AutomationId="NestedSampleFrame"
-			   Grid.RowSpan="2"
-			   Visibility="Collapsed" />
+		   AutomationProperties.AutomationId="NestedSampleFrame"
+		   Grid.RowSpan="2"
+		   Visibility="Collapsed" />
 
 		<local:ModalDialog x:Name="ModalDialog" />
 
 		<StackPanel x:Name="DebugPanel"
-					x:Load="False"
-					Grid.RowSpan="2"
-					Background="Pink"
-					Padding="5"
-					HorizontalAlignment="Center"
-					VerticalAlignment="Bottom">
+				x:Load="False"
+				Grid.RowSpan="2"
+				Background="Pink"
+				Padding="5"
+				HorizontalAlignment="Center"
+				VerticalAlignment="Bottom">
 			<StackPanel Orientation="Horizontal">
 				<Button Content="DebugVT" Click="DebugVT" />
 				<Button Content="T" Click="DebugVTAsync" />

diff --git a/...es/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/Android/AndroidManifest.xml b/...es/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/Android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="uno.platform.toolkit" android:versionCode="1" android:versionName="1.0">
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="33" />
+  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="33" />
   <uses-permission android:name="android.permission.INTERNET" />
   <application android:label="Uno.Toolkit.WinUI.Samples"></application>
 </manifest>
diff --git a/...no.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/Android/MainActivity.Android.cs b/...no.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Mobile/Android/MainActivity.Android.cs
@@ -8,6 +8,7 @@
 using System.IO;
 using System;
 using System.Threading;
+using Uno.Toolkit.UI;
 
 namespace Uno.Toolkit.WinUI.Samples.Droid;
 

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -36,8 +36,9 @@
     <PackageVersion Include="Uno.UITest.Helpers" Version="1.1.0-dev.70" />
     <PackageVersion Include="Uno.UITest.Selenium" Version="1.1.0-dev.70" />
     <PackageVersion Include="Uno.UITest.Xamarin" Version="1.1.0-dev.70" />
+    <PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.6" />
     <PackageVersion Include="Xamarin.UITest" Version="4.3.3" />
     <PackageVersion Include="MSTest.TestFramework" Version="2.1.2" />
     <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" />
   </ItemGroup>
-</Project>
+</Project>