Merge branch 'master' into features/custom_titlebar_color

Reabstraction · Mar 8, 2024 · bd13606 · bd13606
2 parents 2d96458 + b6a0554
commit bd13606
Show file tree

Hide file tree

Showing 24 changed files with 2,386 additions and 174 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Get Version
@@ -71,7 +71,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Get Version

diff --git a/MicaForEveryone.Core/MicaForEveryone.Core.csproj b/MicaForEveryone.Core/MicaForEveryone.Core.csproj
@@ -10,8 +10,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
         <PackageReference Include="XclParser" Version="1.0.8" />
     </ItemGroup>
 

diff --git a/MicaForEveryone.Package/MicaForEveryone.Package.wapproj b/MicaForEveryone.Package/MicaForEveryone.Package.wapproj
@@ -32,7 +32,7 @@
   <PropertyGroup>
     <WapAlwaysBuildDependentProjects>true</WapAlwaysBuildDependentProjects>
     <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
-    <TargetPlatformVersion>10.0.22000.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <DefaultLanguage>en</DefaultLanguage>
     <EntryPointProjectUniqueName>..\MicaForEveryone\MicaForEveryone.csproj</EntryPointProjectUniqueName>

diff --git a/MicaForEveryone.Package/Package.appxmanifest b/MicaForEveryone.Package/Package.appxmanifest
@@ -20,7 +20,7 @@
 
     <Dependencies>
         <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
-        <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.22523.0" />
+        <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.22621.0" />
     </Dependencies>
 
     <Resources>

diff --git a/MicaForEveryone.UI/MicaForEveryone.UI.csproj b/MicaForEveryone.UI/MicaForEveryone.UI.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -11,7 +11,7 @@
     <AssemblyName>MicaForEveryone.UI</AssemblyName>
     <DefaultLanguage>en-us</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22000.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22621.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
@@ -134,7 +134,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Mvvm">
-      <Version>8.2.1</Version>
+      <Version>8.2.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.14</Version>
@@ -146,7 +146,7 @@
       <Version>2.8.2-prerelease.220830001</Version>
     </PackageReference>
     <PackageReference Include="Win2D.uwp">
-      <Version>1.26.0</Version>
+      <Version>1.27.1</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
@@ -188,7 +188,10 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <PRIResource Include="Strings\az-Latn\Resources.resw">
+    <PRIResource Include="Strings\ar\Resources.resw">
+      <SubType>Designer</SubType>
+    </PRIResource>
+    <PRIResource Include="Strings\az\Resources.resw">
       <SubType>Designer</SubType>
     </PRIResource>
     <PRIResource Include="Strings\en\Resources.resw">
@@ -254,8 +257,10 @@
     <PRIResource Include="Strings\sr-Latn\Resources.resw">
       <SubType>Designer</SubType>
     </PRIResource>
+    <PRIResource Include="Strings\ro\Resources.resw">
+      <SubType>Designer</SubType>
+    </PRIResource>
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
     <ProjectReference Include="..\MicaForEveryone.Core\MicaForEveryone.Core.csproj">
       <Project>{56aa4f47-4776-49a1-9d7c-c9d8eb92a453}</Project>
@@ -322,4 +327,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/MicaForEveryone.UI/Package.appxmanifest b/MicaForEveryone.UI/Package.appxmanifest
@@ -8,19 +8,19 @@
 
     <Identity
         Name="MicaForEveryone"
-        Publisher="CN=Minusium"
+        Publisher="CN=MicaForEveryone"
         Version="1.2.0.0" />
 
     <mp:PhoneIdentity PhoneProductId="533584ee-ace8-4310-adb6-d59b701b7236" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
     <Properties>
         <DisplayName>MicaForEveryone.UI</DisplayName>
-        <PublisherDisplayName>Minusium</PublisherDisplayName>
+        <PublisherDisplayName>MicaForEveryone</PublisherDisplayName>
         <Logo>Assets\StoreLogo.png</Logo>
     </Properties>
 
     <Dependencies>
-        <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.22523.0" />
+        <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.22621.0" />
     </Dependencies>
 
     <Resources>

diff --git a/MicaForEveryone.UI/SettingsView.xaml b/MicaForEveryone.UI/SettingsView.xaml
@@ -653,6 +653,8 @@
                                 <HyperlinkButton x:Uid="GitHubButton"
                                                  NavigateUri="https://github.com/MicaForEveryone/MicaForEveryone"
                                                  TabIndex="3" />
+                                <HyperlinkButton x:Uid="DiscordButton"
+                                                 NavigateUri="https://discord.gg/ec6DEakgMv" />
                                 <HyperlinkButton x:Uid="TelegramButton"
                                                  NavigateUri="https://t.me/xMine64" />
                                 <HyperlinkButton x:Uid="TwitterButton"

diff --git a/MicaForEveryone.UI/SettingsView.xaml.cs b/MicaForEveryone.UI/SettingsView.xaml.cs
@@ -22,11 +22,14 @@ public SettingsView()
             new Contributor("sitiom", "https://github.com/sitiom", null),
             new Contributor("krlvm", "https://github.com/krlvm", null),
             new Contributor("o0kam1", "https://github.com/duzhaokun123", null),
+            new Contributor("TheXDS", "https://github.com/TheXDS", null),
         };
 
         internal Contributor[] Translators { get; } =
         {
-            new Contributor("Merhab Poladov", "https://github.com/thepoladov13", "az"),
+            new Contributor("Mehrab Poladov", "https://github.com/thepoladov13", "az"),
+            new Contributor("maggster165", "https://github.com/maggster165", "cs"),
+            new Contributor("WinExperiments", "https://github.com/WinExperiments", "ar"),
             new Contributor("uDEV2019", "https://github.com/uDEV2019", "de"),
             new Contributor("Amaro Martínez", "https://github.com/xoascf", "es"),
             new Contributor("SaiyajinK", "https://github.com/SaiyajinK", "fr"),
@@ -40,6 +43,7 @@ public SettingsView()
             new Contributor("toineenzo", "https://github.com/toineenzo", "nl"),
             new Contributor("Piteriuz", "https://github.com/Piteriuz", "pl"),
             new Contributor("Douglas Vianna", "https://github.com/dgsmiley18", "pt-br"),
+            new Contributor("DavidJoacaRo", "https://github.com/DavidJoacaRo", "ro"),
             new Contributor("Danik2343", "https://github.com/Danik2343", "ru"),
             new Contributor("krlvm", "https://github.com/krlvm", "ru"),
             new Contributor("bzzrak", "https://github.com/bzzrak", "sr"),
@@ -52,6 +56,7 @@ public SettingsView()
             new Contributor("MW1Z", "https://github.com/MW1Z", "zh-Hant"),
             new Contributor("宥叡", "https://github.com/jay900604", "zh-Hant"),
             new Contributor("flandretw", "https://github.com/flandretw", "zh-Hant"),
+			new Contributor("trlef19", "https://github.com/trlef19", "el"),
         };
 
         private void ListView_Loaded(object sender, RoutedEventArgs args)