Skip to content

Commit e593674

Browse files
0x5bfayaira2
authored andcommitted
Feature: Added app name to the splash screen (#13594)
1 parent dff8f65 commit e593674

File tree

2 files changed

+40
-10
lines changed

2 files changed

+40
-10
lines changed

src/Files.App/Views/SplashScreenPage.xaml

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,38 @@
99
mc:Ignorable="d">
1010

1111
<Grid>
12-
<Image
13-
x:Name="MainSplashScreenImage"
14-
Width="420"
15-
ImageFailed="Image_ImageFailed"
16-
ImageOpened="Image_ImageOpened"
17-
Source="\Assets\AppTiles\Dev\SplashScreen.png" />
12+
<!-- Splash Screen Image -->
13+
<Viewbox
14+
x:Name="SplashScreenImageViewbox"
15+
Width="620"
16+
Height="300"
17+
HorizontalAlignment="Center"
18+
VerticalAlignment="Center"
19+
Stretch="None">
20+
<Image
21+
x:Name="SplashScreenImage"
22+
ImageFailed="Image_ImageFailed"
23+
ImageOpened="Image_ImageOpened"
24+
Source="\Assets\AppTiles\Dev\SplashScreen.png" />
25+
</Viewbox>
1826

27+
<!-- Branch Label -->
28+
<TextBlock
29+
x:Name="SplashScreenBranchLabel"
30+
Margin="0,164,0,0"
31+
HorizontalAlignment="Center"
32+
VerticalAlignment="Center"
33+
FontSize="20"
34+
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
35+
LineHeight="32">
36+
<Run FontWeight="SemiBold" Text="Files" />
37+
<Run FontWeight="SemiLight" Text="Preview" />
38+
</TextBlock>
39+
40+
<!-- Loading Indicator -->
1941
<ProgressRing
20-
x:Name="MainProgressRing"
21-
Margin="0,0,0,88"
42+
x:Name="SplashScreenLoadingProgressRing"
43+
Margin="0,0,0,48"
2244
VerticalAlignment="Bottom"
2345
Foreground="{ThemeResource ApplicationForegroundThemeBrush}"
2446
IsIndeterminate="True" />
@@ -27,10 +49,10 @@
2749
<VisualStateGroup x:Name="SizeChangesState">
2850
<VisualState>
2951
<VisualState.StateTriggers>
30-
<AdaptiveTrigger MinWindowWidth="640" />
52+
<AdaptiveTrigger MinWindowHeight="500" />
3153
</VisualState.StateTriggers>
3254
<VisualState.Setters>
33-
<Setter Target="MainSplashScreenImage.Width" Value="480" />
55+
<Setter Target="SplashScreenLoadingProgressRing.Margin" Value="0,0,0,88" />
3456
</VisualState.Setters>
3557
</VisualState>
3658
</VisualStateGroup>

src/Files.App/Views/SplashScreenPage.xaml.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,14 @@ namespace Files.App.Views
1111
/// </summary>
1212
public sealed partial class SplashScreenPage : Page
1313
{
14+
private string BranchLabel =>
15+
ApplicationService.AppEnvironment switch
16+
{
17+
AppEnvironment.Dev => "Dev",
18+
AppEnvironment.Preview => "Preview",
19+
_ => string.Empty,
20+
};
21+
1422
public SplashScreenPage()
1523
{
1624
InitializeComponent();

0 commit comments

Comments
 (0)