Backport to RS2 (#119)

* More cleanup * Initial RS2 Support * Fix broken hamburger button * Fix attachment overlay on RS2 * ChannelPage header cleanup
UnicordDev · Sep 10, 2024 · 9b67ac8 · 9b67ac8
1 parent e44f9b3
commit 9b67ac8
Show file tree

Hide file tree

Showing 39 changed files with 1,172 additions and 932 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "Libraries/unicode.net"]
 	path = Libraries/unicode.net
 	url = https://github.com/wamwoowam/unicode.net
+[submodule "Libraries/WindowsCommunityToolkit"]
+	path = Libraries/WindowsCommunityToolkit
+	url = https://github.com/UnicordDev/WindowsCommunityToolkit
diff --git a/Libraries/DSharpPlus b/Libraries/DSharpPlus
diff --git a/Libraries/WindowsCommunityToolkit b/Libraries/WindowsCommunityToolkit
diff --git a/Unicord.Universal.Package/Package.ARM.Debug.appxmanifest b/Unicord.Universal.Package/Package.ARM.Debug.appxmanifest
@@ -18,7 +18,7 @@
     <Logo>Assets\Store\StoreLogo.png</Logo>
   </Properties>
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.15035.0" MaxVersionTested="10.0.17763.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.15035.0" MaxVersionTested="10.0.16299.0" />
   </Dependencies>
   <Resources>
     <Resource Language="EN-GB" />

diff --git a/Unicord.Universal.Package/Package.ARM.appxmanifest b/Unicord.Universal.Package/Package.ARM.appxmanifest
@@ -17,7 +17,7 @@
     <Logo>Assets\Store\StoreLogo.png</Logo>
   </Properties>
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.15035.0" MaxVersionTested="10.0.17763.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.15035.0" MaxVersionTested="10.0.16299.0" />
   </Dependencies>
   <Resources>
     <Resource Language="EN-GB" />

diff --git a/Unicord.Universal.Package/Package.Debug.appxmanifest b/Unicord.Universal.Package/Package.Debug.appxmanifest
@@ -18,7 +18,7 @@
     <Logo>Assets\Store\StoreLogo.png</Logo>
   </Properties>
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.15035.0" MaxVersionTested="10.0.17763.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.15035.0" MaxVersionTested="10.0.16299.0" />
   </Dependencies>
   <Resources>
     <Resource Language="EN-GB" />

diff --git a/Unicord.Universal.Package/Package.appxmanifest b/Unicord.Universal.Package/Package.appxmanifest
@@ -9,15 +9,15 @@
          xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
          xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
 				 IgnorableNamespaces="uap mp uap2 uap3 uap4 uap5 rescap">
-  <Identity Name="24101WamWooWamRD.Unicord" Publisher="CN=0F22111D-EDF0-42F0-B58D-26C4C5C5054B" Version="2.0.19.0" />
+  <Identity Name="24101WamWooWamRD.Unicord" Publisher="CN=0F22111D-EDF0-42F0-B58D-26C4C5C5054B" Version="2.0.21.0" />
   <mp:PhoneIdentity PhoneProductId="5783aabf-3049-421f-ae1d-e88bd89018f2" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>ms-resource:AppDisplayName</DisplayName>
     <PublisherDisplayName>Wan Kerr Co. Ltd.</PublisherDisplayName>
     <Logo>Assets\Store\StoreLogo.png</Logo>
   </Properties>
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.22000.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.15063.0" MaxVersionTested="10.0.22000.0" />
   </Dependencies>
   <Resources>
     <Resource Language="x-generate"/>

