From 1a1e02ffb26112909e9d202688c0e5fc884f9913 Mon Sep 17 00:00:00 2001
From: Fabian Sauter <sauter.fabian@mailbox.org>
Date: Mon, 22 Apr 2019 16:49:41 +0200
Subject: [PATCH] Fixed not loading app icon for splash screen and chats page

---
 UWPX_UI/Pages/ChatPage.xaml                    |  2 +-
 UWPX_UI/Pages/ExtendedSplashScreenPage.xaml    |  2 +-
 UWPX_UI/Pages/ExtendedSplashScreenPage.xaml.cs | 11 +++--------
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/UWPX_UI/Pages/ChatPage.xaml b/UWPX_UI/Pages/ChatPage.xaml
index 31fc954f0..c728adae8 100644
--- a/UWPX_UI/Pages/ChatPage.xaml
+++ b/UWPX_UI/Pages/ChatPage.xaml
@@ -74,7 +74,7 @@
                                     Padding="10">
                             <Image Width="120"
                                    Height="120"
-                                   Source="ms-appx:///Assets/Square150x150Logo.scale-400.png"/>
+                                   Source="ms-appx:///Assets/Square150x150Logo.png"/>
                             <TextBlock FontWeight="SemiBold"
                                        Style="{StaticResource TitleTextBlockStyle}"
                                        Text="Select a chat to view."/>
diff --git a/UWPX_UI/Pages/ExtendedSplashScreenPage.xaml b/UWPX_UI/Pages/ExtendedSplashScreenPage.xaml
index d4289c32e..54932260a 100644
--- a/UWPX_UI/Pages/ExtendedSplashScreenPage.xaml
+++ b/UWPX_UI/Pages/ExtendedSplashScreenPage.xaml
@@ -18,7 +18,7 @@
                Stretch="UniformToFill"/>
         <Canvas Grid.Row="0">
             <Image x:Name="logo_img"
-                   Source="ms-appx:///Assets/SplashScreen.scale-100.png"/>
+                   Source="ms-appx:///Assets/SplashScreen.png"/>
         </Canvas>
     </Grid>
 </Page>
diff --git a/UWPX_UI/Pages/ExtendedSplashScreenPage.xaml.cs b/UWPX_UI/Pages/ExtendedSplashScreenPage.xaml.cs
index 152dccc3e..09a2fd58f 100644
--- a/UWPX_UI/Pages/ExtendedSplashScreenPage.xaml.cs
+++ b/UWPX_UI/Pages/ExtendedSplashScreenPage.xaml.cs
@@ -34,9 +34,9 @@ public sealed partial class ExtendedSplashScreenPage: Page
         #region --Constructors--
         public ExtendedSplashScreenPage(IActivatedEventArgs args, Frame rootFrame, EventHandler<PushNotificationReceivedEventArgs> appCenterPushCallback)
         {
-            this.ACTIVATION_ARGS = args;
-            this.ROOT_FRAME = rootFrame;
-            this.APP_CENTER_PUSH_CALLBACK = appCenterPushCallback;
+            ACTIVATION_ARGS = args;
+            ROOT_FRAME = rootFrame;
+            APP_CENTER_PUSH_CALLBACK = appCenterPushCallback;
             InitializeComponent();
 
             SetupSplashScreen();
@@ -57,7 +57,6 @@ private void SetImageScale()
                 if (curImageScale != SplashScreenImageScale.HUGE)
                 {
                     background_img.Source = new BitmapImage(new Uri("ms-appx:///Assets/Images/SplashScreen/splash_screen_4000.png", UriKind.Absolute));
-                    logo_img.Source = new BitmapImage(new Uri("ms-appx:///Assets/SplashScreen.scale-400.png", UriKind.Absolute));
                     curImageScale = SplashScreenImageScale.HUGE;
                 }
             }
@@ -66,7 +65,6 @@ private void SetImageScale()
                 if (curImageScale != SplashScreenImageScale.LARGE)
                 {
                     background_img.Source = new BitmapImage(new Uri("ms-appx:///Assets/Images/SplashScreen/splash_screen_3000.png", UriKind.Absolute));
-                    logo_img.Source = new BitmapImage(new Uri("ms-appx:///Assets/SplashScreen.scale-200.png", UriKind.Absolute));
                     curImageScale = SplashScreenImageScale.LARGE;
                 }
             }
@@ -75,7 +73,6 @@ private void SetImageScale()
                 if (curImageScale != SplashScreenImageScale.MEDIUM)
                 {
                     background_img.Source = new BitmapImage(new Uri("ms-appx:///Assets/Images/SplashScreen/splash_screen_2000.png", UriKind.Absolute));
-                    logo_img.Source = new BitmapImage(new Uri("ms-appx:///Assets/SplashScreen.scale-150.png", UriKind.Absolute));
                     curImageScale = SplashScreenImageScale.MEDIUM;
                 }
             }
@@ -84,14 +81,12 @@ private void SetImageScale()
                 if (curImageScale != SplashScreenImageScale.SMALL)
                 {
                     background_img.Source = new BitmapImage(new Uri("ms-appx:///Assets/Images/SplashScreen/splash_screen_1000.png", UriKind.Absolute));
-                    logo_img.Source = new BitmapImage(new Uri("ms-appx:///Assets/SplashScreen.scale-125.png", UriKind.Absolute));
                     curImageScale = SplashScreenImageScale.SMALL;
                 }
             }
             else if (curImageScale != SplashScreenImageScale.TINY)
             {
                 background_img.Source = new BitmapImage(new Uri("ms-appx:///Assets/Images/SplashScreen/splash_screen_800.png", UriKind.Absolute));
-                logo_img.Source = new BitmapImage(new Uri("ms-appx:///Assets/SplashScreen.scale-100.png", UriKind.Absolute));
                 curImageScale = SplashScreenImageScale.TINY;
             }
         }