Merge pull request #3527 from signalco-io/feat/companion-added-more-a…

…ssets-upgraded

feat(companion): Added assets and updated platforms

companions/maui/Signalco.Companion.Maui/Platforms/Android/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
-	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true">
-  </application>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.signalco.signalcocompanion" android:versionCode="1" android:versionName="1.0.0">
+	<uses-sdk android:minSdkVersion="33" android:targetSdkVersion="33" />
+	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:supportsRtl="true" android:label="Signalco"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>

companions/maui/Signalco.Companion.Maui/Platforms/Windows/App.xaml.cs

@@ -1,6 +1,5 @@
 using Microsoft.Maui;
 using Microsoft.Maui.Hosting;
-using Microsoft.UI.Xaml;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.

companions/maui/Signalco.Companion.Maui/Platforms/Windows/Package.appxmanifest

@@ -31,9 +31,9 @@
       Executable="$targetnametoken$.exe"
       EntryPoint="$targetentrypoint$">
       <uap:VisualElements
-        DisplayName="Signalco"
+        DisplayName="Signalco Companion"
         Description="Signalco Companion mobile app"
-        BackgroundColor="transparent"
+        BackgroundColor="#000000"
         Square150x150Logo="Assets\appiconMediumTile.png"
         Square44x44Logo="Assets\appiconLogo.png">
         <uap:DefaultTile
@@ -46,7 +46,8 @@
             <uap:ShowOn Tile="wide310x150Logo"/>
           </uap:ShowNameOnTiles>
         </uap:DefaultTile >
-        <uap:SplashScreen Image="Assets\appiconfgSplashScreen.png" />
+        <uap:SplashScreen Image="Assets\appiconfgSplashScreen.png"  BackgroundColor="#000000"/>
+        <uap:LockScreen BadgeLogo="Assets\BadgeLogo.png" Notification="badge"/>
       </uap:VisualElements>
     </Application>
   </Applications>

companions/maui/Signalco.Companion.Maui/Signalco.Companion.Maui.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-android</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net6.0-windows10.0.19041</TargetFrameworks>
-		<OutputType>Exe</OutputType>
+		<TargetFrameworks>net7.0-android</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.22000.0</TargetFrameworks>
+    <OutputType>Exe</OutputType>
 		<RootNamespace>Signalco.Companion.Maui</RootNamespace>
 		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
@@ -21,11 +21,9 @@
 		<!-- Required for C# Hot Reload -->
 		<UseInterpreter Condition="'$(Configuration)' == 'Debug'">True</UseInterpreter>
 
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-ios'">14.2</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">31.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
-		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">33.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.22000.0</SupportedOSPlatformVersion>
+		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.22000.0</TargetPlatformMinVersion>
 		<Nullable>enable</Nullable>
 		<DefaultLanguage>en</DefaultLanguage>
 		<Platforms>AnyCPU;x64</Platforms>
@@ -44,17 +42,12 @@
 		<MauiFont Include="Resources\Fonts\*" />
 	</ItemGroup>
 
-	<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
-		<!-- Required - WinUI does not yet have buildTransitive for everything -->
-		<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.1.0" />
-	</ItemGroup>
-
-	<PropertyGroup Condition="$(TargetFramework.Contains('-windows'))">
-		<OutputType>WinExe</OutputType>
-		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
-	</PropertyGroup>
-
 	<ItemGroup>
+	  <None Remove="Assets\appiconfgSplashScreen.scale-100.png" />
+	  <None Remove="Assets\appiconfgSplashScreen.scale-125.png" />
+	  <None Remove="Assets\appiconfgSplashScreen.scale-150.png" />
+	  <None Remove="Assets\appiconfgSplashScreen.scale-200.png" />
+	  <None Remove="Assets\appiconfgSplashScreen.scale-400.png" />
 	  <None Remove="Platforms\Android\Resources\values\attrs.xml" />
 	  <None Remove="Platforms\Android\Resources\values\dimensions.xml" />
 	</ItemGroup>
@@ -71,5 +64,13 @@
 	<ItemGroup>
 	  <_MauiCompileToAdd Remove="Platforms\Android\WidgetService.cs" />
 	</ItemGroup>
+
+	<ItemGroup>
+	  <Content Include="Assets\appiconfgSplashScreen.scale-100.png" />
+	  <Content Include="Assets\appiconfgSplashScreen.scale-125.png" />
+	  <Content Include="Assets\appiconfgSplashScreen.scale-150.png" />
+	  <Content Include="Assets\appiconfgSplashScreen.scale-200.png" />
+	  <Content Include="Assets\appiconfgSplashScreen.scale-400.png" />
+	</ItemGroup>
 
 </Project>