fix: Add SplashScreen and App Icons assets, color override and misc fixes

samples/Commerce/Commerce.Droid/Commerce.Droid.csproj

@@ -88,15 +88,6 @@
   <ItemGroup>
     <AndroidResource Include="Resources\values\Strings.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\mipmap-hdpi\icon.png" />
-    <AndroidResource Include="Resources\mipmap-ldpi\icon.png" />
-    <AndroidResource Include="Resources\mipmap-mdpi\icon.png" />
-    <AndroidResource Include="Resources\mipmap-tvdpi\icon.png" />
-    <AndroidResource Include="Resources\mipmap-xhdpi\icon.png" />
-    <AndroidResource Include="Resources\mipmap-xxhdpi\icon.png" />
-    <AndroidResource Include="Resources\mipmap-xxxhdpi\icon.png" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="Properties\AndroidManifest.xml" />
   </ItemGroup>
@@ -157,6 +148,73 @@
       <Name>Uno.Extensions.Reactive.View</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\mipmap-hdpi\ic_launcher.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\mipmap-hdpi\ic_launcher_background.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\mipmap-hdpi\ic_launcher_foreground.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\mipmap-mdpi\ic_launcher.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\mipmap-mdpi\ic_launcher_background.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\mipmap-mdpi\ic_launcher_foreground.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\mipmap-xhdpi\ic_launcher.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\mipmap-xhdpi\ic_launcher_background.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\mipmap-xhdpi\ic_launcher_foreground.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\mipmap-xxhdpi\ic_launcher.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\mipmap-xxhdpi\ic_launcher_background.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\mipmap-xxhdpi\ic_launcher_foreground.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher_background.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher_foreground.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-hdpi\SplashScreen.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-mdpi\SplashScreen.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\SplashScreen.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xxhdpi\SplashScreen.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xxxhdpi\SplashScreen.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\splash.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher.xml" />
+  </ItemGroup>
+  <ItemGroup />
   <Import Project="..\Commerce.Shared\Commerce.Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <!-- This will force the generation of the APK when not building inside visual studio -->
@@ -167,4 +225,4 @@
       <Compile Remove="$(_AndroidResourceDesignerFile)" />
     </ItemGroup>
   </Target>
-</Project>
+</Project>

samples/Commerce/Commerce.Droid/Main.cs

