Updated to preview14

passxyz · Mar 20, 2022 · 4c0cd6b · 4c0cd6b
1 parent 367aeed
commit 4c0cd6b
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 54 deletions.
diff --git a/PassXYZ.Vault/App.xaml b/PassXYZ.Vault/App.xaml
@@ -1,9 +1,8 @@
-<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+<?xml version = "1.0" encoding = "UTF-8" ?>
+<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:windows="clr-namespace:Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific;assembly=Microsoft.Maui.Controls"
              xmlns:local="clr-namespace:PassXYZ.Vault"
-             x:Class="PassXYZ.Vault.App"
-             windows:Application.ImageDirectory="Assets">
+             x:Class="PassXYZ.Vault.App">
     <Application.Resources>
         <ResourceDictionary>
 

diff --git a/PassXYZ.Vault/MainPage.xaml b/PassXYZ.Vault/MainPage.xaml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="PassXYZ.Vault.MainPage"

diff --git a/PassXYZ.Vault/PassXYZ.Vault.csproj b/PassXYZ.Vault/PassXYZ.Vault.csproj
@@ -9,14 +9,16 @@
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-    
+
 		<!-- Display name -->
 		<ApplicationTitle>PassXYZ.Vault</ApplicationTitle>
 
 		<!-- App Identifier -->
-		<ApplicationId>com.companyname.passxyz.vault</ApplicationId>
+		<ApplicationId>com.passxyz.vault2</ApplicationId>
+		<ApplicationId Condition="$(TargetFramework.Contains('-windows'))">692C67EC-C074-4A7A-8E1D-2E614FBBC7B0</ApplicationId>
 
 		<!-- Versions -->
+		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
 		<!-- Required for C# Hot Reload -->
@@ -34,13 +36,17 @@
 		<MauiIcon Include="Resources\appicon.svg" ForegroundFile="Resources\appiconfg.svg" Color="#512BD4" />
 
 		<!-- Splash Screen -->
-		<MauiSplashScreen Include="Resources\appiconfg.svg" Color="#512BD4" />
+		<MauiSplashScreen Include="Resources\appiconfg.svg" Color="#512BD4" BaseSize="128,128" />
 
 		<!-- Images -->
 		<MauiImage Include="Resources\Images\*" />
+		<MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />
 
 		<!-- Custom Fonts -->
 		<MauiFont Include="Resources\Fonts\*" />
+
+		<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
+		<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
 	</ItemGroup>
 
 	<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">

diff --git a/PassXYZ.Vault/Platforms/Android/MainActivity.cs b/PassXYZ.Vault/Platforms/Android/MainActivity.cs
@@ -7,16 +7,4 @@ namespace PassXYZ.Vault;
 [Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize)]
 public class MainActivity : MauiAppCompatActivity
 {
-	protected override void OnCreate(Bundle savedInstanceState)
-	{
-		base.OnCreate(savedInstanceState);
-		Platform.Init(this, savedInstanceState);
-	}
-
-	public override void OnRequestPermissionsResult(int requestCode, string[] permissions, Permission[] grantResults)
-	{
-		Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-
-		base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-	}
 }
diff --git a/PassXYZ.Vault/Platforms/Windows/App.xaml.cs b/PassXYZ.Vault/Platforms/Windows/App.xaml.cs
@@ -20,12 +20,5 @@ public App()
     }
 
     protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
-
-    protected override void OnLaunched(LaunchActivatedEventArgs args)
-    {
-        base.OnLaunched(args);
-
-        Platform.OnLaunched(args);
-    }
 }
 
diff --git a/PassXYZ.Vault/Platforms/Windows/Package.appxmanifest b/PassXYZ.Vault/Platforms/Windows/Package.appxmanifest
@@ -6,15 +6,10 @@
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
   IgnorableNamespaces="uap rescap">
 
-  <Identity
-    Name="8606B3B5-C03C-41D7-825F-B33718CF791C"
-    Publisher="CN=User Name"
-    Version="1.0.0.0" />
+  <Identity Publisher="CN=PassXYZ" />
 
   <Properties>
-    <DisplayName>PassXYZ.Vault</DisplayName>
-    <PublisherDisplayName>Microsoft</PublisherDisplayName>
-    <Logo>Assets\appiconStoreLogo.png</Logo>
+    <PublisherDisplayName>PassXYZ</PublisherDisplayName>
   </Properties>
 
   <Dependencies>
@@ -23,30 +18,12 @@
   </Dependencies>
 
   <Resources>
-    <Resource Language="x-generate"/>
+    <Resource Language="x-generate" />
   </Resources>
 
   <Applications>
-    <Application Id="App"
-      Executable="$targetnametoken$.exe"
-      EntryPoint="$targetentrypoint$">
-      <uap:VisualElements
-        DisplayName="PassXYZ.Vault"
-        Description="PassXYZ.Vault"
-        BackgroundColor="transparent"
-        Square150x150Logo="Assets\appiconMediumTile.png"
-        Square44x44Logo="Assets\appiconLogo.png">
-        <uap:DefaultTile
-          Wide310x150Logo="Assets\appiconWideTile.png"
-          Square71x71Logo="Assets\appiconSmallTile.png"
-          Square310x310Logo="Assets\appiconLargeTile.png"
-          ShortName="PassXYZ.Vault">
-          <uap:ShowNameOnTiles>
-            <uap:ShowOn Tile="square150x150Logo"/>
-            <uap:ShowOn Tile="wide310x150Logo"/>
-          </uap:ShowNameOnTiles>
-        </uap:DefaultTile >
-      </uap:VisualElements>
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$">
+      <uap:VisualElements />
     </Application>
   </Applications>
 

diff --git a/PassXYZ.Vault/Resources/Fonts/OpenSans-Regular.ttf b/PassXYZ.Vault/Resources/Fonts/OpenSans-Regular.ttf