From 2b63bcc6558f84ae1f22a676333ba9362f7d6056 Mon Sep 17 00:00:00 2001
From: Michael Suchacz <203725896+ibetitsmike@users.noreply.github.com>
Date: Wed, 11 Jun 2025 10:48:56 +0200
Subject: [PATCH 1/5] #120 ui improvements & style unification
---
App/Views/DirectoryPickerWindow.xaml | 2 +-
App/Views/DirectoryPickerWindow.xaml.cs | 2 --
App/Views/FileSyncListWindow.xaml | 2 +-
App/Views/FileSyncListWindow.xaml.cs | 2 --
App/Views/Pages/DirectoryPickerMainPage.xaml | 3 +--
App/Views/Pages/FileSyncListMainPage.xaml | 3 +--
App/Views/Pages/SettingsMainPage.xaml | 4 ++--
App/Views/Pages/SignInTokenPage.xaml | 3 +--
App/Views/Pages/SignInUrlPage.xaml | 3 +--
App/Views/Pages/TrayWindowMainPage.xaml | 9 +++++++--
App/Views/SettingsWindow.xaml | 2 +-
App/Views/SettingsWindow.xaml.cs | 2 --
App/Views/SignInWindow.xaml | 2 +-
App/Views/SignInWindow.xaml.cs | 1 -
App/Views/TrayWindow.xaml.cs | 6 ++++--
15 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/App/Views/DirectoryPickerWindow.xaml b/App/Views/DirectoryPickerWindow.xaml
index 8a107cb..ce1623b 100644
--- a/App/Views/DirectoryPickerWindow.xaml
+++ b/App/Views/DirectoryPickerWindow.xaml
@@ -13,7 +13,7 @@
MinWidth="400" MinHeight="600">
-
+
diff --git a/App/Views/DirectoryPickerWindow.xaml.cs b/App/Views/DirectoryPickerWindow.xaml.cs
index 7af6db3..d2eb320 100644
--- a/App/Views/DirectoryPickerWindow.xaml.cs
+++ b/App/Views/DirectoryPickerWindow.xaml.cs
@@ -19,8 +19,6 @@ public DirectoryPickerWindow(DirectoryPickerViewModel viewModel)
InitializeComponent();
TitleBarIcon.SetTitlebarIcon(this);
- SystemBackdrop = new DesktopAcrylicBackdrop();
-
viewModel.Initialize(this, DispatcherQueue);
RootFrame.Content = new DirectoryPickerMainPage(viewModel);
diff --git a/App/Views/FileSyncListWindow.xaml b/App/Views/FileSyncListWindow.xaml
index 070efd2..991d02a 100644
--- a/App/Views/FileSyncListWindow.xaml
+++ b/App/Views/FileSyncListWindow.xaml
@@ -13,7 +13,7 @@
MinWidth="1000" MinHeight="300">
-
+
diff --git a/App/Views/FileSyncListWindow.xaml.cs b/App/Views/FileSyncListWindow.xaml.cs
index ccd2452..9d8510b 100644
--- a/App/Views/FileSyncListWindow.xaml.cs
+++ b/App/Views/FileSyncListWindow.xaml.cs
@@ -16,8 +16,6 @@ public FileSyncListWindow(FileSyncListViewModel viewModel)
InitializeComponent();
TitleBarIcon.SetTitlebarIcon(this);
- SystemBackdrop = new DesktopAcrylicBackdrop();
-
ViewModel.Initialize(this, DispatcherQueue);
RootFrame.Content = new FileSyncListMainPage(ViewModel);
diff --git a/App/Views/Pages/DirectoryPickerMainPage.xaml b/App/Views/Pages/DirectoryPickerMainPage.xaml
index dd08c46..0fbbaea 100644
--- a/App/Views/Pages/DirectoryPickerMainPage.xaml
+++ b/App/Views/Pages/DirectoryPickerMainPage.xaml
@@ -9,8 +9,7 @@
xmlns:converters="using:Coder.Desktop.App.Converters"
xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
xmlns:viewmodels="using:Coder.Desktop.App.ViewModels"
- mc:Ignorable="d"
- Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+ mc:Ignorable="d">
+ mc:Ignorable="d">
+ mc:Ignorable="d">
+
4
diff --git a/App/Views/Pages/SignInTokenPage.xaml b/App/Views/Pages/SignInTokenPage.xaml
index 0ca754d..7f20b69 100644
--- a/App/Views/Pages/SignInTokenPage.xaml
+++ b/App/Views/Pages/SignInTokenPage.xaml
@@ -6,8 +6,7 @@
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"
- Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+ mc:Ignorable="d">
+ mc:Ignorable="d">
+
+
+
+
-
+
diff --git a/App/Views/SettingsWindow.xaml.cs b/App/Views/SettingsWindow.xaml.cs
index 7cc9661..f2a0fdb 100644
--- a/App/Views/SettingsWindow.xaml.cs
+++ b/App/Views/SettingsWindow.xaml.cs
@@ -16,8 +16,6 @@ public SettingsWindow(SettingsViewModel viewModel)
InitializeComponent();
TitleBarIcon.SetTitlebarIcon(this);
- SystemBackdrop = new DesktopAcrylicBackdrop();
-
RootFrame.Content = new SettingsMainPage(ViewModel);
this.CenterOnScreen();
diff --git a/App/Views/SignInWindow.xaml b/App/Views/SignInWindow.xaml
index d2c1326..6d8340c 100644
--- a/App/Views/SignInWindow.xaml
+++ b/App/Views/SignInWindow.xaml
@@ -11,7 +11,7 @@
Title="Sign in to Coder">
-
+
diff --git a/App/Views/SignInWindow.xaml.cs b/App/Views/SignInWindow.xaml.cs
index 2acd0a5..da68867 100644
--- a/App/Views/SignInWindow.xaml.cs
+++ b/App/Views/SignInWindow.xaml.cs
@@ -24,7 +24,6 @@ public SignInWindow(SignInViewModel viewModel)
{
InitializeComponent();
TitleBarIcon.SetTitlebarIcon(this);
- SystemBackdrop = new DesktopAcrylicBackdrop();
RootFrame.SizeChanged += RootFrame_SizeChanged;
_signInUrlPage = new SignInUrlPage(this, viewModel);
diff --git a/App/Views/TrayWindow.xaml.cs b/App/Views/TrayWindow.xaml.cs
index 7ecd75c..22251e7 100644
--- a/App/Views/TrayWindow.xaml.cs
+++ b/App/Views/TrayWindow.xaml.cs
@@ -4,7 +4,10 @@
using Coder.Desktop.App.Utils;
using Coder.Desktop.App.Views.Pages;
using CommunityToolkit.Mvvm.Input;
+using Microsoft.Extensions.Configuration;
using Microsoft.UI;
+using Microsoft.UI.Composition;
+using Microsoft.UI.Composition.SystemBackdrops;
using Microsoft.UI.Input;
using Microsoft.UI.Windowing;
using Microsoft.UI.Xaml;
@@ -17,6 +20,7 @@
using Windows.Graphics;
using Windows.System;
using Windows.UI.Core;
+using WinRT;
using WinRT.Interop;
using WindowActivatedEventArgs = Microsoft.UI.Xaml.WindowActivatedEventArgs;
@@ -60,7 +64,6 @@ public TrayWindow(IRpcController rpcController, ICredentialManager credentialMan
InitializeComponent();
AppWindow.Hide();
- SystemBackdrop = new DesktopAcrylicBackdrop();
Activated += Window_Activated;
RootFrame.SizeChanged += RootFrame_SizeChanged;
@@ -118,7 +121,6 @@ public TrayWindow(IRpcController rpcController, ICredentialManager credentialMan
};
}
-
private void SetPageByState(RpcModel rpcModel, CredentialModel credentialModel,
SyncSessionControllerStateModel syncSessionModel)
{
From 4b1c092ef20446ac90d94a175c66acf2c7a5fd74 Mon Sep 17 00:00:00 2001
From: Michael Suchacz <203725896+ibetitsmike@users.noreply.github.com>
Date: Wed, 11 Jun 2025 10:50:41 +0200
Subject: [PATCH 2/5] removed unecessary usings
---
App/Views/TrayWindow.xaml.cs | 6 ------
1 file changed, 6 deletions(-)
diff --git a/App/Views/TrayWindow.xaml.cs b/App/Views/TrayWindow.xaml.cs
index 22251e7..ae67856 100644
--- a/App/Views/TrayWindow.xaml.cs
+++ b/App/Views/TrayWindow.xaml.cs
@@ -4,23 +4,17 @@
using Coder.Desktop.App.Utils;
using Coder.Desktop.App.Views.Pages;
using CommunityToolkit.Mvvm.Input;
-using Microsoft.Extensions.Configuration;
using Microsoft.UI;
-using Microsoft.UI.Composition;
-using Microsoft.UI.Composition.SystemBackdrops;
using Microsoft.UI.Input;
using Microsoft.UI.Windowing;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media;
using Microsoft.UI.Xaml.Media.Animation;
using System;
-using System.Diagnostics;
using System.Runtime.InteropServices;
using Windows.Graphics;
using Windows.System;
using Windows.UI.Core;
-using WinRT;
using WinRT.Interop;
using WindowActivatedEventArgs = Microsoft.UI.Xaml.WindowActivatedEventArgs;
From 74785e6547cb6de36d7d197ff7f47de2b7610bcb Mon Sep 17 00:00:00 2001
From: Michael Suchacz <203725896+ibetitsmike@users.noreply.github.com>
Date: Wed, 11 Jun 2025 10:58:40 +0200
Subject: [PATCH 3/5] removed unecessary usings
---
App/Views/TrayWindow.xaml.cs | 2 --
1 file changed, 2 deletions(-)
diff --git a/App/Views/TrayWindow.xaml.cs b/App/Views/TrayWindow.xaml.cs
index ae67856..539bc93 100644
--- a/App/Views/TrayWindow.xaml.cs
+++ b/App/Views/TrayWindow.xaml.cs
@@ -5,7 +5,6 @@
using Coder.Desktop.App.Views.Pages;
using CommunityToolkit.Mvvm.Input;
using Microsoft.UI;
-using Microsoft.UI.Input;
using Microsoft.UI.Windowing;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
@@ -14,7 +13,6 @@
using System.Runtime.InteropServices;
using Windows.Graphics;
using Windows.System;
-using Windows.UI.Core;
using WinRT.Interop;
using WindowActivatedEventArgs = Microsoft.UI.Xaml.WindowActivatedEventArgs;
From dbdac1c33ce7c3956358c8a26e7fe2bd5cb429f5 Mon Sep 17 00:00:00 2001
From: Michael Suchacz <203725896+ibetitsmike@users.noreply.github.com>
Date: Wed, 11 Jun 2025 11:50:40 +0200
Subject: [PATCH 4/5] readded debug only usings
---
App/Views/TrayWindow.xaml.cs | 2 ++
1 file changed, 2 insertions(+)
diff --git a/App/Views/TrayWindow.xaml.cs b/App/Views/TrayWindow.xaml.cs
index 539bc93..ae67856 100644
--- a/App/Views/TrayWindow.xaml.cs
+++ b/App/Views/TrayWindow.xaml.cs
@@ -5,6 +5,7 @@
using Coder.Desktop.App.Views.Pages;
using CommunityToolkit.Mvvm.Input;
using Microsoft.UI;
+using Microsoft.UI.Input;
using Microsoft.UI.Windowing;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
@@ -13,6 +14,7 @@
using System.Runtime.InteropServices;
using Windows.Graphics;
using Windows.System;
+using Windows.UI.Core;
using WinRT.Interop;
using WindowActivatedEventArgs = Microsoft.UI.Xaml.WindowActivatedEventArgs;
From de5f96600f485cb18ef3d06fcd0d88090b86b162 Mon Sep 17 00:00:00 2001
From: Michael Suchacz <203725896+ibetitsmike@users.noreply.github.com>
Date: Wed, 11 Jun 2025 11:57:49 +0200
Subject: [PATCH 5/5] Update App/Views/Pages/TrayWindowMainPage.xaml
Co-authored-by: Dean Sheather
---
App/Views/Pages/TrayWindowMainPage.xaml | 1 -
1 file changed, 1 deletion(-)
diff --git a/App/Views/Pages/TrayWindowMainPage.xaml b/App/Views/Pages/TrayWindowMainPage.xaml
index cfda3d4..80f557d 100644
--- a/App/Views/Pages/TrayWindowMainPage.xaml
+++ b/App/Views/Pages/TrayWindowMainPage.xaml
@@ -273,7 +273,6 @@
CommandParameter="{Binding ElementName=AppButton}"
Width="34"
Height="34"
-
ToolTipService.ToolTip="{x:Bind Details}">