@@ -15,7 +15,7 @@ namespace Commerce.Droid
 {
 	[global::Android.App.ApplicationAttribute(
 		Label = "@string/ApplicationName",
-		Icon = "@mipmap/icon",
+		Icon = "@mipmap/ic_launcher",
 		LargeHeap = true,
 		HardwareAccelerated = true,
 		Theme = "@style/AppTheme"

samples/Commerce/Commerce.Droid/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Commerce" android:versionCode="1" android:versionName="1.0">
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="29" />
-  <application android:label="Commerce"></application>
+	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="29" />
+	<application android:label="Commerce" android:theme="@style/AppTheme" android:icon="@mipmap/ic_launcher"></application>
 </manifest>

samples/Commerce/Commerce.Droid/Resources/drawable/splash.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+  <item>
+	<shape>
+	  <solid android:color="#086AD1"/>
+	</shape>
+  </item>
+  <item android:bottom="160dp">
+	<bitmap
+	  android:src="@drawable/SplashScreen"
+	  android:gravity="center"/>
+  </item>
+</layer-list>

samples/Commerce/Commerce.Droid/Resources/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@mipmap/ic_launcher_background"/>
+  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

samples/Commerce/Commerce.Droid/Resources/values/Styles.xml

@@ -8,5 +8,7 @@
 		<item name="windowNoTitle">true</item>
 		<item name="android:windowNoTitle">true</item>
 
+	  <!-- SplashScreen -->
+	  <item name="android:windowBackground">@drawable/splash</item>
 	</style>
-</resources>
+</resources>

samples/Commerce/Commerce.Shared/App.xaml

@@ -1,11 +1,10 @@
-<Application
-    x:Class="Commerce.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:wasm="http://platform.uno/wasm"
-    xmlns:local="using:Commerce"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	mc:Ignorable="wasm">
+<Application x:Class="Commerce.App"
+			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+			 xmlns:wasm="http://platform.uno/wasm"
+			 xmlns:local="using:Commerce"
+			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+			 mc:Ignorable="wasm">
 
 	<Application.Resources>
 		<ResourceDictionary>
@@ -13,7 +12,8 @@
 				<!-- Load WinUI resources -->
 				<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
 				<!-- Load Material Color Palette -->
-				<MaterialColors xmlns="using:Uno.Material" />
+				<MaterialColors xmlns="using:Uno.Material"
+								OverrideSource="ms-appx:///ColorPaletteOverride.xaml" />
 
 				<!-- Load the Material control resources -->
 				<MaterialResources xmlns="using:Uno.Material" />
@@ -28,8 +28,8 @@
 			<x:Double x:Key="LandscapeMaxPageWidth">500</x:Double>
 			<!-- Workaround for https://github.com/unoplatform/uno/issues/5372 -->
 			<wasm:Style x:Key="MaterialToggleSwitchStyle"
-								TargetType="ToggleSwitch"
-                                BasedOn="{StaticResource DefaultMaterialToggleSwitchStyle}"/>
+						TargetType="ToggleSwitch"
+						BasedOn="{StaticResource DefaultMaterialToggleSwitchStyle}" />
 		</ResourceDictionary>
 	</Application.Resources>
 

samples/Commerce/Commerce.Shared/ColorPaletteOverride.xaml

@@ -0,0 +1,105 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+	<ResourceDictionary.ThemeDictionaries>
+		<!-- Light Theme -->
+		<ResourceDictionary x:Key="Light">
+			<!-- Primary -->
+			<Color x:Key="PrimaryColor">#086AD1</Color>
+			<Color x:Key="PrimaryVariantDarkColor">#04488C</Color>
+			<Color x:Key="PrimaryVariantLightColor">#E3EFFB</Color>
+			<Color x:Key="PrimaryHoverBrush">#0A086AD1</Color>
+			<Color x:Key="PrimaryFocusedBrush">#1F086AD1</Color>
+			<Color x:Key="PrimaryPressedBrush">#1A086AD1</Color>
+			<Color x:Key="PrimaryDraggedBrush">#40086AD1</Color>
+			<Color x:Key="PrimarySelectedBrush">#14086AD1</Color>
+			<Color x:Key="OnPrimaryBrush">#FFFFFF</Color>
+			<Color x:Key="OnPrimaryMediumBrush">#BDFFFFFF</Color>
+			<Color x:Key="OnPrimaryLowBrush">#61FFFFFF</Color>
+			<Color x:Key="OnPrimaryHoverBrush">#0AFFFFFF</Color>
+			<Color x:Key="OnPrimaryFocusedBrush">#1FFFFFFF</Color>
+			<Color x:Key="OnPrimaryPressedBrush">#1AFFFFFF</Color>
+			<Color x:Key="OnPrimaryDraggedBrush">#14FFFFFF</Color>
+			<Color x:Key="OnPrimarySelectedBrush">#14FFFFFF</Color>
+			<!-- Secondary -->
+			<Color x:Key="SecondaryColor">#FEB839</Color>
+			<Color x:Key="SecondaryVariantDarkColor">#FFA502</Color>
+			<Color x:Key="SecondaryVariantLightColor">#FFD487</Color>
+			<Color x:Key="OnSecondaryBrush">#000000</Color>
+			<Color x:Key="OnSecondaryMediumBrush">#BD000000</Color>
+			<Color x:Key="OnSecondaryLowBrush">#61000000</Color>
+			<Color x:Key="OnSecondaryHoverBrush">#0A000000</Color>
+			<Color x:Key="OnSecondaryFocusedBrush">#1F000000</Color>
+			<Color x:Key="OnSecondaryPressedBrush">#1A000000</Color>
+			<Color x:Key="OnSecondaryDraggedBrush">#14000000</Color>
+			<Color x:Key="OnSecondarySelectedBrush">#14000000</Color>
+			<!-- Background -->
+			<Color x:Key="BackgroundColor">#F0F0F0</Color>
+			<Color x:Key="OnBackgroundBrush">#000000</Color>
+			<!-- Surface -->
+			<Color x:Key="SurfaceColor">#FFFFFF</Color>
+			<Color x:Key="OnSurfaceBrush">#000000</Color>
+			<Color x:Key="OnSurfaceMediumBrush">#99000000</Color>
+			<Color x:Key="OnSurfaceLowBrush">#31000000</Color>
+			<Color x:Key="OnSurfaceHoverBrush">#0A000000</Color>
+			<Color x:Key="OnSurfaceFocusedBrush">#1F000000</Color>
+			<Color x:Key="OnSurfacePressedBrush">#1A000000</Color>
+			<Color x:Key="OnSurfaceDraggedBrush">#52000000</Color>
+			<Color x:Key="OnSurfaceSelectedBrush">#14000000</Color>
+			<!-- Error -->
+			<Color x:Key="ErrorColor">#B00020</Color>
+			<Color x:Key="OnErrorBrush">#FFFFFF</Color>
+		</ResourceDictionary>
+
+		<!-- Dark Theme -->
+		<ResourceDictionary x:Key="Dark">
+			<!-- Primary -->
+			<Color x:Key="PrimaryColor">#2F81D8</Color>
+			<Color x:Key="PrimaryVariantDarkColor">#04488C</Color>
+			<Color x:Key="PrimaryVariantLightColor">#E3EFFB</Color>
+			<Color x:Key="PrimaryHoverBrush">#0A2F81D8</Color>
+			<Color x:Key="PrimaryFocusedBrush">#1F2F81D8</Color>
+			<Color x:Key="PrimaryPressedBrush">#1A2F81D8</Color>
+			<Color x:Key="PrimaryDraggedBrush">#402F81D8</Color>
+			<Color x:Key="PrimarySelectedBrush">#142F81D8</Color>
+			<Color x:Key="OnPrimaryBrush">#FFFFFF</Color>
+			<Color x:Key="OnPrimaryMediumBrush">#BDFFFFFF</Color>
+			<Color x:Key="OnPrimaryLowBrush">#61FFFFFF</Color>
+			<Color x:Key="OnPrimaryHoverBrush">#0AFFFFFF</Color>
+			<Color x:Key="OnPrimaryFocusedBrush">#1FFFFFFF</Color>
+			<Color x:Key="OnPrimaryPressedBrush">#1AFFFFFF</Color>
+			<Color x:Key="OnPrimaryDraggedBrush">#14FFFFFF</Color>
+			<Color x:Key="OnPrimarySelectedBrush">#14FFFFFF</Color>
+			<!-- Secondary -->
+			<Color x:Key="SecondaryColor">#FEB839</Color>
+			<Color x:Key="SecondaryVariantDarkColor">#FFA502</Color>
+			<Color x:Key="SecondaryVariantLightColor">#FFD487</Color>
+			<Color x:Key="OnSecondaryBrush">#000000</Color>
+			<Color x:Key="OnSecondaryMediumBrush">#BD000000</Color>
+			<Color x:Key="OnSecondaryLowBrush">#61000000</Color>
+			<Color x:Key="OnSecondaryHoverBrush">#0A000000</Color>
+			<Color x:Key="OnSecondaryFocusedBrush">#1F000000</Color>
+			<Color x:Key="OnSecondaryPressedBrush">#1A000000</Color>
+			<Color x:Key="OnSecondaryDraggedBrush">#14000000</Color>
+			<Color x:Key="OnSecondarySelectedBrush">#14000000</Color>
+			<!-- Background -->
+			<Color x:Key="BackgroundColor">#000000</Color>
+			<Color x:Key="OnBackgroundBrush">#FFFFFF</Color>
+			<!-- Surface -->
+			<Color x:Key="SurfaceColor">#0F0F0F</Color>
+			<Color x:Key="OnSurfaceBrush">#FFFFFF</Color>
+			<Color x:Key="OnSurfaceMediumBrush">#99FFFFFF</Color>
+			<Color x:Key="OnSurfaceLowBrush">#31FFFFFF</Color>
+			<Color x:Key="OnSurfaceHoverBrush">#0AFFFFFF</Color>
+			<Color x:Key="OnSurfaceFocusedBrush">#1FFFFFFF</Color>
+			<Color x:Key="OnSurfacePressedBrush">#1AFFFFFF</Color>
+			<Color x:Key="OnSurfaceDraggedBrush">#52FFFFFF</Color>
+			<Color x:Key="OnSurfaceSelectedBrush">#14FFFFFF</Color>
+			<!-- Error -->
+			<Color x:Key="ErrorColor">#B2213C</Color>
+			<Color x:Key="OnErrorBrush">#FFFFFF</Color>
+		</ResourceDictionary>
+
+	</ResourceDictionary.ThemeDictionaries>
+
+</ResourceDictionary>

samples/Commerce/Commerce.Shared/Commerce.Shared.projitems

@@ -85,6 +85,10 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <Page Include="$(MSBuildThisFileDirectory)ColorPaletteOverride.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)MainPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

samples/Commerce/Commerce.Shared/Styles/FeedView.xaml

@@ -1,23 +1,25 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:reactive="using:Uno.Extensions.Reactive">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+					xmlns:reactive="using:Uno.Extensions.Reactive">
 
 	<Style TargetType="reactive:FeedView">
-		<Setter Property="VerticalAlignment" Value="Stretch" />
-		<Setter Property="HorizontalAlignment" Value="Stretch" />
-		<Setter Property="VerticalContentAlignment" Value="Stretch" />
-		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+		<Setter Property="VerticalAlignment"
+				Value="Stretch" />
+		<Setter Property="HorizontalAlignment"
+				Value="Stretch" />
+		<Setter Property="VerticalContentAlignment"
+				Value="Stretch" />
+		<Setter Property="HorizontalContentAlignment"
+				Value="Stretch" />
 		<Setter Property="ProgressTemplate">
 			<Setter.Value>
 				<DataTemplate>
 					<Grid>
-						<ProgressRing
-							IsActive="{Binding}"
-							Width="50"
-							Height="50"
-							VerticalAlignment="Center"
-							HorizontalAlignment="Center" />
+						<ProgressRing IsActive="{Binding}"
+									  Width="50"
+									  Height="50"
+									  VerticalAlignment="Center"
+									  HorizontalAlignment="Center" />
 					</Grid>
 				</DataTemplate>
 			</Setter.Value>
@@ -26,10 +28,9 @@
 			<Setter.Value>
 				<DataTemplate>
 					<Grid>
-						<TextBlock
-							Text="An error occurred."
-							VerticalAlignment="Center"
-							HorizontalAlignment="Center" />
+						<TextBlock Text="An error occurred."
+								   VerticalAlignment="Center"
+								   HorizontalAlignment="Center" />
 					</Grid>
 				</DataTemplate>
 			</Setter.Value>
@@ -37,13 +38,14 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="reactive:FeedView">
-					<Grid
-						VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-						HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
+					<Grid VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+						  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
 						<VisualStateManager.CustomVisualStateManager>
 							<reactive:SmoothVisualStateManager>
 								<reactive:SmoothVisualStateRule MinDuration="0:0:0.500" />
-								<reactive:SmoothVisualStateRule Group="ProgressGroup" To="Indeterminate" Delay="0:0:0.250" />
+								<reactive:SmoothVisualStateRule Group="ProgressGroup"
+																To="Indeterminate"
+																Delay="0:0:0.250" />
 							</reactive:SmoothVisualStateManager>
 						</VisualStateManager.CustomVisualStateManager>
 						<VisualStateManager.VisualStateGroups>
@@ -51,16 +53,22 @@
 								<VisualState x:Name="Undefined" />
 								<VisualState x:Name="None">
 									<VisualState.Setters>
-										<Setter Target="UndefinedPresenter.Visibility" Value="Collapsed" />
-										<Setter Target="NonePresenter.Visibility" Value="Visible" />
-										<Setter Target="SomePresenter.Visibility" Value="Collapsed" />
+										<Setter Target="UndefinedPresenter.Visibility"
+												Value="Collapsed" />
+										<Setter Target="NonePresenter.Visibility"
+												Value="Visible" />
+										<Setter Target="SomePresenter.Visibility"
+												Value="Collapsed" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Some">
 									<VisualState.Setters>
-										<Setter Target="UndefinedPresenter.Visibility" Value="Collapsed" />
-										<Setter Target="NonePresenter.Visibility" Value="Collapsed" />
-										<Setter Target="SomePresenter.Visibility" Value="Visible" />
+										<Setter Target="UndefinedPresenter.Visibility"
+												Value="Collapsed" />
+										<Setter Target="NonePresenter.Visibility"
+												Value="Collapsed" />
+										<Setter Target="SomePresenter.Visibility"
+												Value="Visible" />
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
@@ -68,40 +76,36 @@
 								<VisualStateGroup.Transitions>
 									<VisualTransition To="Error">
 										<Storyboard>
-											<ObjectAnimationUsingKeyFrames
-												Storyboard.TargetName="ErrorRoot" 
-												Storyboard.TargetProperty="Visibility">
-												<DiscreteObjectKeyFrame
-													KeyTime="0:0:0"
-													Value="Visible"/>
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ErrorRoot"
+																		   Storyboard.TargetProperty="Visibility">
+												<DiscreteObjectKeyFrame KeyTime="0:0:0"
+																		Value="Visible" />
 											</ObjectAnimationUsingKeyFrames>
-											<DoubleAnimation 
-												Storyboard.TargetName="ErrorPresenterTransform" 
-												Storyboard.TargetProperty="Y" 
-												From="-10" 
-												To="0"
-												Duration="0:0:.5" />
-											<DoubleAnimation 
-												Storyboard.TargetName="ErrorRoot" 
-												Storyboard.TargetProperty="Opacity"
-												From="0"
-												To="1"
-												Duration="0:0:.5" />
+											<DoubleAnimation Storyboard.TargetName="ErrorPresenterTransform"
+															 Storyboard.TargetProperty="Y"
+															 From="-10"
+															 To="0"
+															 Duration="0:0:.5" />
+											<DoubleAnimation Storyboard.TargetName="ErrorRoot"
+															 Storyboard.TargetProperty="Opacity"
+															 From="0"
+															 To="1"
+															 Duration="0:0:.5" />
 										</Storyboard>
 									</VisualTransition>
 								</VisualStateGroup.Transitions>
 								<VisualState x:Name="NoError" />
 								<VisualState x:Name="Error">
 									<VisualState.Setters>
-										<Setter Target="ErrorRoot.Visibility" Value="Visible" />
+										<Setter Target="ErrorRoot.Visibility"
+												Value="Visible" />
 									</VisualState.Setters>
 									<Storyboard>
-										<DoubleAnimation 
-											Storyboard.TargetName="ErrorRoot" 
-											Storyboard.TargetProperty="Opacity"
-											To="0"
-											Duration="0:0:1"
-											BeginTime="0:0:10" />
+										<DoubleAnimation Storyboard.TargetName="ErrorRoot"
+														 Storyboard.TargetProperty="Opacity"
+														 To="0"
+														 Duration="0:0:1"
+														 BeginTime="0:0:10" />
 									</Storyboard>
 								</VisualState>
 							</VisualStateGroup>
@@ -109,98 +113,98 @@
 								<VisualState x:Name="NoProgress" />
 								<VisualState x:Name="Indeterminate">
 									<VisualState.Setters>
-										<Setter Target="ProgressPresenter.Visibility" Value="Visible" />
+										<Setter Target="ProgressPresenter.Visibility"
+												Value="Visible" />
 									</VisualState.Setters>
 									<Storyboard>
-										<DoubleAnimation 
-											Storyboard.TargetName="ProgressPresenter" 
-											Storyboard.TargetProperty="Opacity" 
-											From=".5" 
-											To=".8"
-											Duration="0:0:0.250"
-											AutoReverse="True"
-											RepeatBehavior="Forever"/>
+										<DoubleAnimation Storyboard.TargetName="ProgressPresenter"
+														 Storyboard.TargetProperty="Opacity"
+														 From=".5"
+														 To=".8"
+														 Duration="0:0:0.250"
+														 AutoReverse="True"
+														 RepeatBehavior="Forever" />
 									</Storyboard>
 								</VisualState>
 							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
 
-						<ContentPresenter 
-							x:Name="UndefinedPresenter"
-							Content="{TemplateBinding Undefined}"
-							ContentTemplate="{TemplateBinding UndefinedTemplate}"
-							VerticalAlignment="Stretch"
-							HorizontalAlignment="Stretch"
-							VerticalContentAlignment="Stretch"
-							HorizontalContentAlignment="Stretch"
-							Visibility="Visible" />
-						<ContentPresenter 
-							x:Name="NonePresenter"
-							Content="{TemplateBinding None}"
-							ContentTemplate="{TemplateBinding NoneTemplate}"
-							VerticalAlignment="Stretch"
-							HorizontalAlignment="Stretch"
-							VerticalContentAlignment="Stretch"
-							HorizontalContentAlignment="Stretch"
-							Visibility="Collapsed" />
-						<ContentPresenter 
-							x:Name="SomePresenter"
-							Content="{TemplateBinding State}"
-							ContentTemplate="{TemplateBinding ValueTemplate}"
-							VerticalAlignment="Stretch"
-							HorizontalAlignment="Stretch"
-							VerticalContentAlignment="Stretch"
-							HorizontalContentAlignment="Stretch"
-							Visibility="Collapsed" />
+						<ContentPresenter x:Name="UndefinedPresenter"
+										  Content="{TemplateBinding Undefined}"
+										  ContentTemplate="{TemplateBinding UndefinedTemplate}"
+										  VerticalAlignment="Stretch"
+										  HorizontalAlignment="Stretch"
+										  VerticalContentAlignment="Stretch"
+										  HorizontalContentAlignment="Stretch"
+										  Visibility="Visible" />
+						<ContentPresenter x:Name="NonePresenter"
+										  Content="{TemplateBinding None}"
+										  ContentTemplate="{TemplateBinding NoneTemplate}"
+										  VerticalAlignment="Stretch"
+										  HorizontalAlignment="Stretch"
+										  VerticalContentAlignment="Stretch"
+										  HorizontalContentAlignment="Stretch"
+										  Visibility="Collapsed" />
+						<ContentPresenter x:Name="SomePresenter"
+										  Content="{TemplateBinding State}"
+										  ContentTemplate="{TemplateBinding ValueTemplate}"
+										  VerticalAlignment="Stretch"
+										  HorizontalAlignment="Stretch"
+										  VerticalContentAlignment="Stretch"
+										  HorizontalContentAlignment="Stretch"
+										  Visibility="Collapsed" />
 
-						<Border
-							x:Name="ErrorRoot"
-							HorizontalAlignment="Center"
-							VerticalAlignment="Top"
-							Background="Red"
-							Visibility="Collapsed"
-							Padding="20">
+						<Border x:Name="ErrorRoot"
+								HorizontalAlignment="Center"
+								VerticalAlignment="Top"
+								Background="Red"
+								Visibility="Collapsed"
+								Padding="20">
 							<Border.RenderTransform>
 								<TranslateTransform x:Name="ErrorPresenterTransform" />
 							</Border.RenderTransform>
-							<ContentPresenter
-								Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=State.Error}"
-								ContentTemplate="{TemplateBinding ErrorTemplate}"
-								HorizontalAlignment="Stretch"
-								VerticalAlignment="Stretch"
-								VerticalContentAlignment="Stretch"
-								HorizontalContentAlignment="Stretch"/>
+							<ContentPresenter Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=State.Error}"
+											  ContentTemplate="{TemplateBinding ErrorTemplate}"
+											  HorizontalAlignment="Stretch"
+											  VerticalAlignment="Stretch"
+											  VerticalContentAlignment="Stretch"
+											  HorizontalContentAlignment="Stretch" />
 						</Border>
 
-						<ContentControl
-							x:Name="ProgressPresenter"
-							Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=State.Progress}"
-							ContentTemplate="{TemplateBinding ProgressTemplate}"
-							HorizontalAlignment="Center"
-							VerticalAlignment="Center"
-							Visibility="Collapsed"
-							Opacity="0" />
+						<ContentPresenter x:Name="ProgressPresenter"
+										  Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=State.Progress}"
+										  ContentTemplate="{TemplateBinding ProgressTemplate}"
+										  HorizontalAlignment="Stretch"
+										  VerticalAlignment="Stretch"
+										  VerticalContentAlignment="Stretch"
+										  HorizontalContentAlignment="Stretch"
+										  Visibility="Collapsed"
+										  Opacity="0" />
 					</Grid>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
 	</Style>
 