diff --git a/Unicord.Universal.Package/Unicord.Universal.Package.wapproj b/Unicord.Universal.Package/Unicord.Universal.Package.wapproj
@@ -52,21 +52,23 @@
   <PropertyGroup>
     <ProjectGuid>8e0255b7-b38e-423e-91c7-5637a01c2e13</ProjectGuid>
     <TargetPlatformVersion>10.0.22000.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
     <DefaultLanguage>en-US</DefaultLanguage>
     <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
     <EntryPointProjectUniqueName>..\Unicord.Universal\Unicord.Universal.csproj</EntryPointProjectUniqueName>
     <AppxOSMinVersionReplaceManifestVersion>false</AppxOSMinVersionReplaceManifestVersion>
     <AppxOSMaxVersionTestedReplaceManifestVersion>false</AppxOSMaxVersionTestedReplaceManifestVersion>
     <PackageCertificateThumbprint>2C5F1F6080F0648BF786147323B846D8D0BA1638</PackageCertificateThumbprint>
-    <GenerateAppInstallerFile>True</GenerateAppInstallerFile>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
-    <AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
+    <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <AppxBundle>Always</AppxBundle>
     <AppInstallerUri>https://wamwoowam.co.uk/unicord/download</AppInstallerUri>
+    <!-- lol, lmao -->
+    <SkipMicrosoftUIXamlCheckTargetPlatformVersion>true</SkipMicrosoftUIXamlCheckTargetPlatformVersion>
   </PropertyGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">

diff --git a/Unicord.Universal.Shared/NotificationUtils.cs b/Unicord.Universal.Shared/NotificationUtils.cs
@@ -129,6 +129,8 @@ public static string GetMessageContent(DiscordClient client, DiscordMessage mess
                     return match.Value;
                 });
             }
+            if (messageText.Length > 128)
+                messageText = messageText.Substring(0, 125) + "...";
 
             return messageText;
         }

diff --git a/Unicord.Universal/App.xaml b/Unicord.Universal/App.xaml
@@ -30,7 +30,8 @@
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>
             <ResourceDictionary.MergedDictionaries>
-                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls"/>
+                <!-- TODO: V1/V2 resources globally -->
+                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" ControlsResourcesVersion="Version2"/>
 
                 <ResourceDictionary Source="Themes/Colours.xaml"/>
                 <ResourceDictionary Source="Themes/Generic.xaml"/>
@@ -76,7 +77,6 @@
             <converters:UriConverter x:Key="UriConverter"/>
 
             <commands:EditChannelCommand x:Key="EditChannelCommand"/>
-            <commands:EditModeCommand x:Key="EditModeCommand" />
             <commands:SettingsCommand x:Key="SettingsCommand" />
 
             <x:Double x:Key="ControlContentThemeFontSize">14</x:Double>

diff --git a/Unicord.Universal/App.xaml.cs b/Unicord.Universal/App.xaml.cs
@@ -62,7 +62,6 @@ public App()
         {
             InitializeComponent();
 
-            var provider = VersionHelper.RegisterVersionProvider<UnicordVersionProvider>();
             var theme = (ElementTheme)LocalSettings.Read(REQUESTED_COLOUR_SCHEME, (int)ElementTheme.Default);
             switch (theme)
             {
@@ -78,7 +77,6 @@ public App()
             UnhandledException += OnUnhandledException;
 
             Debug.WriteLine("Welcome to Unicord!");
-            Debug.WriteLine(provider.GetVersionString());
         }
 
         private void OnUnhandledException(object sender, UnhandledExceptionEventArgs e)

diff --git a/Unicord.Universal/Commands/EditModeCommand.cs b/Unicord.Universal/Commands/EditModeCommand.cs
diff --git a/Unicord.Universal/Commands/Messages/DeleteMessageCommand.cs b/Unicord.Universal/Commands/Messages/DeleteMessageCommand.cs
@@ -16,7 +16,7 @@ public DeleteMessageCommand(MessageViewModel viewModel) : base(viewModel) { }
         public override bool CanExecute(object parameter)
         {
             var message = viewModel.Message;
-            if (message.Author.Id == App.Discord.CurrentUser.Id)
+            if (message.Author.IsCurrent)
             {
                 return true;
             }