Merge pull request #92 from unoplatform/mergify/bp/release/stable/1.0…

…/pr-91 Normalize appxmanifest and splash generation (backport #91)
unoplatform · Mar 17, 2023 · 4ecf5fe · 4ecf5fe
2 parents 07f22ce + fbb7fe8
commit 4ecf5fe
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/...mplate/Resizetizer.Extensions.Sample.Windows/Resizetizer.Extensions.Sample.Windows.csproj b/...mplate/Resizetizer.Extensions.Sample.Windows/Resizetizer.Extensions.Sample.Windows.csproj
@@ -44,7 +44,7 @@
  <Target Name="ValidateTransientLocalAssets" AfterTargets="Build" Condition="'$(TargetFramework)'!=''">
  <PropertyGroup>
  <_ResizetizerManifestPath>$(_UnoIntermediateManifest)Package.appxmanifest</_ResizetizerManifestPath>
- <_ResizetizerSplashScreenPath>$(_UnoIntermediateSplashScreen)\Splash\splash_screenSplashScreen.scale-150.png</_ResizetizerSplashScreenPath>
+ <_ResizetizerSplashScreenPath>$(_UnoIntermediateSplashScreen)Splash\splash_screen.scale-150.png</_ResizetizerSplashScreenPath>
  <_ResizetizerAppIconPath>$(_UnoIntermediateImages)iconapp.ico</_ResizetizerAppIconPath>
  <_ResizetizerAppIconImagesPath>$(_UnoIntermediateImages)Images\iconappLogo.scale-150.png</_ResizetizerAppIconImagesPath>
  </PropertyGroup>

diff --git a/src/Resizetizer/src/DpiPath.cs b/src/Resizetizer/src/DpiPath.cs
@@ -115,12 +115,12 @@ public static DpiPath[] Image
  public static DpiPath[] SplashScreen
  => new[]
  {
- new DpiPath(OutputPath, 1.00m, "SplashScreen", ".scale-100", new SKSize(620, 300)),
- new DpiPath(OutputPath, 1.25m, "SplashScreen", ".scale-125", new SKSize(620, 300)),
- new DpiPath(OutputPath, 1.50m, "SplashScreen", ".scale-150", new SKSize(620, 300)),
- new DpiPath(OutputPath, 2.00m, "SplashScreen", ".scale-200", new SKSize(620, 300)),
- new DpiPath(OutputPath, 3.00m, "SplashScreen", ".scale-300", new SKSize(620, 300)),
- new DpiPath(OutputPath, 4.00m, "SplashScreen", ".scale-400", new SKSize(620, 300)),
+ new DpiPath(OutputPath, 1.00m, string.Empty, ".scale-100", new SKSize(620, 300)),
+ new DpiPath(OutputPath, 1.25m, string.Empty, ".scale-125", new SKSize(620, 300)),
+ new DpiPath(OutputPath, 1.50m, string.Empty, ".scale-150", new SKSize(620, 300)),
+ new DpiPath(OutputPath, 2.00m, string.Empty, ".scale-200", new SKSize(620, 300)),
+ new DpiPath(OutputPath, 3.00m, string.Empty, ".scale-300", new SKSize(620, 300)),
+ new DpiPath(OutputPath, 4.00m, string.Empty, ".scale-400", new SKSize(620, 300)),
  };
 
  // App Icon

diff --git a/src/Resizetizer/test/UnitTests/GenerateSplashAssetsTests.cs b/src/Resizetizer/test/UnitTests/GenerateSplashAssetsTests.cs
@@ -43,9 +43,9 @@ public void FileIsGenerated(string image, string color)
  var success = task.Execute();
  Assert.True(success, LogErrorEvents.FirstOrDefault()?.Message);
 
- AssertFile($"{image}SplashScreen.scale-100.png", 620, 300);
- AssertFile($"{image}SplashScreen.scale-125.png", 775, 375);
- AssertFile($"{image}SplashScreen.scale-200.png", 1240, 600);
+ AssertFile($"{image}.scale-100.png", 620, 300);
+ AssertFile($"{image}.scale-125.png", 775, 375);
+ AssertFile($"{image}.scale-200.png", 1240, 600);
  }
 
  [Theory(Skip = "We don't worked on SplashScreen")]

diff --git a/src/Resizetizer/test/UnitTests/testdata/appxmanifest/typical.appxmanifest b/src/Resizetizer/test/UnitTests/testdata/appxmanifest/typical.appxmanifest
@@ -25,7 +25,7 @@
  <uap:ShowOn Tile="wide310x150Logo" />
  </uap:ShowNameOnTiles>
  </uap:DefaultTile>
- <uap:SplashScreen Image="dotnet_botSplashScreen.png" />
+ <uap:SplashScreen Image="dotnet_bot.png" />
  </uap:VisualElements>
  </Application>
  </Applications>

diff --git a/src/Resizetizer/test/UnitTests/testdata/appxmanifest/typicalWithNoBackground.appxmanifest b/src/Resizetizer/test/UnitTests/testdata/appxmanifest/typicalWithNoBackground.appxmanifest
@@ -25,7 +25,7 @@
  <uap:ShowOn Tile="wide310x150Logo" />
  </uap:ShowNameOnTiles>
  </uap:DefaultTile>
- <uap:SplashScreen Image="dotnet_botSplashScreen.png" />
+ <uap:SplashScreen Image="dotnet_bot.png" />
  </uap:VisualElements>
  </Application>
  </Applications>