-	<Style TargetType="reactive:FeedView" x:Key="SingleStateFeedView">
-		<Setter Property="VerticalAlignment" Value="Stretch" />
-		<Setter Property="HorizontalAlignment" Value="Stretch" />
-		<Setter Property="VerticalContentAlignment" Value="Stretch" />
-		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
+	<Style TargetType="reactive:FeedView"
+		   x:Key="SingleStateFeedView">
+		<Setter Property="VerticalAlignment"
+				Value="Stretch" />
+		<Setter Property="HorizontalAlignment"
+				Value="Stretch" />
+		<Setter Property="VerticalContentAlignment"
+				Value="Stretch" />
+		<Setter Property="HorizontalContentAlignment"
+				Value="Stretch" />
 		<Setter Property="ProgressTemplate">
 			<Setter.Value>
 				<DataTemplate>
 					<Grid>
-						<ProgressRing
-							IsActive="{Binding}"
-							Width="50"
-							Height="50"
-							VerticalAlignment="Center"
-							HorizontalAlignment="Center" />
+						<ProgressRing IsActive="{Binding}"
+									  Width="50"
+									  Height="50"
+									  VerticalAlignment="Center"
+									  HorizontalAlignment="Center" />
 					</Grid>
 				</DataTemplate>
 			</Setter.Value>
