Feature: Added app name to the splash screen (#13594)

files-community · Oct 30, 2023 · e593674 · e593674
1 parent dff8f65
commit e593674
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 10 deletions.
diff --git a/src/Files.App/Views/SplashScreenPage.xaml b/src/Files.App/Views/SplashScreenPage.xaml
@@ -9,16 +9,38 @@
 	mc:Ignorable="d">
 
 	<Grid>
-		<Image
-			x:Name="MainSplashScreenImage"
-			Width="420"
-			ImageFailed="Image_ImageFailed"
-			ImageOpened="Image_ImageOpened"
-			Source="\Assets\AppTiles\Dev\SplashScreen.png" />
+		<!--  Splash Screen Image  -->
+		<Viewbox
+			x:Name="SplashScreenImageViewbox"
+			Width="620"
+			Height="300"
+			HorizontalAlignment="Center"
+			VerticalAlignment="Center"
+			Stretch="None">
+			<Image
+				x:Name="SplashScreenImage"
+				ImageFailed="Image_ImageFailed"
+				ImageOpened="Image_ImageOpened"
+				Source="\Assets\AppTiles\Dev\SplashScreen.png" />
+		</Viewbox>
 
+		<!--  Branch Label  -->
+		<TextBlock
+			x:Name="SplashScreenBranchLabel"
+			Margin="0,164,0,0"
+			HorizontalAlignment="Center"
+			VerticalAlignment="Center"
+			FontSize="20"
+			Foreground="{ThemeResource TextFillColorTertiaryBrush}"
+			LineHeight="32">
+			<Run FontWeight="SemiBold" Text="Files" />
+			<Run FontWeight="SemiLight" Text="Preview" />
+		</TextBlock>
+
+		<!--  Loading Indicator  -->
 		<ProgressRing
-			x:Name="MainProgressRing"
-			Margin="0,0,0,88"
+			x:Name="SplashScreenLoadingProgressRing"
+			Margin="0,0,0,48"
 			VerticalAlignment="Bottom"
 			Foreground="{ThemeResource ApplicationForegroundThemeBrush}"
 			IsIndeterminate="True" />
@@ -27,10 +49,10 @@
 			<VisualStateGroup x:Name="SizeChangesState">
 				<VisualState>
 					<VisualState.StateTriggers>
-						<AdaptiveTrigger MinWindowWidth="640" />
+						<AdaptiveTrigger MinWindowHeight="500" />
 					</VisualState.StateTriggers>
 					<VisualState.Setters>
-						<Setter Target="MainSplashScreenImage.Width" Value="480" />
+						<Setter Target="SplashScreenLoadingProgressRing.Margin" Value="0,0,0,88" />
 					</VisualState.Setters>
 				</VisualState>
 			</VisualStateGroup>

diff --git a/src/Files.App/Views/SplashScreenPage.xaml.cs b/src/Files.App/Views/SplashScreenPage.xaml.cs
@@ -11,6 +11,14 @@ namespace Files.App.Views
 	/// </summary>
 	public sealed partial class SplashScreenPage : Page
 	{
+		private string BranchLabel =>
+			ApplicationService.AppEnvironment switch
+			{
+				AppEnvironment.Dev => "Dev",
+				AppEnvironment.Preview => "Preview",
+				_ => string.Empty,
+			};
+
 		public SplashScreenPage()
 		{
 			InitializeComponent();