resolve image conflicts

comroid-git · Feb 27, 2021 · 45bd817 · 45bd817
1 parent 9462a3b
commit 45bd817
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 2 deletions.
diff --git a/status/csharp/status-app/Assets/Square150x150Logo.scale-100.png b/status/csharp/status-app/Assets/Square150x150Logo.scale-100.png
diff --git a/status/csharp/status-app/Assets/Square150x150Logo.scale-125.png b/status/csharp/status-app/Assets/Square150x150Logo.scale-125.png
diff --git a/status/csharp/status-app/Assets/Square150x150Logo.scale-150.png b/status/csharp/status-app/Assets/Square150x150Logo.scale-150.png
diff --git a/status/csharp/status-app/Assets/Square150x150Logo.scale-200.png b/status/csharp/status-app/Assets/Square150x150Logo.scale-200.png
diff --git a/status/csharp/status-app/Assets/Square150x150Logo.scale-400.png b/status/csharp/status-app/Assets/Square150x150Logo.scale-400.png
diff --git a/status/csharp/status-app/Package.appxmanifest b/status/csharp/status-app/Package.appxmanifest
@@ -35,12 +35,12 @@
         DisplayName="status-app"
         Square44x44Logo="Assets\Square44x44Logo.png"
         Description="status-app"
-        BackgroundColor="transparent">
+        BackgroundColor="transparent" Square150x150Logo="Assets\Square150x150Logo.png">
         <uap:SplashScreen Image="Assets\SplashScreen.png"  BackgroundColor="#646464"/>
         <uap:InitialRotationPreference>
           <uap:Rotation Preference="landscape"/></uap:InitialRotationPreference>
         <uap:DefaultTile/>
-        <uap:LockScreen BadgeLogo="Assets\BadgeLogo.png"/>
+        <uap:LockScreen BadgeLogo="Assets\BadgeLogo.png" Notification="badge"/>
       </uap:VisualElements>
     </Application>
   </Applications>

diff --git a/status/csharp/status-app/status-app.csproj b/status/csharp/status-app/status-app.csproj
@@ -145,6 +145,11 @@
     <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-100.png" />
+    <Content Include="Assets\Square150x150Logo.scale-125.png" />
+    <Content Include="Assets\Square150x150Logo.scale-150.png" />
+    <Content Include="Assets\Square150x150Logo.scale-200.png" />
+    <Content Include="Assets\Square150x150Logo.scale-400.png" />
     <Content Include="Assets\Square44x44Logo.altform-lightunplated_targetsize-16.png" />
     <Content Include="Assets\Square44x44Logo.altform-lightunplated_targetsize-24.png" />
     <Content Include="Assets\Square44x44Logo.altform-lightunplated_targetsize-256.png" />