@@ -209,10 +213,9 @@
 			<Setter.Value>
 				<DataTemplate>
 					<Grid>
-						<TextBlock
-							Text="An error occurred."
-							VerticalAlignment="Center"
-							HorizontalAlignment="Center" />
+						<TextBlock Text="An error occurred."
+								   VerticalAlignment="Center"
+								   HorizontalAlignment="Center" />
 					</Grid>
 				</DataTemplate>
 			</Setter.Value>
@@ -220,13 +223,14 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="reactive:FeedView">
-					<Grid
-						VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-						HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
+					<Grid VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+						  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
 						<VisualStateManager.CustomVisualStateManager>
 							<reactive:SmoothVisualStateManager>
 								<reactive:SmoothVisualStateRule MinDuration="0:0:0.500" />
-								<reactive:SmoothVisualStateRule Group="ProgressGroup" To="Indeterminate" Delay="0:0:0.250" />
+								<reactive:SmoothVisualStateRule Group="ProgressGroup"
+																To="Indeterminate"
+																Delay="0:0:0.250" />
 							</reactive:SmoothVisualStateManager>
 						</VisualStateManager.CustomVisualStateManager>
 						<VisualStateManager.VisualStateGroups>
@@ -234,16 +238,22 @@
 								<VisualState x:Name="Undefined" />
 								<VisualState x:Name="None">
 									<VisualState.Setters>
