Skip to content

Commit

Permalink
Breaking Changes
Browse files Browse the repository at this point in the history 
Changed target framework to 22621
  • Loading branch information
@CosmicPredator
CosmicPredator committed Mar 23, 2024
1 parent 20fc425 commit 596c705
Show file tree
Hide file tree
Showing 3 changed files with 120 additions and 123 deletions.
4 changes: 2 additions & 2 deletions src/AniMoe.App/AniMoe.App.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
<RootNamespace>AniMoe.App</RootNamespace>
<ApplicationManifest>app.manifest</ApplicationManifest>
Expand Down Expand Up @@ -90,14 +90,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" Version="0.1.240305-build.1659" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.SegmentedControl" Version="0.0.3" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.SettingsControls" Version="0.0.18" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.Shimmer" Version="0.0.1" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<PackageReference Include="CommunityToolkit.WinUI.UI.Animations" Version="7.1.2" />
<PackageReference Include="CommunityToolkit.WinUI.UI.Behaviors" Version="7.1.2" />
<PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
<PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.2" />
<PackageReference Include="CommunityToolkit.WinUI.UI.Media" Version="7.1.2" />
<PackageReference Include="H.NotifyIcon.WinUI" Version="2.0.124" />
<PackageReference Include="LiveChartsCore.SkiaSharpView.WinUI" Version="2.0.0-rc1" />
Expand Down
237 changes: 116 additions & 121 deletions src/AniMoe.App/Views/AnimeListView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,127 +101,122 @@
</ItemsRepeater.Layout>
<ItemsRepeater.ItemTemplate>
<DataTemplate x:DataType="data:Entry">
<Grid
x:Name="MasterGrid"
Padding="3"
Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
Canvas.ZIndex="0"
CornerRadius="8"
PointerEntered="CardOnHover"
PointerExited="CardOffHover"
PointerPressed="MasterGrid_PointerPressed"
Tag="{x:Bind Media.Id}">
<Grid.Shadow>
<ThemeShadow />
</Grid.Shadow>
<Grid.TranslationTransition>
<Vector3Transition />
</Grid.TranslationTransition>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ContextFlyout>
<MenuFlyout>
<MenuFlyoutItem Text="Edit">
<MenuFlyoutItem.Icon>
<FontIcon Glyph="&#xE70F;" />
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>
<MenuFlyoutItem
Click="DownloadCoverImage"
Tag="{x:Bind Media}"
Text="Save Image">
<MenuFlyoutItem.Icon>
<FontIcon Glyph="&#xE78C;" />
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>
<MenuFlyoutItem
Click="UrlLauncher"
Tag="{x:Bind Media.SiteUrl}"
Text="Open in Browser">
<MenuFlyoutItem.Icon>
<FontIcon Glyph="&#xE7AC;" />
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>
<MenuFlyoutItem
Click="CopyUrl"
Tag="{x:Bind Media.SiteUrl}"
Text="Copy URL">
<MenuFlyoutItem.Icon>
<FontIcon Glyph="&#xE8C8;" />
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>
</MenuFlyout>
</Grid.ContextFlyout>
<toolkit:ImageEx
Grid.Row="0"
Margin="10"
CornerRadius="5"
IsCacheEnabled="True"
Source="{x:Bind Media.CoverImage.Large}"
Stretch="UniformToFill" />
<TextBlock
Grid.Row="1"
Margin="10,0"
FontSize="15"
FontWeight="Medium"
MaxLines="1"
Text="{x:Bind Media.Title.UserPreferred}"
TextTrimming="CharacterEllipsis"
TextWrapping="Wrap"
ToolTipService.ToolTip="{x:Bind Media.Title.UserPreferred}" />
<TextBlock
Grid.Row="2"
Margin="10,5"
FontSize="12"
MaxLines="1"
Text="{x:Bind Media.Format, Converter={StaticResource FormatConv}}"
TextTrimming="CharacterEllipsis"
ToolTipService.ToolTip="{x:Bind Media.Format, Converter={StaticResource FormatConv}}" />
<RelativePanel Grid.Row="3" Margin="10,5,10,10">
<Button
Padding="4"
x:DefaultBindMode="OneWay"
Command="{Binding DataContext.SaveImage, ElementName=AnimeListElement}"
RelativePanel.AlignLeftWithPanel="True">
<Button.Content>
<TextBlock FontSize="12" FontWeight="Medium">
<Run Text="{x:Bind Progress}" />
<Run Text="/" />
<Run Text="{x:Bind Media.Episodes}" />
<Run Text="+" />
</TextBlock>
</Button.Content>
</Button>
<Button
x:Name="AiringButton"
Padding="4"
x:Load="{x:Bind Media.NextAiringEpisode.AiringAt, Converter={StaticResource NullValConv}}"
Background="{ThemeResource SystemAccentColorDark1}"
RelativePanel.AlignRightWithPanel="True">
<Button.Content>
<FontIcon FontSize="15" Glyph="&#xe121;" />
</Button.Content>
<Button.Flyout>
<Flyout>
<Flyout.Content>
<TextBlock FontWeight="Medium">
<Run Text="Ep." />
<Run Text="{x:Bind Media.NextAiringEpisode.Episode}" />
<Run Text=" in " />
<Run Text="{x:Bind Media.NextAiringEpisode.AiringAt, Converter={StaticResource UntilConv}}" />
</TextBlock>
</Flyout.Content>
</Flyout>
</Button.Flyout>
</Button>
</RelativePanel>
</Grid>
<ItemContainer CornerRadius="8">
<Grid
x:Name="MasterGrid"
Padding="3"
Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
Canvas.ZIndex="0"
CornerRadius="8"
PointerPressed="MasterGrid_PointerPressed"
Tag="{x:Bind Media.Id}">
<Grid.Shadow>
<ThemeShadow />
</Grid.Shadow>
<Grid.TranslationTransition>
<Vector3Transition />
</Grid.TranslationTransition>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ContextFlyout>
<MenuFlyout>
<MenuFlyoutItem Text="Edit">
<MenuFlyoutItem.Icon>
<FontIcon Glyph="&#xE70F;" />
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>
<MenuFlyoutItem
Click="DownloadCoverImage"
Tag="{x:Bind Media}"
Text="Save Image">
<MenuFlyoutItem.Icon>
<FontIcon Glyph="&#xE78C;" />
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>
<MenuFlyoutItem
Click="UrlLauncher"
Tag="{x:Bind Media.SiteUrl}"
Text="Open in Browser">
<MenuFlyoutItem.Icon>
<FontIcon Glyph="&#xE7AC;" />
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>
<MenuFlyoutItem
Click="CopyUrl"
Tag="{x:Bind Media.SiteUrl}"
Text="Copy URL">
<MenuFlyoutItem.Icon>
<FontIcon Glyph="&#xE8C8;" />
</MenuFlyoutItem.Icon>
</MenuFlyoutItem>
</MenuFlyout>
</Grid.ContextFlyout>
<toolkit:ImageEx
Grid.Row="0"
Margin="10"
CornerRadius="5"
IsCacheEnabled="True"
Source="{x:Bind Media.CoverImage.Large}"
Stretch="UniformToFill" />
<TextBlock
Grid.Row="1"
Margin="10,0"
FontSize="15"
MaxLines="1"
Text="{x:Bind Media.Title.UserPreferred}"
TextTrimming="CharacterEllipsis"
TextWrapping="Wrap"
ToolTipService.ToolTip="{x:Bind Media.Title.UserPreferred}" />
<TextBlock
Grid.Row="2"
Margin="10,5"
FontSize="12"
MaxLines="1"
Text="{x:Bind Media.Format, Converter={StaticResource FormatConv}}"
TextTrimming="CharacterEllipsis"
ToolTipService.ToolTip="{x:Bind Media.Format, Converter={StaticResource FormatConv}}" />
<RelativePanel Grid.Row="3" Margin="10,5,10,10">
<Button
Padding="4"
x:DefaultBindMode="OneWay"
Command="{Binding DataContext.SaveImage, ElementName=AnimeListElement}"
RelativePanel.AlignLeftWithPanel="True">
<Button.Content>
<TextBlock FontSize="12" FontWeight="Medium">
<Run Text="{x:Bind Progress}" />
<Run Text="/" />
<Run Text="{x:Bind Media.Episodes}" />
<Run Text="+" />
</TextBlock>
</Button.Content>
</Button>
<Button
x:Name="AiringButton"
Padding="4"
x:Load="{x:Bind Media.NextAiringEpisode.AiringAt, Converter={StaticResource NullValConv}}"
Background="{ThemeResource SystemAccentColorDark1}"
RelativePanel.AlignRightWithPanel="True">
<ToolTipService.ToolTip>
<TextBlock FontWeight="Medium">
<Run Text="Ep." />
<Run Text="{x:Bind Media.NextAiringEpisode.Episode}" />
<Run Text=" in " />
<Run Text="{x:Bind Media.NextAiringEpisode.AiringAt, Converter={StaticResource UntilConv}}" />
</TextBlock>
</ToolTipService.ToolTip>
<Button.Content>
<FontIcon FontSize="15" Glyph="&#xe121;" />
</Button.Content>
</Button>
</RelativePanel>
</Grid>
</ItemContainer>
</DataTemplate>
</ItemsRepeater.ItemTemplate>
</ItemsRepeater>
Expand Down
2 changes: 2 additions & 0 deletions src/AniMoe.App/Views/AnimeListView.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
using AniMoe.App.Services;
using AniMoe.App.ViewModels;
using CommunityToolkit.WinUI;
using CommunityToolkit.WinUI.UI;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Controls.Primitives;
using Microsoft.UI.Xaml.Input;
using Microsoft.UI.Xaml.Media.Animation;
using System;
Expand Down

0 comments on commit 596c705

Please sign in to comment.