v0.7.1

rayenghanmi · Jan 12, 2024 · 37e2ebe · 37e2ebe
1 parent 9c33de5
commit 37e2ebe
Show file tree

Hide file tree

Showing 15 changed files with 89 additions and 22 deletions.
diff --git a/App.xaml.cs b/App.xaml.cs
@@ -61,7 +61,7 @@ public static T GetService<T>()
     public App()
     {
         InitializeComponent();
-        LogHelper.Log("Initializing App");
+        LogHelper.Log("___________ New Session ___________");
         Host = Microsoft.Extensions.Hosting.Host.
         CreateDefaultBuilder().
         UseContentRoot(AppContext.BaseDirectory).

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,14 +2,24 @@
 
 All notable changes to this branch will be documented in this file.
 
-## 0.7 - Work In Progress
+## 0.7.1 - Released
 
-## Added
+### Added
+
+- Version number is now displayed the taskbar.
+
+### Fixes
+
+- Crashing when exiting the app while fetching installed apps.
+
+## 0.7.0 - Unreleased
+
+### Added
 
 - Error Logging for better debugging.
 - New `View Logs` HyperLink in Settings Page.
 
-## Changes
+### Changes
 
 - Minor UI improvements and fixes.
 - Better exception handling.

diff --git a/Package.appxmanifest b/Package.appxmanifest
@@ -13,7 +13,7 @@
   <Identity
     Name="Rayen.RyTuneX"
     Publisher="CN=Ghanmi"
-    Version="0.7.0.0" />
+    Version="0.7.1.0" />
 
   <mp:PhoneIdentity PhoneProductId="593c7ba8-f1c9-47cf-a952-7c22b10aac3a" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 

diff --git a/RyTuneX.csproj b/RyTuneX.csproj
@@ -21,8 +21,6 @@
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
     <AppxBundle>Never</AppxBundle>
     <WindowsPackageType>MSIX</WindowsPackageType>
-    <AssemblyVersion>0.6.0.0</AssemblyVersion>
-    <FileVersion>0.6.0.0</FileVersion>
     <PackageCertificateThumbprint>1D92A91C88A122BB200B96F35A8311064D7AD1CE</PackageCertificateThumbprint>
     <StartupObject>RyTuneX.Program</StartupObject>
     <PackageReadmeFile>README.md</PackageReadmeFile>
@@ -31,6 +29,7 @@
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Assets\WindowIcon.ico" />
+    <None Remove="Views\BenchmarkPage.xaml" />
     <None Remove="Views\DebloatSystemPage.xaml" />
   </ItemGroup>
 
@@ -80,6 +79,9 @@
     <Page Update="Views\DebloatSystemPage.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Update="Views\BenchmarkPage.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
   </ItemGroup>
 
   <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">

diff --git a/Services/PageService.cs b/Services/PageService.cs
@@ -15,6 +15,7 @@ public class PageService : IPageService
     public PageService()
     {
         Configure<HomePage>();
+        Configure<BenchmarkPage>();
         Configure<DebloatSystemPage>();
         Configure<SystemInfoPage>();
         Configure<OptimizeSystemPage>();

diff --git a/Strings/ar-tn/Resources.resw b/Strings/ar-tn/Resources.resw
@@ -227,4 +227,7 @@
   <data name="UninstallTip" xml:space="preserve">
     <value>حدد التطبيقات التي ترغب في إزالتها واضغط على إلغاء التثبيت</value>
   </data>
+  <data name="Shell_Benchmark.Content" xml:space="preserve">
+    <value>قياس الأداء</value>
+  </data>
 </root>
diff --git a/Strings/en-us/Resources.resw b/Strings/en-us/Resources.resw
@@ -227,4 +227,7 @@
   <data name="UninstallTip" xml:space="preserve">
     <value>Select apps that you want to remove and hit uninstall</value>
   </data>
+  <data name="Shell_Benchmark.Content" xml:space="preserve">
+    <value>Benchmark</value>
+  </data>
 </root>
diff --git a/Strings/fr-fr/Resources.resw b/Strings/fr-fr/Resources.resw
@@ -227,4 +227,7 @@
   <data name="UninstallTip" xml:space="preserve">
     <value>Sélectionnez les applications que vous souhaitez supprimer et appuyez sur Désinstaller</value>
   </data>
+  <data name="Shell_Benchmark.Content" xml:space="preserve">
+    <value>Performance</value>
+  </data>
 </root>
diff --git a/Views/BenchmarkPage.xaml b/Views/BenchmarkPage.xaml
@@ -0,0 +1,14 @@
+<Page
+    x:Class="RyTuneX.Views.BenchmarkPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
+    <ScrollView x:Name="ContentArea" HorizontalScrollMode="Disabled" Margin="-20,0,-20,10" Padding="0,5,0,5">
+        <StackPanel>
+            <TextBlock x:Name="CpuUsage"/>
+        </StackPanel>
+
+    </ScrollView>
+</Page>
diff --git a/Views/BenchmarkPage.xaml.cs b/Views/BenchmarkPage.xaml.cs
@@ -0,0 +1,14 @@
+using Microsoft.UI.Xaml.Controls;
+
+
+namespace RyTuneX.Views;
+
+public sealed partial class BenchmarkPage : Page
+{
+
+    public BenchmarkPage()
+    {
+        InitializeComponent();
+        LogHelper.Log("Initializing BenchmarkPage");
+    }
+}
diff --git a/Views/DebloatSystemPage.xaml.cs b/Views/DebloatSystemPage.xaml.cs
@@ -16,6 +16,7 @@
 using Windows.UI.Notifications;
 using CommunityToolkit.WinUI.Behaviors;
 using System.Threading;
+using Windows.ApplicationModel.Core;
 
 namespace RyTuneX.Views;
 
@@ -45,18 +46,19 @@ private void appTreeView_DragItemsStarting(TreeView sender, TreeViewDragItemsSta
 
     private async void LoadInstalledApps(bool uninstallableOnly = true, CancellationToken cancellationToken = default)
     {
-        await Task.Run(() =>
+        try
         {
-            LogHelper.Log("Loading InstalledApps");
+            await LogHelper.Log("Loading InstalledApps");
+
             // Check for cancellation request
             cancellationToken.ThrowIfCancellationRequested();
 
-            var installedApps = OptimizationOptions.GetUWPApps(uninstallableOnly);
+            var installedApps = await Task.Run(() => OptimizationOptions.GetUWPApps(uninstallableOnly), cancellationToken);
             var numberOfInstalledApps = installedApps.Count;
 
-            DispatcherQueue.TryEnqueue(() =>
+            await CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
             {
-                // fetching installed apps data & hiding ui elements
+                // fetching installed apps data & hiding UI elements
                 AppList.Clear();
                 gettingAppsLoading.Visibility = Visibility.Visible;
                 appTreeView.Visibility = Visibility.Collapsed;
@@ -68,10 +70,12 @@ await Task.Run(() =>
                 uninstallingStatusBar.Visibility = Visibility.Collapsed;
                 showAll.Visibility = Visibility.Collapsed;
                 uninstallButton.Visibility = Visibility.Collapsed;
+
                 foreach (var app in installedApps)
                 {
                     AppList.Add(app);
                 }
+
                 // showing the installed apps data after fetching
                 installedAppsCount.Text = $"Total: {numberOfInstalledApps} Apps";
                 installedAppsCount.Visibility = Visibility.Visible;
@@ -82,10 +86,14 @@ await Task.Run(() =>
                 uninstallButton.IsEnabled = true;
                 gettingAppsLoading.Visibility = Visibility.Collapsed;
                 uninstallingStatusBar.ShowError = false;
-
             });
-        }, cancellationToken);
+        }
+        catch (OperationCanceledException ex)
+        {
+            await LogHelper.Log(ex.ToString());
+        }
     }
+
     private async void UninstallSelectedApp_Click(object sender, RoutedEventArgs e)
     {
         // Check if at least one item is selected

diff --git a/Views/SettingsPage.xaml.cs b/Views/SettingsPage.xaml.cs
@@ -108,13 +108,13 @@ private string GetVersionDescription()
         {
             var packageVersion = Package.Current.Id.Version;
 
-            version = new(packageVersion.Major, packageVersion.Minor, packageVersion.Build, packageVersion.Revision);
+            version = new(packageVersion.Major, packageVersion.Minor, packageVersion.Build);
         }
         else
         {
             version = typeof(SettingsPage).Assembly.GetName().Version!;
         }
-        return $"{"AppDisplayName".GetLocalized()} - {version.Major}.{version.Minor}.{version.Build}.{version.Revision}";
+        return $"{"AppDisplayName".GetLocalized()} - {version.Major}.{version.Minor}.{version.Build}";
     }
     public ElementTheme ElementTheme
     {

diff --git a/Views/ShellPage.xaml b/Views/ShellPage.xaml
@@ -24,6 +24,12 @@
                     Margin="34,0,0,0"
                     TextWrapping="NoWrap"
                     Style="{StaticResource CaptionTextBlockStyle}"/>
+            <TextBlock x:Name="AppTitleBarVersion"
+                    VerticalAlignment="Center"
+                    Margin="86,0,0,0"
+                    TextWrapping="NoWrap"
+                    FontSize="11"
+                    Opacity="0.75"/>
         </Grid>
         <NavigationView
             x:Name="NavigationViewControl"
@@ -41,6 +47,11 @@
                         <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE80F;"/>
                     </NavigationViewItem.Icon>
                 </NavigationViewItem>
+                <NavigationViewItem x:Uid="Shell_Benchmark" helpers:NavigationHelper.NavigateTo="RyTuneX.Views.BenchmarkPage">
+                    <NavigationViewItem.Icon>
+                        <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE770;"/>
+                    </NavigationViewItem.Icon>
+                </NavigationViewItem>
                 <NavigationViewItem x:Uid="Shell_OptimizeSystem" helpers:NavigationHelper.NavigateTo="RyTuneX.Views.OptimizeSystemPage">
                     <NavigationViewItem.Icon>
                         <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xF259;"/>

diff --git a/Views/ShellPage.xaml.cs b/Views/ShellPage.xaml.cs
@@ -6,7 +6,7 @@
 using RyTuneX.Contracts.Services;
 using RyTuneX.Helpers;
 using RyTuneX.ViewModels;
-
+using Windows.ApplicationModel;
 using Windows.System;
 
 namespace RyTuneX.Views;
@@ -26,10 +26,8 @@ public ShellPage(ShellViewModel viewModel)
         LogHelper.Log("Initializing ShellPage");
         ViewModel.NavigationService.Frame = NavigationFrame;
         ViewModel.NavigationViewService.Initialize(NavigationViewControl);
-
-        // TODO: Set the title bar icon by updating /Assets/WindowIcon.ico.
-        // A custom title bar is required for full window theme and Mica support.
-        // https://docs.microsoft.com/windows/apps/develop/title-bar?tabs=winui3#full-customization
+        var packageVersion = Package.Current.Id.Version;
+        AppTitleBarVersion.Text = $"{packageVersion.Major}.{packageVersion.Minor}";
         App.MainWindow.ExtendsContentIntoTitleBar = true;
         App.MainWindow.SetTitleBar(AppTitleBar);
         App.MainWindow.Activated += MainWindow_Activated;

diff --git a/app.manifest b/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="0.6.0.0" name="RyTuneX.app"/>
+  <assemblyIdentity version="0.7.1.0" name="RyTuneX.app"/>
     <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
       <application>
         <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>