-										<Setter Target="UndefinedPresenter.Visibility" Value="Collapsed" />
-										<Setter Target="NonePresenter.Visibility" Value="Visible" />
-										<Setter Target="SomePresenter.Visibility" Value="Collapsed" />
+										<Setter Target="UndefinedPresenter.Visibility"
+												Value="Collapsed" />
+										<Setter Target="NonePresenter.Visibility"
+												Value="Visible" />
+										<Setter Target="SomePresenter.Visibility"
+												Value="Collapsed" />
 									</VisualState.Setters>
 								</VisualState>
 								<VisualState x:Name="Some">
 									<VisualState.Setters>
-										<Setter Target="UndefinedPresenter.Visibility" Value="Collapsed" />
-										<Setter Target="NonePresenter.Visibility" Value="Collapsed" />
-										<Setter Target="SomePresenter.Visibility" Value="Visible" />
+										<Setter Target="UndefinedPresenter.Visibility"
+												Value="Collapsed" />
+										<Setter Target="NonePresenter.Visibility"
+												Value="Collapsed" />
+										<Setter Target="SomePresenter.Visibility"
+												Value="Visible" />
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
@@ -251,8 +261,10 @@
 								<VisualState x:Name="NoError" />
 								<VisualState x:Name="Error">
 									<VisualState.Setters>
-										<Setter Target="DataRoot.Visibility" Value="Collapsed" />
-										<Setter Target="ErrorRoot.Visibility" Value="Visible" />
+										<Setter Target="DataRoot.Visibility"
+												Value="Collapsed" />
+										<Setter Target="ErrorRoot.Visibility"
+												Value="Visible" />
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
@@ -260,101 +272,97 @@
 								<VisualStateGroup.Transitions>
 									<VisualTransition To="Indeterminate">
 										<Storyboard>
-											<ObjectAnimationUsingKeyFrames
-												Storyboard.TargetName="ProgressRoot"
-												Storyboard.TargetProperty="Visibility">
-												<DiscreteObjectKeyFrame KeyTime="0:0:0" Value="Visible" />
+											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ProgressRoot"
+																		   Storyboard.TargetProperty="Visibility">
+												<DiscreteObjectKeyFrame KeyTime="0:0:0"
+																		Value="Visible" />
 											</ObjectAnimationUsingKeyFrames>
