Skip to content

Commit

Permalink
Migrate to Avalonia 11
Browse files Browse the repository at this point in the history
  • Loading branch information
@davidxuang
davidxuang committed Sep 2, 2023
1 parent 5f67582 commit 8a4aeb3
Show file tree
Hide file tree
Showing 20 changed files with 351 additions and 731 deletions.
108 changes: 62 additions & 46 deletions MusicDecrypto.Avalonia/App.axaml
View file
Original file line number Diff line number Diff line change
@@ -1,48 +1,64 @@
<Application xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sty="using:FluentAvalonia.Styling"
x:Class="MusicDecrypto.Avalonia.App">

<Application.Styles>
<sty:FluentAvaloniaTheme />

<StyleInclude Source="/Controls/OptionsDisplayItem.axaml" />
<StyleInclude Source="/Controls/UrlTextBlock.axaml" />

<Style Selector="TextBlock.BaseTextBlockStyle">
<Setter Property="LineHeight" Value="20" />
<Setter Property="ClipToBounds" Value="False" />
</Style>

<Style Selector="TextBlock.CaptionTextBlockStyle">
<Setter Property="LineHeight" Value="16" />
<Setter Property="ClipToBounds" Value="False" />
</Style>

<Style Selector="TextBlock.BodyTextBlockStyle">
<Setter Property="LineHeight" Value="20" />
<Setter Property="ClipToBounds" Value="False" />
</Style>

<Style Selector="TextBlock.BodyStrongTextBlockStyle">
<Setter Property="LineHeight" Value="20" />
<Setter Property="ClipToBounds" Value="False" />
</Style>

<Style Selector="TextBlock.SubtitleTextBlockStyle">
<Setter Property="LineHeight" Value="28" />
<Setter Property="ClipToBounds" Value="False" />
</Style>

<Style Selector="TextBlock.TitleTextBlockStyle">
<Setter Property="LineHeight" Value="36" />
<Setter Property="ClipToBounds" Value="False" />
</Style>

<Style Selector="TextBlock.DisplayTextBlockStyle">
<Setter Property="LineHeight" Value="92" />
<Setter Property="ClipToBounds" Value="False" />
</Style>
</Application.Styles>
<Application x:Class="MusicDecrypto.Avalonia.App"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:ic="using:FluentIcons.FluentAvalonia"
xmlns:sty="using:FluentAvalonia.Styling">

<Application.Resources>
<ResourceDictionary>
<ic:SymbolIconSource x:Key="BoxMultipleIcon" Symbol="BoxMultiple" />
<ic:SymbolIconSource x:Key="CodeIcon" Symbol="Code" />
<ic:SymbolIconSource x:Key="DocumentBulletListIcon" Symbol="DocumentBulletList" />
<ic:SymbolIconSource x:Key="OpenIcon" Symbol="Open" />
<ic:SymbolIconSource x:Key="PaintBrushIcon" Symbol="PaintBrush" />

<ControlTheme x:Key="FluentBaseTextBlockStyle"
BasedOn="{StaticResource BaseTextBlockStyle}" TargetType="TextBlock">
<Setter Property="LineHeight" Value="20" />
<Setter Property="ClipToBounds" Value="False" />
</ControlTheme>

<ControlTheme x:Key="FluentCaptionTextBlockStyle"
BasedOn="{StaticResource CaptionTextBlockStyle}" TargetType="TextBlock">
<Setter Property="LineHeight" Value="16" />
<Setter Property="ClipToBounds" Value="False" />
</ControlTheme>

<ControlTheme x:Key="FluentBodyTextBlockStyle"
BasedOn="{StaticResource BodyTextBlockStyle}" TargetType="TextBlock">
<Setter Property="LineHeight" Value="20" />
<Setter Property="ClipToBounds" Value="False" />
</ControlTheme>

<ControlTheme x:Key="FluentBodyStrongTextBlockStyle"
BasedOn="{StaticResource BodyStrongTextBlockStyle}" TargetType="TextBlock">
<Setter Property="LineHeight" Value="20" />
<Setter Property="ClipToBounds" Value="False" />
</ControlTheme>

<ControlTheme x:Key="FluentSubtitleTextBlockStyle"
BasedOn="{StaticResource SubtitleTextBlockStyle}" TargetType="TextBlock">
<Setter Property="LineHeight" Value="28" />
<Setter Property="ClipToBounds" Value="False" />
</ControlTheme>

<ControlTheme x:Key="FluentTitleTextBlockStyle"
BasedOn="{StaticResource TitleTextBlockStyle}" TargetType="TextBlock">
<Setter Property="LineHeight" Value="36" />
<Setter Property="ClipToBounds" Value="False" />
</ControlTheme>

<ControlTheme x:Key="FluentDisplayTextBlockStyle"
BasedOn="{StaticResource DisplayTextBlockStyle}" TargetType="TextBlock">
<Setter Property="LineHeight" Value="92" />
<Setter Property="ClipToBounds" Value="False" />
</ControlTheme>
</ResourceDictionary>
</Application.Resources>

<Application.Styles>
<sty:FluentAvaloniaTheme />
<StyleInclude Source="/Controls/UrlTextBlock.axaml" />
</Application.Styles>

</Application>
7 changes: 4 additions & 3 deletions MusicDecrypto.Avalonia/Controls/MatchDialogContent.axaml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<UserControl x:Class="MusicDecrypto.Avalonia.Controls.MatchDialogContent"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800">
d:DesignWidth="800" d:DesignHeight="450"
mc:Ignorable="d">

<DataGrid CanUserSortColumns="False" IsReadOnly="True" Items="{Binding Properties}">
<DataGrid ItemsSource="{Binding Properties}" IsReadOnly="True" CanUserSortColumns="False">
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding Key}" Header="Source" />
<DataGridTextColumn Binding="{Binding Title}" Header="Title" />
Expand Down
5 changes: 0 additions & 5 deletions MusicDecrypto.Avalonia/Controls/MatchDialogContent.axaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,4 @@ public MatchDialogContent()
{
InitializeComponent();
}

private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
}
161 changes: 0 additions & 161 deletions MusicDecrypto.Avalonia/Controls/OptionsDisplayItem.axaml
View file

This file was deleted.

Loading

0 comments on commit 8a4aeb3

Please sign in to comment.