Skip to content

Commit 2b63bcc

Browse files
committed
#120 ui improvements & style unification
1 parent 059179c commit 2b63bcc

15 files changed

+21
-25
lines changed

App/Views/DirectoryPickerWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
MinWidth="400" MinHeight="600">
1414

1515
<Window.SystemBackdrop>
16-
<DesktopAcrylicBackdrop />
16+
<MicaBackdrop/>
1717
</Window.SystemBackdrop>
1818

1919
<Frame x:Name="RootFrame" />

App/Views/DirectoryPickerWindow.xaml.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ public DirectoryPickerWindow(DirectoryPickerViewModel viewModel)
1919
InitializeComponent();
2020
TitleBarIcon.SetTitlebarIcon(this);
2121

22-
SystemBackdrop = new DesktopAcrylicBackdrop();
23-
2422
viewModel.Initialize(this, DispatcherQueue);
2523
RootFrame.Content = new DirectoryPickerMainPage(viewModel);
2624

App/Views/FileSyncListWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
MinWidth="1000" MinHeight="300">
1414

1515
<Window.SystemBackdrop>
16-
<DesktopAcrylicBackdrop />
16+
<MicaBackdrop/>
1717
</Window.SystemBackdrop>
1818

1919
<Frame x:Name="RootFrame" />

App/Views/FileSyncListWindow.xaml.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ public FileSyncListWindow(FileSyncListViewModel viewModel)
1616
InitializeComponent();
1717
TitleBarIcon.SetTitlebarIcon(this);
1818

19-
SystemBackdrop = new DesktopAcrylicBackdrop();
20-
2119
ViewModel.Initialize(this, DispatcherQueue);
2220
RootFrame.Content = new FileSyncListMainPage(ViewModel);
2321

App/Views/Pages/DirectoryPickerMainPage.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
xmlns:converters="using:Coder.Desktop.App.Converters"
1010
xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
1111
xmlns:viewmodels="using:Coder.Desktop.App.ViewModels"
12-
mc:Ignorable="d"
13-
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
12+
mc:Ignorable="d">
1413

1514
<Grid>
1615
<Grid

App/Views/Pages/FileSyncListMainPage.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
xmlns:viewmodels="using:Coder.Desktop.App.ViewModels"
1010
xmlns:converters="using:Coder.Desktop.App.Converters"
11-
mc:Ignorable="d"
12-
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
11+
mc:Ignorable="d">
1312

1413
<Grid>
1514
<Grid

App/Views/Pages/SettingsMainPage.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
xmlns:ui="using:CommunityToolkit.WinUI"
1212
xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
1313
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
14-
mc:Ignorable="d"
15-
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
14+
mc:Ignorable="d">
15+
1616
<Page.Resources>
1717
<!-- Spacing between cards -->
1818
<x:Double x:Key="SettingsCardSpacing">4</x:Double>

App/Views/Pages/SignInTokenPage.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
77
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
9-
mc:Ignorable="d"
10-
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
9+
mc:Ignorable="d">
1110

1211
<StackPanel
1312
Orientation="Vertical"

App/Views/Pages/SignInUrlPage.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
77
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
9-
mc:Ignorable="d"
10-
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
9+
mc:Ignorable="d">
1110

1211
<StackPanel
1312
Orientation="Vertical"

App/Views/Pages/TrayWindowMainPage.xaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,13 +267,18 @@
267267
<DataTemplate x:DataType="viewModels:AgentAppViewModel">
268268
<HyperlinkButton
269269
x:Name="AppButton"
270-
Padding="6"
271-
Margin="0"
270+
Padding="4"
271+
Margin="2"
272272
Command="{x:Bind OpenAppCommand}"
273273
CommandParameter="{Binding ElementName=AppButton}"
274274
Width="34"
275275
Height="34"
276+
276277
ToolTipService.ToolTip="{x:Bind Details}">
278+
<HyperlinkButton.Resources>
279+
<SolidColorBrush x:Key="HyperlinkButtonBackground" Color="#1F000000"/>
280+
<SolidColorBrush x:Key="HyperlinkButtonBackgroundPointerOver" Color="{ThemeResource SystemAccentColorDark1}" />
281+
</HyperlinkButton.Resources>
277282

278283
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
279284
<Image

App/Views/SettingsWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
MinWidth="600" MinHeight="350">
1414

1515
<Window.SystemBackdrop>
16-
<DesktopAcrylicBackdrop />
16+
<MicaBackdrop/>
1717
</Window.SystemBackdrop>
1818

1919
<Frame x:Name="RootFrame" />

App/Views/SettingsWindow.xaml.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ public SettingsWindow(SettingsViewModel viewModel)
1616
InitializeComponent();
1717
TitleBarIcon.SetTitlebarIcon(this);
1818

19-
SystemBackdrop = new DesktopAcrylicBackdrop();
20-
2119
RootFrame.Content = new SettingsMainPage(ViewModel);
2220

2321
this.CenterOnScreen();

App/Views/SignInWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
Title="Sign in to Coder">
1212

1313
<Window.SystemBackdrop>
14-
<DesktopAcrylicBackdrop />
14+
<MicaBackdrop/>
1515
</Window.SystemBackdrop>
1616

1717
<controls:SizedFrame x:Name="RootFrame" />

App/Views/SignInWindow.xaml.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ public SignInWindow(SignInViewModel viewModel)
2424
{
2525
InitializeComponent();
2626
TitleBarIcon.SetTitlebarIcon(this);
27-
SystemBackdrop = new DesktopAcrylicBackdrop();
2827
RootFrame.SizeChanged += RootFrame_SizeChanged;
2928

3029
_signInUrlPage = new SignInUrlPage(this, viewModel);

App/Views/TrayWindow.xaml.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
using Coder.Desktop.App.Utils;
55
using Coder.Desktop.App.Views.Pages;
66
using CommunityToolkit.Mvvm.Input;
7+
using Microsoft.Extensions.Configuration;
78
using Microsoft.UI;
9+
using Microsoft.UI.Composition;
10+
using Microsoft.UI.Composition.SystemBackdrops;
811
using Microsoft.UI.Input;
912
using Microsoft.UI.Windowing;
1013
using Microsoft.UI.Xaml;
@@ -17,6 +20,7 @@
1720
using Windows.Graphics;
1821
using Windows.System;
1922
using Windows.UI.Core;
23+
using WinRT;
2024
using WinRT.Interop;
2125
using WindowActivatedEventArgs = Microsoft.UI.Xaml.WindowActivatedEventArgs;
2226

@@ -60,7 +64,6 @@ public TrayWindow(IRpcController rpcController, ICredentialManager credentialMan
6064

6165
InitializeComponent();
6266
AppWindow.Hide();
63-
SystemBackdrop = new DesktopAcrylicBackdrop();
6467
Activated += Window_Activated;
6568
RootFrame.SizeChanged += RootFrame_SizeChanged;
6669

@@ -118,7 +121,6 @@ public TrayWindow(IRpcController rpcController, ICredentialManager credentialMan
118121
};
119122
}
120123

121-
122124
private void SetPageByState(RpcModel rpcModel, CredentialModel credentialModel,
123125
SyncSessionControllerStateModel syncSessionModel)
124126
{

0 commit comments

Comments
 (0)