-											<DoubleAnimation 
-												Storyboard.TargetName="ProgressPresenter" 
-												Storyboard.TargetProperty="Opacity" 
-												From="0" 
-												To="1"
-												Duration="0:0:0.100" />
-											<DoubleAnimation 
-												Storyboard.TargetName="DataRoot" 
-												Storyboard.TargetProperty="Opacity" 
-												To="0"
-												Duration="0:0:0.100" />
-											<DoubleAnimation 
-												Storyboard.TargetName="ErrorRoot" 
-												Storyboard.TargetProperty="Opacity" 
-												To="0"
-												Duration="0:0:0.100" />
+											<DoubleAnimation Storyboard.TargetName="ProgressPresenter"
+															 Storyboard.TargetProperty="Opacity"
+															 From="0"
+															 To="1"
+															 Duration="0:0:0.100" />
+											<DoubleAnimation Storyboard.TargetName="DataRoot"
+															 Storyboard.TargetProperty="Opacity"
+															 To="0"
+															 Duration="0:0:0.100" />
+											<DoubleAnimation Storyboard.TargetName="ErrorRoot"
+															 Storyboard.TargetProperty="Opacity"
+															 To="0"
+															 Duration="0:0:0.100" />
 										</Storyboard>
 									</VisualTransition>
 									<VisualTransition From="Indeterminate">
 										<Storyboard>
-											<DoubleAnimation 
-												Storyboard.TargetName="ProgressPresenter" 
-												Storyboard.TargetProperty="Opacity" 
-												From="1" 
-												To="0"
-												Duration="0:0:0.100" />
+											<DoubleAnimation Storyboard.TargetName="ProgressPresenter"
+															 Storyboard.TargetProperty="Opacity"
+															 From="1"
+															 To="0"
+															 Duration="0:0:0.100" />
 										</Storyboard>
 									</VisualTransition>
 								</VisualStateGroup.Transitions>
 								<VisualState x:Name="NoProgress" />
 								<VisualState x:Name="Indeterminate">
 									<VisualState.Setters>
-										<Setter Target="DataRoot.Visibility" Value="Collapsed" />
-										<Setter Target="ErrorRoot.Visibility" Value="Collapsed" />
-										<Setter Target="ProgressRoot.Visibility" Value="Visible" />
+										<Setter Target="DataRoot.Visibility"
+												Value="Collapsed" />
+										<Setter Target="ErrorRoot.Visibility"
+												Value="Collapsed" />
+										<Setter Target="ProgressRoot.Visibility"
+												Value="Visible" />
 									</VisualState.Setters>
 								</VisualState>
 							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
 
 						<Grid x:Name="DataRoot">
-							<ContentPresenter 
-								x:Name="UndefinedPresenter"
-								Content="{TemplateBinding Undefined}"
-								ContentTemplate="{TemplateBinding UndefinedTemplate}"
-								VerticalAlignment="Stretch"
-								HorizontalAlignment="Stretch"
-								VerticalContentAlignment="Stretch"
-								HorizontalContentAlignment="Stretch"
-								Visibility="Visible" />
-							<ContentPresenter 
-								x:Name="NonePresenter"
-								Content="{TemplateBinding None}"
-								ContentTemplate="{TemplateBinding NoneTemplate}"
-								VerticalAlignment="Stretch"
-								HorizontalAlignment="Stretch"
-								VerticalContentAlignment="Stretch"
-								HorizontalContentAlignment="Stretch"
-								Visibility="Collapsed" />
-							<ContentPresenter 
-								x:Name="SomePresenter"
-								Content="{TemplateBinding State}"
-								ContentTemplate="{TemplateBinding ValueTemplate}"
-								VerticalAlignment="Stretch"
-								HorizontalAlignment="Stretch"
-								VerticalContentAlignment="Stretch"
-								HorizontalContentAlignment="Stretch"
-								Visibility="Collapsed" />
+							<ContentPresenter x:Name="UndefinedPresenter"
+											  Content="{TemplateBinding Undefined}"
+											  ContentTemplate="{TemplateBinding UndefinedTemplate}"
+											  VerticalAlignment="Stretch"
+											  HorizontalAlignment="Stretch"
+											  VerticalContentAlignment="Stretch"
+											  HorizontalContentAlignment="Stretch"
+											  Visibility="Visible" />
+							<ContentPresenter x:Name="NonePresenter"
+											  Content="{TemplateBinding None}"
+											  ContentTemplate="{TemplateBinding NoneTemplate}"
+											  VerticalAlignment="Stretch"
+											  HorizontalAlignment="Stretch"
+											  VerticalContentAlignment="Stretch"
+											  HorizontalContentAlignment="Stretch"
+											  Visibility="Collapsed" />
+							<ContentPresenter x:Name="SomePresenter"
+											  Content="{TemplateBinding State}"
+											  ContentTemplate="{TemplateBinding ValueTemplate}"
+											  VerticalAlignment="Stretch"
+											  HorizontalAlignment="Stretch"
+											  VerticalContentAlignment="Stretch"
+											  HorizontalContentAlignment="Stretch"
+											  Visibility="Collapsed" />
 						</Grid>
 
-						<Grid x:Name="ErrorRoot" Visibility="Collapsed">
-							<ContentPresenter 
-								x:Name="ErrorPresenter"
-								Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=State.Error}"
-								ContentTemplate="{TemplateBinding ErrorTemplate}"
-								HorizontalAlignment="Stretch"
-								VerticalAlignment="Stretch"
-								VerticalContentAlignment="Stretch"
-								HorizontalContentAlignment="Stretch" />
+						<Grid x:Name="ErrorRoot"
+							  Visibility="Collapsed">
+							<ContentPresenter x:Name="ErrorPresenter"
+											  Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=State.Error}"
+											  ContentTemplate="{TemplateBinding ErrorTemplate}"
+											  HorizontalAlignment="Stretch"
+											  VerticalAlignment="Stretch"
+											  VerticalContentAlignment="Stretch"
+											  HorizontalContentAlignment="Stretch" />
 						</Grid>
 
