diff --git a/LanMountainDesktop/App.axaml b/LanMountainDesktop/App.axaml index cf50593..4ad335d 100644 --- a/LanMountainDesktop/App.axaml +++ b/LanMountainDesktop/App.axaml @@ -25,6 +25,7 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/LanMountainDesktop/Styles/SettingsAnimations.axaml b/LanMountainDesktop/Styles/SettingsAnimations.axaml index 199fe80..ee3074b 100644 --- a/LanMountainDesktop/Styles/SettingsAnimations.axaml +++ b/LanMountainDesktop/Styles/SettingsAnimations.axaml @@ -1,4 +1,4 @@ - @@ -16,17 +16,17 @@ - + @@ -74,8 +74,8 @@ @@ -87,8 +87,8 @@ diff --git a/LanMountainDesktop/Styles/SettingsCardStyles.axaml b/LanMountainDesktop/Styles/SettingsCardStyles.axaml index 6ea1c28..400ef87 100644 --- a/LanMountainDesktop/Styles/SettingsCardStyles.axaml +++ b/LanMountainDesktop/Styles/SettingsCardStyles.axaml @@ -1,7 +1,8 @@ + xmlns:fi="using:FluentIcons.Avalonia.Fluent" + xmlns:behaviors="using:LanMountainDesktop.Behaviors"> + + + + diff --git a/LanMountainDesktop/Theme/FluttermotionToken.cs b/LanMountainDesktop/Theme/FluttermotionToken.cs index 8a30ba9..5763373 100644 --- a/LanMountainDesktop/Theme/FluttermotionToken.cs +++ b/LanMountainDesktop/Theme/FluttermotionToken.cs @@ -5,13 +5,15 @@ namespace LanMountainDesktop.Theme; public static class FluttermotionToken { public static readonly TimeSpan Fast = TimeSpan.FromMilliseconds(120); - public static readonly TimeSpan Standard = TimeSpan.FromMilliseconds(160); - public static readonly TimeSpan Slow = TimeSpan.FromMilliseconds(200); - public static readonly TimeSpan Page = TimeSpan.FromMilliseconds(240); - public static readonly TimeSpan Intro = TimeSpan.FromMilliseconds(320); + public static readonly TimeSpan Standard = TimeSpan.FromMilliseconds(200); + public static readonly TimeSpan Slow = TimeSpan.FromMilliseconds(280); + public static readonly TimeSpan Page = TimeSpan.FromMilliseconds(320); + public static readonly TimeSpan Intro = TimeSpan.FromMilliseconds(400); - public static readonly TimeSpan StaggerStepInterval = TimeSpan.FromMilliseconds(24); + public static readonly TimeSpan StaggerStepInterval = TimeSpan.FromMilliseconds(32); public static readonly TimeSpan WeatherAnimationFrameInterval = TimeSpan.FromMilliseconds(64); - public const string StandardBezier = "0.22, 1, 0.36, 1"; + public const string StandardBezier = "0.05, 0.75, 0.10, 1.00"; + public const string DecelerateBezier = "0.05, 0.75, 0.10, 1.00"; + public const string AccelerateBezier = "0.30, 0.00, 0.60, 0.00"; } diff --git a/LanMountainDesktop/Views/SettingsPages/AppearanceSettingsPage.axaml b/LanMountainDesktop/Views/SettingsPages/AppearanceSettingsPage.axaml index b337027..3044c07 100644 --- a/LanMountainDesktop/Views/SettingsPages/AppearanceSettingsPage.axaml +++ b/LanMountainDesktop/Views/SettingsPages/AppearanceSettingsPage.axaml @@ -7,7 +7,7 @@ x:Class="LanMountainDesktop.Views.SettingsPages.AppearanceSettingsPage" x:DataType="vm:AppearanceSettingsPageViewModel"> - + - + diff --git a/LanMountainDesktop/Views/SettingsPages/GeneralSettingsPage.axaml b/LanMountainDesktop/Views/SettingsPages/GeneralSettingsPage.axaml index 993d60d..e192389 100644 --- a/LanMountainDesktop/Views/SettingsPages/GeneralSettingsPage.axaml +++ b/LanMountainDesktop/Views/SettingsPages/GeneralSettingsPage.axaml @@ -7,7 +7,7 @@ x:Class="LanMountainDesktop.Views.SettingsPages.GeneralSettingsPage" x:DataType="vm:GeneralSettingsPageViewModel"> - + - + - + - + diff --git a/LanMountainDesktop/Views/SettingsPages/PluginsSettingsPage.axaml b/LanMountainDesktop/Views/SettingsPages/PluginsSettingsPage.axaml index 730893a..b69d68c 100644 --- a/LanMountainDesktop/Views/SettingsPages/PluginsSettingsPage.axaml +++ b/LanMountainDesktop/Views/SettingsPages/PluginsSettingsPage.axaml @@ -8,7 +8,7 @@ x:Name="Root" x:DataType="vm:PluginsSettingsPageViewModel"> - + diff --git a/LanMountainDesktop/Views/SettingsPages/PrivacySettingsPage.axaml b/LanMountainDesktop/Views/SettingsPages/PrivacySettingsPage.axaml index edf68a5..5a05cfa 100644 --- a/LanMountainDesktop/Views/SettingsPages/PrivacySettingsPage.axaml +++ b/LanMountainDesktop/Views/SettingsPages/PrivacySettingsPage.axaml @@ -7,7 +7,7 @@ x:Class="LanMountainDesktop.Views.SettingsPages.PrivacySettingsPage" x:DataType="vm:PrivacySettingsPageViewModel"> - + diff --git a/LanMountainDesktop/Views/SettingsPages/StatusBarSettingsPage.axaml b/LanMountainDesktop/Views/SettingsPages/StatusBarSettingsPage.axaml index 7e7f125..5a620d6 100644 --- a/LanMountainDesktop/Views/SettingsPages/StatusBarSettingsPage.axaml +++ b/LanMountainDesktop/Views/SettingsPages/StatusBarSettingsPage.axaml @@ -7,7 +7,7 @@ x:Class="LanMountainDesktop.Views.SettingsPages.StatusBarSettingsPage" x:DataType="vm:StatusBarSettingsPageViewModel"> - + diff --git a/LanMountainDesktop/Views/SettingsPages/UpdateSettingsPage.axaml b/LanMountainDesktop/Views/SettingsPages/UpdateSettingsPage.axaml index c778d87..493a756 100644 --- a/LanMountainDesktop/Views/SettingsPages/UpdateSettingsPage.axaml +++ b/LanMountainDesktop/Views/SettingsPages/UpdateSettingsPage.axaml @@ -36,7 +36,7 @@ - + - + diff --git a/LanMountainDesktop/Views/SettingsPages/WeatherSettingsPage.axaml b/LanMountainDesktop/Views/SettingsPages/WeatherSettingsPage.axaml index 977313b..e77f47b 100644 --- a/LanMountainDesktop/Views/SettingsPages/WeatherSettingsPage.axaml +++ b/LanMountainDesktop/Views/SettingsPages/WeatherSettingsPage.axaml @@ -8,7 +8,7 @@ x:Class="LanMountainDesktop.Views.SettingsPages.WeatherSettingsPage" x:DataType="vm:WeatherSettingsPageViewModel"> - + diff --git a/LanMountainDesktop/Views/SettingsWindow.axaml b/LanMountainDesktop/Views/SettingsWindow.axaml index 65fcddc..f9d88a2 100644 --- a/LanMountainDesktop/Views/SettingsWindow.axaml +++ b/LanMountainDesktop/Views/SettingsWindow.axaml @@ -2,7 +2,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:vm="using:LanMountainDesktop.ViewModels" xmlns:ui="using:FluentAvalonia.UI.Controls" - xmlns:fi="using:FluentIcons.Avalonia" + xmlns:fi="using:FluentIcons.Avalonia.Fluent" x:Class="LanMountainDesktop.Views.SettingsWindow" x:DataType="vm:SettingsWindowViewModel" Width="1120" @@ -50,15 +50,14 @@ ColumnSpacing="8" VerticalAlignment="Center">