Switch to Segoe UI and add more animations

This commit is contained in:
Yoshi Askharoun
2024-05-13 23:41:36 -05:00
parent 8a78d2bbf7
commit 6806534015
7 changed files with 47 additions and 18 deletions
+1 -5
View File
@@ -12,11 +12,7 @@
</ResourceDictionary.MergedDictionaries>
<FontFamily x:Key="ZMHIcons">Assets/ZMH_Icons.ttf#ZMHIcons</FontFamily>
<LinearGradientBrush x:Key="ZuneGradient" EndPoint="0.5,1" StartPoint="0.5,0">
<GradientStop Color="#F10DA1" Offset="0"/>
<GradientStop Color="#E95214" Offset="1"/>
</LinearGradientBrush>
<FontFamily x:Key="SegoeMDL2">Segoe MDL2 Assets</FontFamily>
</ResourceDictionary>
</Application.Resources>
</Application>
+3 -1
View File
@@ -14,10 +14,12 @@ namespace ZuneModdingHelper
{
public const string Title = "Zune Modding Helper";
public static readonly ReleaseVersion Version = new(2021, 12, 30, 0, Phase.Alpha);
public static readonly ReleaseVersion Version = new(2024, 5, 15, 0, Phase.Debug);
public static readonly string VersionStr = Version.ToString();
public static readonly System.Uri VersionUri = new($"https://github.com/ZuneDev/ZuneModdingHelper/releases/tag/{VersionStr}");
public const string DonateLink = "http://josh.askharoun.com/donate";
public static readonly System.Uri DonateUri = new(DonateLink);
protected override void OnStartup(StartupEventArgs e)
{
+25 -9
View File
@@ -9,7 +9,7 @@
xmlns:b="clr-namespace:ZuneModdingHelper.Behaviors"
mc:Ignorable="d"
WindowStyle="None"
Title="{x:Static zmh:App.Title}" Height="450" Width="800" WindowStartupLocation="CenterScreen">
Title="{x:Static zmh:App.Title}" Height="475" Width="800" WindowStartupLocation="CenterScreen">
<WindowChrome.WindowChrome>
<WindowChrome CaptionHeight="52" CornerRadius="0"
@@ -25,9 +25,9 @@
<Setter Property="Padding" Value="12"/>
</Style>
<Style x:Key="PivotButtonStyle" TargetType="zmhc:TextButton" BasedOn="{StaticResource DefaultTextButtonStyle}">
<Setter Property="FontFamily" Value="segoe zuc"/>
<Setter Property="FontSize" Value="12"/>
<Setter Property="AllowUncheck" Value="False"/>
<Setter Property="HorizontalAlignment" Value="Center"/>
</Style>
</Window.Resources>
@@ -72,17 +72,33 @@
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<TextBlock Text="{x:Static zmh:App.Title}" Grid.RowSpan="2"
Foreground="#3C3C3C" FontSize="28" FontFamily="segoe zlc" Margin="0,-6,0,0" />
<TextBlock Text="zune modding helper" Grid.RowSpan="2" Margin="0,-6,0,0"
Foreground="{StaticResource ZuneMediumTextBrush}"
FontSize="28" FontWeight="Light" />
<StackPanel x:Name="Pivot" Grid.Row="1" VerticalAlignment="Bottom" Orientation="Horizontal">
<zmhc:TextButton Text="Mods" Grid.Column="0" Width="36"
<Grid x:Name="Pivot" Grid.Row="1" VerticalAlignment="Bottom">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="36"/>
<ColumnDefinition Width="74"/>
<ColumnDefinition Width="42"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<zmhc:TextButton Text="MODS" Grid.Column="0"
Style="{StaticResource PivotButtonStyle}" />
<zmhc:TextButton Text="Settings" Grid.Column="1" Width="58" Margin="6,0,0,0"
<zmhc:TextButton Text="SETTINGS" Grid.Column="1"
Style="{StaticResource PivotButtonStyle}" />
<zmhc:TextButton Text="About" Grid.Column="2" Margin="6,0,0,0"
<zmhc:TextButton Text="ABOUT" Grid.Column="2"
Style="{StaticResource PivotButtonStyle}" />
</StackPanel>
<i:Interaction.Behaviors>
<b:FadeAnimateItemsPanelBehavior Tick="0:0:0.05">
<b:FadeAnimateItemsPanelBehavior.Animation>
<DoubleAnimation From="0" To="1" Duration="0:0:0.3"/>
</b:FadeAnimateItemsPanelBehavior.Animation>
</b:FadeAnimateItemsPanelBehavior>
</i:Interaction.Behaviors>
</Grid>
</Grid>
</Border>
+1 -1
View File
@@ -21,7 +21,7 @@
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsChecked" Value="True">
<Setter TargetName="Label" Property="FontWeight" Value="ExtraBlack"/>
<Setter TargetName="Label" Property="FontWeight" Value="Bold"/>
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="Label" Property="Foreground" Value="#CCC"/>
+11 -2
View File
@@ -45,9 +45,18 @@
<TextBlock TextTrimming="CharacterEllipsis">
<Run Text="{Binding Title, Mode=OneWay}" FontWeight="SemiBold" FontSize="16"/>
<Run Text=" By "/><Run Text="{Binding Author, Mode=OneWay}"/>
<Run Text=" By "/><Run Text="{Binding Author, Mode=OneWay}"
Foreground="{StaticResource ZuneMediumTextBrush}"/>
</TextBlock>
<TextBlock Text="{Binding Description}" Grid.Row="1"
<!--<TextBlock Text="&#xE73E;" Foreground="#646464"
FontSize="16" FontFamily="{StaticResource SegoeMDL2}"
VerticalAlignment="Center" HorizontalAlignment="Right" />-->
<Image Source="D:\Repos\ZuneDev\ZuneShell.dll\ZuneShell\Resources\RCDATA\ATTENTION.PNG"
Width="17" Height="18" SnapsToDevicePixels="True"
VerticalAlignment="Center" HorizontalAlignment="Right"/>
<TextBlock Text="{Binding Description}" Grid.Row="1" Foreground="{StaticResource ZuneLightTextBrush}"
FontSize="14" TextWrapping="Wrap"/>
</Grid>
</Border>
+5
View File
@@ -6,6 +6,11 @@
<SolidColorBrush x:Key="ZuneLightTextBrush" Color="#868686"/>
<SolidColorBrush x:Key="ZuneExtraLightTextBrush" Color="#B4B4B4"/>
<LinearGradientBrush x:Key="ZuneGradient" EndPoint="0.5,1" StartPoint="0.5,0">
<GradientStop Color="#F10DA1" Offset="0"/>
<GradientStop Color="#E95214" Offset="1"/>
</LinearGradientBrush>
<Style x:Key="ZuneTextBlock" TargetType="TextBlock">
<Setter Property="FontFamily" Value="Segoe UI"/>
<Setter Property="Typography.StylisticSet1" Value="True"/>
@@ -20,6 +20,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Colourful" Version="3.2.0" />
<PackageReference Include="ControlzEx" Version="6.0.0" />
<PackageReference Include="MahApps.Metro" Version="2.4.10" />
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.3" />