-						<Grid x:Name="ProgressRoot" Visibility="Visible">
-							<ContentPresenter
-								x:Name="ProgressPresenter"
-								Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=State.Progress}"
-								ContentTemplate="{TemplateBinding ProgressTemplate}"
-								HorizontalAlignment="Stretch"
-								VerticalAlignment="Stretch"
-								VerticalContentAlignment="Stretch"
-								HorizontalContentAlignment="Stretch" />
+						<Grid x:Name="ProgressRoot"
+							  Visibility="Visible">
+							<ContentPresenter x:Name="ProgressPresenter"
+											  Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=State.Progress}"
+											  ContentTemplate="{TemplateBinding ProgressTemplate}"
+											  HorizontalAlignment="Stretch"
+											  VerticalAlignment="Stretch"
+											  VerticalContentAlignment="Stretch"
+											  HorizontalContentAlignment="Stretch" />
 						</Grid>
 					</Grid>
 				</ControlTemplate>

samples/Commerce/Commerce.Shared/Views/FilterPopup.xaml

@@ -22,14 +22,17 @@
                     Value="Bottom" />
             <Setter Property="VerticalAlignment"
                     Value="Bottom" />
-            <Setter Property="HorizontalAlignment"
-                    Value="Center" />
-            <Setter Property="MaxWidth"
+			<Setter Property="HorizontalAlignment"
+					Value="Center" />
+			<Setter Property="MinWidth"
+					Value="345" />
+			<Setter Property="MaxWidth"
                     Value="NaN" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="FlyoutPresenter">
-                        <Border Background="{TemplateBinding Background}"
+                        <Border MinWidth="{TemplateBinding MinWidth}"
+								Background="{TemplateBinding Background}"
                                 HorizontalAlignment="Center"
                                 VerticalAlignment="Bottom"
                                 BackgroundSizing="OuterBorderEdge"
@@ -42,13 +45,15 @@
                                 </TransitionCollection>
                             </Border.Transitions>
                             <ScrollViewer x:Name="ScrollViewer"
+										  MinWidth="{TemplateBinding MinWidth}"
                                           ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}"
                                           HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
                                           HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                                           VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
                                           VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
                                           AutomationProperties.AccessibilityView="Raw">
-                                <ContentPresenter Content="{TemplateBinding Content}"
+								<ContentPresenter MinWidth="{TemplateBinding MinWidth}"
+												  Content="{TemplateBinding Content}"
                                                   ContentTemplate="{TemplateBinding ContentTemplate}"
                                                   ContentTransitions="{TemplateBinding ContentTransitions}"
                                                   HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"

samples/Commerce/Commerce.Shared/Views/ProductDetailsPage.xaml

@@ -23,9 +23,9 @@
 		<utu:NavigationBar Content="Fresh Foam Hierro v6..." utu:AutoLayout.CounterAlignment="Stretch" Style="{StaticResource MaterialNavigationBarStyle}">
 
 		</utu:NavigationBar>
-		<ScrollViewer>
-			<reactive:FeedView
-			Source="{Binding Product}">
+		<ScrollViewer utu:AutoLayout.CounterAlignment="Stretch"
+					  utu:AutoLayout.PrimaryAlignment="Stretch">
+			<reactive:FeedView Source="{Binding Product}">
 				<DataTemplate>
 					<utu:AutoLayout DataContext="{Binding Data}" Background="{StaticResource MaterialSurfaceBrush}" utu:AutoLayout.CounterAlignment="Stretch" utu:AutoLayout.PrimaryAlignment="Stretch">
 				<utu:AutoLayout Spacing="10" Padding="16,16,16,16" utu:AutoLayout.CounterAlignment="Stretch">

samples/Commerce/Commerce.UWP/Commerce.Uwp.csproj

@@ -206,7 +206,11 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Assets\LockScreenLogo.scale-200.png" />
+    <Content Include="Assets\SplashScreen.scale-100.png" />
+    <Content Include="Assets\SplashScreen.scale-125.png" />
+    <Content Include="Assets\SplashScreen.scale-150.png" />
     <Content Include="Assets\SplashScreen.scale-200.png" />
+    <Content Include="Assets\SplashScreen.scale-400.png" />
     <Content Include="Assets\Square150x150Logo.scale-200.png" />
     <Content Include="Assets\Square44x44Logo.scale-200.png" />
     <Content Include="Assets\StoreLogo.png" />

samples/Commerce/Commerce.UWP/Package.appxmanifest

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 
 <Package
   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
@@ -36,9 +36,9 @@
         Square150x150Logo="Assets\Square150x150Logo.png"
         Square44x44Logo="Assets\Square44x44Logo.png"
         Description="Commerce"
-        BackgroundColor="transparent">
+        BackgroundColor="#086AD1">
         <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png"/>
-        <uap:SplashScreen Image="Assets\SplashScreen.png" />
+        <uap:SplashScreen Image="Assets\SplashScreen.png"  BackgroundColor="#086AD1"/>
       </uap:VisualElements>
     </Application>
   </Applications>

samples/Commerce/Commerce.Wasm/Commerce.Wasm.csproj

@@ -17,7 +17,7 @@
 		<WasmShellILLinkerEnabled>true</WasmShellILLinkerEnabled>
 	</PropertyGroup>
 	<ItemGroup>
-		<Content Include="Assets\SplashScreen.png" />
+		<Content Include="Assets\SplashScreen.scale-200.png" />
 	</ItemGroup>
 	<ItemGroup>
 		<UpToDateCheckInput Include="..\Commerce.Shared\**\*.xaml" />

samples/Commerce/Commerce.Wasm/WasmScripts/AppManifest.js

@@ -1,7 +1,7 @@
 var UnoAppManifest = {
 
-    splashScreenImage: "Assets/SplashScreen.png",
-    splashScreenColor: "#fff",
+    splashScreenImage: "Assets/SplashScreen.scale-200.png",
+    splashScreenColor: "#086AD1",
     displayName: "Commerce"
 
 }

samples/Commerce/Commerce.iOS/Commerce.iOS.csproj

@@ -175,8 +175,14 @@
   <ItemGroup>
     <None Include="Info.plist" />
     <None Include="Entitlements.plist" />
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Contents.json">
+      <Visible>false</Visible>
+    </ImageAsset>
+    <InterfaceDefinition Include="LaunchScreen.storyboard" />
+  </ItemGroup>
+  <ItemGroup>
+    <BundleResource Include="Resources\SplashScreen.png" />
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Uno.Extensions.Configuration\Uno.Extensions.Configuration.csproj">
       <Project>{0dde79de-181b-42ef-af00-56dc622a6afa}</Project>
@@ -231,6 +237,74 @@
       <Name>Uno.Extensions.Reactive.View</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon1024.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+  </ItemGroup>
+  <ItemGroup>
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon120.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+  </ItemGroup>
+  <ItemGroup>
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon152.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+  </ItemGroup>
+  <ItemGroup>
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon167.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+  </ItemGroup>
+  <ItemGroup>
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon180.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+  </ItemGroup>
+  <ItemGroup>
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon20.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+  </ItemGroup>
+  <ItemGroup>
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon29.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+  </ItemGroup>
+  <ItemGroup>
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon40.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+  </ItemGroup>
+  <ItemGroup>
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon58.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+  </ItemGroup>
+  <ItemGroup>
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon60.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+  </ItemGroup>
+  <ItemGroup>
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon76.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+  </ItemGroup>
+  <ItemGroup>
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon80.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+  </ItemGroup>
+  <ItemGroup>
+    <ImageAsset Include="Media.xcassets\AppIcons.appiconset\Icon87.png">
+      <Visible>false</Visible>
+    </ImageAsset>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Media.xcassets\AppIcons.appiconset\iTunesArtwork%402x.png" />
+  </ItemGroup>
   <Import Project="XamarinForms.targets" Condition="'$(Configuration)'=='Debug'" />
   <Import Project="..\Commerce.Shared\Commerce.Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />

samples/Commerce/Commerce.iOS/Info.plist

@@ -53,5 +53,7 @@
 	<string>{320, 568}</string>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
+	<key>XSAppIconAssets</key>
+	<string>Media.xcassets/AppIcons.appiconset</string>
   </dict>
 </plist>

samples/Commerce/Commerce.iOS/LaunchScreen.storyboard

@@ -15,13 +15,13 @@
                     <view contentMode="scaleToFill" id="55" key="view">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <color key="backgroundColor" colorSpace="custom" customColorSpace="sRGB" red="1" green="1" blue="1" alpha="1"/>
+                        <color key="backgroundColor" colorSpace="custom" customColorSpace="sRGB" red="0.0314" green="0.4157" blue="0.8196" alpha="1"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="56" translatesAutoresizingMaskIntoConstraints="NO" image="SplashScreen.png">
-                                <rect key="frame" x="58" y="120" width="204" height="242"/>
+                                <rect key="frame" x="58" y="120" width="177" height="31"/>
                                 <constraints>
-                                    <constraint id="91" firstItem="56" firstAttribute="width" constant="204"/>
-                                    <constraint id="92" firstItem="56" firstAttribute="height" constant="242"/>
+                                    <constraint id="91" firstItem="56" firstAttribute="width" constant="177"/>
+                                    <constraint id="92" firstItem="56" firstAttribute="height" constant="31"/>
                                 </constraints>
                             </imageView>
                         </subviews>
@@ -37,12 +37,7 @@
         </scene>
     </scenes>
     <resources>
-        <image name="iPhone-40x40@3x.png" width="40" height="40"/>
-        <image name="iPhone-60x60@2x.png" width="60" height="60"/>
-        <image name="iPad-76x76@2x.png" width="76" height="76"/>
-        <image name="iPhone-40x40@3x.png" width="40" height="40"/>
-        <image name="Icon-Small.png" width="29" height="29"/>
-        <image name="SplashScreen.png" width="620" height="300"/>
+        <image name="SplashScreen.png" width="177" height="31"/>
     </resources>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>

samples/Commerce/Commerce.iOS/Media.xcassets/LaunchImages.launchimage/Contents.json

@@ -1,58 +0,0 @@
-{
-  "images": [
-    {
-      "orientation": "portrait",
-      "extent": "full-screen",
-      "minimum-system-version": "7.0",
-      "scale": "2x",
-      "size": "640x960",
-      "idiom": "iphone"
-    },
-    {
-      "orientation": "portrait",
-      "extent": "full-screen",
-      "minimum-system-version": "7.0",
-      "subtype": "retina4",
-      "scale": "2x",
-      "size": "640x1136",
-      "idiom": "iphone"
-    },
-    {
-      "orientation": "portrait",
-      "extent": "full-screen",
-      "minimum-system-version": "7.0",
-      "scale": "1x",
-      "size": "768x1024",
-      "idiom": "ipad"
-    },
-    {
-      "orientation": "landscape",
-      "extent": "full-screen",
-      "minimum-system-version": "7.0",
-      "scale": "1x",
-      "size": "1024x768",
-      "idiom": "ipad"
-    },
-    {
-      "orientation": "portrait",
-      "extent": "full-screen",
-      "minimum-system-version": "7.0",
-      "scale": "2x",
-      "size": "1536x2048",
-      "idiom": "ipad"
-    },
-    {
-      "orientation": "landscape",
-      "extent": "full-screen",
-      "minimum-system-version": "7.0",
-      "scale": "2x",
-      "size": "2048x1536",
-      "idiom": "ipad"
-    }
-  ],
-  "properties": {},
-  "info": {
-    "version": 1,
-    "author": ""
-  }
-}

samples/Commerce/Commerce.macOS/Commerce.macOS.csproj

@@ -129,7 +129,11 @@
     <ImageAsset Include="Assets.xcassets\unologo.imageset\Contents.json" />
     <ImageAsset Include="Assets.xcassets\unologo.imageset\unoplatform.jpg" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Content Include="Resources\SplashScreen%402x.png" />
+    <Content Include="Resources\SplashScreen%403x.png" />
+    <Content Include="Resources\SplashScreen.png" />
+  </ItemGroup>
   <ItemGroup>
     <None Include="Info.plist" />
     <None Include="Entitlements.plist" />