Skip to content

Commit

Permalink
feat: add credits for scenes
Browse files Browse the repository at this point in the history
  • Loading branch information
@not-nullptr
not-nullptr committed Sep 18, 2024
1 parent 0b5be69 commit 4763013
Show file tree
Hide file tree
Showing 12 changed files with 129 additions and 28 deletions.
7 changes: 7 additions & 0 deletions Aerochat/Aerochat.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@
<None Remove="Scenes\ButterflyPattern.png" />
<None Remove="Scenes\CarbonFiber.jpg" />
<None Remove="Scenes\CarbonFiber.png" />
<None Remove="Scenes\Caustics.jpg" />
<None Remove="Scenes\default.png" />
<None Remove="Scenes\DottieGreen.png" />
<None Remove="Scenes\Floral.png" />
Expand All @@ -145,11 +146,14 @@
<None Remove="Scenes\Halo.png" />
<None Remove="Scenes\HelloKitty.png" />
<None Remove="Scenes\MesmerizingWhite.png" />
<None Remove="Scenes\Miku1.png" />
<None Remove="Scenes\Morty.png" />
<None Remove="Scenes\Robot.jpg" />
<None Remove="Scenes\Robot.png" />
<None Remove="Scenes\Silhouette.jpg" />
<None Remove="Scenes\Silhouette.png" />
<None Remove="Scenes\VolumeBeta.png" />
<None Remove="Scenes\XboxGrunge.png" />
<None Remove="Scenes\zune_01.jpg" />
<None Remove="Scenes\zune_01.png" />
<None Remove="Scenes\zune_02.jpg" />
Expand Down Expand Up @@ -305,6 +309,7 @@
<Resource Include="Scenes\BetaFish.png" />
<Resource Include="Scenes\ButterflyPattern.png" />
<Resource Include="Scenes\CarbonFiber.png" />
<Resource Include="Scenes\Caustics.jpg" />
<Resource Include="Scenes\DottieGreen.png" />
<Resource Include="Scenes\Floral.png" />
<Resource Include="Scenes\Graffiti.png" />
Expand All @@ -315,6 +320,8 @@
<Resource Include="Scenes\Robot.png" />
<Resource Include="Scenes\Silhouette.png" />
<Resource Include="Scenes\default.png" />
<Resource Include="Scenes\VolumeBeta.png" />
<Resource Include="Scenes\XboxGrunge.png" />
<Resource Include="Scenes\zune_01.png" />
<Resource Include="Scenes\zune_02.png" />
<Resource Include="Scenes\zune_03.png" />
Expand Down
Binary file added Aerochat/Scenes/Caustics.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Aerochat/Scenes/HappyAccidents.jpeg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
57 changes: 30 additions & 27 deletions Aerochat/Scenes/Scenes.xml
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<package>
<item id="1" mimetype="image/png" contenttype="D" file="default.png" default="true" displayname="Default" color="#3bb2ea" />
<item id="2" mimetype="image/png" contenttype="D" file="MesmerizingWhite.png" default="false" displayname="Mesmerizing White" color="#ffffff" />
<item id="3" mimetype="image/png" contenttype="D" file="0001.png" default="false" displayname="Daisy Hill" color="#96e2f0" />
<item id="4" mimetype="image/png" contenttype="D" file="0007.png" default="false" displayname="Field" color="#fbaf2e" />
<item id="5" mimetype="image/png" contenttype="D" file="Silhouette.png" default="false" displayname="Silhouette" color="#f39b36" />
<item id="6" mimetype="image/png" contenttype="D" file="Morty.png" default="false" displayname="Morty" color="#c6dbdf" />
<item id="7" mimetype="image/png" contenttype="D" file="0006.png" default="false" displayname="Dawn" color="#7ba2d3" />
<item id="8" mimetype="image/png" contenttype="D" file="zune_02.png" default="false" displayname="zune_02" color="#de96b3" />
<item id="9" mimetype="image/png" contenttype="D" file="DottieGreen.png" default="false" displayname="Dottie Green" color="#97d732" />
<item id="10" mimetype="image/png" contenttype="D" file="0004.png" default="false" displayname="Violet Springtime" color="#663c92" />
<item id="11" mimetype="image/png" contenttype="D" file="0003.png" default="false" displayname="Cherry Blossoms" color="#fbdbd9" />
<item id="12" mimetype="image/png" contenttype="D" file="zune_05.png" default="false" displayname="zune_05" color="#252222" />
<item id="13" mimetype="image/png" contenttype="D" file="zune_01.png" default="false" displayname="zune_01" color="#931075" />
<item id="14" mimetype="image/png" contenttype="D" file="0005.png" default="false" displayname="Flourish" color="#d30563" />
<item id="15" mimetype="image/png" contenttype="D" file="CarbonFiber.png" default="false" displayname="Carbon Fiber" color="#010101" />
<item id="16" mimetype="image/png" contenttype="D" file="Robot.png" default="false" displayname="Robot" color="#374c5d" />
<item id="17" mimetype="image/png" contenttype="D" file="Graffiti.png" default="false" displayname="Graffiti" color="#eae7e2" />
<item id="18" mimetype="image/png" contenttype="D" file="0002.png" default="false" displayname="Bamboo" color="#93cb1b" />
<item id="19" mimetype="image/png" contenttype="D" file="zune_06.png" default="false" displayname="zune_06" color="#f4b7cc" />
<item id="20" mimetype="image/png" contenttype="D" file="zune_04.png" default="false" displayname="zune_04" color="#000000" />
<item id="21" mimetype="image/png" contenttype="D" file="0008.png" default="false" displayname="Mesmerizing Brown" color="#614040" />
<item id="22" mimetype="image/png" contenttype="D" file="zune_03.png" default="false" displayname="zune_03" color="#832727" />
<item id="23" mimetype="image/png" contenttype="D" file="ButterflyPattern.png" default="false" displayname="Butterfly Pattern" color="#575757" />
<item id="24" mimetype="image/png" contenttype="D" file="BetaFish.png" default="false" displayname="Beta Fish" color="#24b3ce" />
<item id="25" mimetype="image/png" contenttype="D" file="Halo.png" default="false" displayname="Halo" color="#a13d12" />
<item id="26" mimetype="image/png" contenttype="D" file="Floral.png" default="false" displayname="Floral" color="#f9aed4" />
<item id="27" mimetype="image/png" contenttype="D" file="HelloKitty.png" default="false" displayname="Hello Kitty" color="#f4a1cb" />
<item id="1" credit="Windows Live Messenger Team" mimetype="image/png" contenttype="D" file="default.png" default="true" displayname="Default" color="#3bb2ea" />
<item id="2" credit="Windows Live Messenger Team" mimetype="image/png" contenttype="D" file="MesmerizingWhite.png" default="false" displayname="Mesmerizing White" color="#ffffff" />
<item id="3" credit="Windows Live Messenger Team" mimetype="image/png" contenttype="D" file="0001.png" default="false" displayname="Daisy Hill" color="#96e2f0" />
<item id="4" credit="Windows Live Messenger Team" mimetype="image/png" contenttype="D" file="0007.png" default="false" displayname="Field" color="#fbaf2e" />
<item id="5" credit="Windows Live Messenger Team" mimetype="image/png" contenttype="D" file="Silhouette.png" default="false" displayname="Silhouette" color="#f39b36" />
<item id="6" credit="Windows Live Messenger Team" mimetype="image/png" contenttype="D" file="Morty.png" default="false" displayname="Morty" color="#c6dbdf" />
<item id="7" credit="Windows Live Messenger Team" mimetype="image/png" contenttype="D" file="0006.png" default="false" displayname="Dawn" color="#7ba2d3" />
<item id="8" credit="Windows Live Messenger Team" mimetype="image/png" contenttype="D" file="zune_02.png" default="false" displayname="zune_02" color="#de96b3" />
<item id="9" credit="Windows Live Messenger Team" mimetype="image/png" contenttype="D" file="DottieGreen.png" default="false" displayname="Dottie Green" color="#97d732" />
<item id="10" credit="Windows Live Messenger Team" mimetype="image/png" contenttype="D" file="0004.png" default="false" displayname="Violet Springtime" color="#663c92" />
<item id="11" credit="Windows Live Messenger Team" mimetype="image/png" contenttype="D" file="0003.png" default="false" displayname="Cherry Blossoms" color="#fbdbd9" />
<item id="12" credit="Windows Live Messenger Team" mimetype="image/png" contenttype="D" file="zune_05.png" default="false" displayname="zune_05" color="#252222" />
<item id="13" credit="Windows Live Messenger Team" mimetype="image/png" contenttype="D" file="zune_01.png" default="false" displayname="zune_01" color="#931075" />
<item id="14" credit="Windows Live Messenger Team" mimetype="image/png" contenttype="D" file="0005.png" default="false" displayname="Flourish" color="#d30563" />
<item id="15" credit="Windows Live Messenger Team" mimetype="image/png" contenttype="D" file="CarbonFiber.png" default="false" displayname="Carbon Fiber" color="#010101" />
<item id="16" credit="Windows Live Messenger Team" mimetype="image/png" contenttype="D" file="Robot.png" default="false" displayname="Robot" color="#374c5d" />
<item id="17" credit="Windows Live Messenger Team" mimetype="image/png" contenttype="D" file="Graffiti.png" default="false" displayname="Graffiti" color="#eae7e2" />
<item id="18" credit="Windows Live Messenger Team" mimetype="image/png" contenttype="D" file="0002.png" default="false" displayname="Bamboo" color="#93cb1b" />
<item id="19" credit="Windows Live Messenger Team" mimetype="image/png" contenttype="D" file="zune_06.png" default="false" displayname="zune_06" color="#f4b7cc" />
<item id="20" credit="Windows Live Messenger Team" mimetype="image/png" contenttype="D" file="zune_04.png" default="false" displayname="zune_04" color="#000000" />
<item id="21" credit="Windows Live Messenger Team" mimetype="image/png" contenttype="D" file="0008.png" default="false" displayname="Mesmerizing Brown" color="#614040" />
<item id="22" credit="Windows Live Messenger Team" mimetype="image/png" contenttype="D" file="zune_03.png" default="false" displayname="zune_03" color="#832727" />
<item id="23" credit="Windows Live Messenger Team" mimetype="image/png" contenttype="D" file="ButterflyPattern.png" default="false" displayname="Butterfly Pattern" color="#575757" />
<item id="24" credit="Microsoft" mimetype="image/png" contenttype="D" file="BetaFish.png" default="false" displayname="Beta Fish" color="#24b3ce" />
<item id="25" credit="Microsoft" mimetype="image/png" contenttype="D" file="Halo.png" default="false" displayname="Halo" color="#a13d12" />
<item id="26" credit="maverik" mimetype="image/png" contenttype="D" file="Floral.png" default="false" displayname="Floral" color="#f9aed4" />
<item id="27" credit="maverik" mimetype="image/png" contenttype="D" file="HelloKitty.png" default="false" displayname="Hello Kitty" color="#f4a1cb" />
<item id="28" credit="supra" mimetype="image/jpg" contenttype="D" file="Caustics.jpg" default="false" displayname="Caustics" color="#265080" />
<item id="29" credit="daftendirjerrekt909" mimetype="image/png" contenttype="D" file="XboxGrunge.png" default="false" displayname="Xbox Grunge" color="#829d4e" />
<item id="30" credit="C418/vadimos" mimetype="image/png" contenttype="D" file="VolumeBeta.png" default="false" displayname="Volume Beta" color="#000001" />
</package>
Binary file added Aerochat/Scenes/VolumeBeta.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Aerochat/Scenes/XboxGrunge.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions Aerochat/ViewModels/Scene.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public class SceneViewModel : ViewModelBase
private string _color;
private string _textColor;
private string _shadowColor;
private string _credit;

public int Id
{
Expand Down Expand Up @@ -65,6 +66,12 @@ public string ShadowColor
set => SetProperty(ref _shadowColor, value);
}

public string Credit
{
get => _credit;
set => SetProperty(ref _credit, value);
}

public static SceneViewModel FromScene(XElement scene)
{
string colourStr = scene.Attribute("color").Value;
Expand All @@ -80,6 +87,7 @@ public static SceneViewModel FromScene(XElement scene)
DisplayName = scene.Attribute("displayname").Value,
Color = colourStr,
Default = bool.Parse(scene.Attribute("default").Value),
Credit = scene.Attribute("credit").Value,
TextColor = textBlack ? "#000000" : "#ffffff",
ShadowColor = textBlack ? "#ffffff" : "#000000"
};
Expand Down
37 changes: 37 additions & 0 deletions Aerochat/Windows/About.xaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<Window x:Class="Aerochat.Windows.About"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Aerochat.Windows"
xmlns:controls="clr-namespace:Aerochat.Controls"
mc:Ignorable="d"
Title="About" Height="325" Width="400"
ResizeMode="NoResize">
<controls:BaseTitlebar>
<Grid>
<Grid.Background>
<LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
<LinearGradientBrush.GradientStops>
<GradientStop Offset="0" Color="#f1f6fb" />
<GradientStop Offset="1" Color="#e5eef8" />
</LinearGradientBrush.GradientStops>
</LinearGradientBrush>
</Grid.Background>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<DockPanel Grid.Row="0" Margin="16,10">
<StackPanel DockPanel.Dock="Top">
<TextBlock Foreground="#333" Text="Aerochat - shoddily made in two weeks by a fifteen year old with no idea what they're doing" Margin="0,0,0,16" TextWrapping="Wrap" />
<TextBlock Foreground="#333" Text="I'm not a thief! Credits for all scenes are below. If a scene says 'Unknown Artist' or similar, and you know the artist, please contact me!" Margin="0,0,0,16" TextWrapping="Wrap" />
</StackPanel>
<TextBox VerticalScrollBarVisibility="Auto" TextWrapping="Wrap" DockPanel.Dock="Top" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" x:Name="CreditsTextbox" IsReadOnlyCaretVisible="True" IsReadOnly="True" />
</DockPanel>
<StackPanel Margin="16,10" FlowDirection="RightToLeft" HorizontalAlignment="Right" Grid.Row="1">
<Button Click="Button_Click" MinWidth="72" Height="23" Content="OK" />
</StackPanel>
</Grid>
</controls:BaseTitlebar>
</Window>
39 changes: 39 additions & 0 deletions Aerochat/Windows/About.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
using Aerochat.Theme;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;

namespace Aerochat.Windows
{
public partial class About : Window
{
public About()
{
InitializeComponent();
// get all scenes
var scenes = ThemeService.Instance.Scenes;
string credits = "Aerochat is a project by nullptr. Most assets belong to Microsoft, please don't sue!\n\n";
foreach (var scene in scenes)
{
credits += $"\"{scene.DisplayName}\" was made by {scene.Credit}\n";
}

CreditsTextbox.Text = credits;
}

private void Button_Click(object sender, RoutedEventArgs e)
{
Close();
}
}
}
2 changes: 1 addition & 1 deletion Aerochat/Windows/ChangeScene.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ private async void Border_PreviewMouseDown(object sender, MouseButtonEventArgs e
ThemeService.Instance.Scene = item.Scene;
foreach (var wnd in Application.Current.Windows)
{
if (wnd is Chat chat && !chat.ViewModel.IsDM && chat.ViewModel.Recipient is not null)
if (wnd is Chat chat && (!chat.ViewModel.IsDM || chat.ViewModel.IsGroupChat) && chat.ViewModel.Recipient is not null)
{
chat.ViewModel.Recipient.Scene = item.Scene;
}
Expand Down
2 changes: 2 additions & 0 deletions Aerochat/Windows/Home.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,8 @@
<MenuItem Header="Change display name" />
<Separator />
<MenuItem x:Name="OptionsBtn" Click="OptionsBtn_Click" Header="Options" />
<Separator />
<MenuItem x:Name="CreditsBtn" Click="CreditsBtn_Click" Header="About and Credits" />
</ContextMenu>
</Button.ContextMenu>
</Button>
Expand Down
5 changes: 5 additions & 0 deletions Aerochat/Windows/Home.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -656,5 +656,10 @@ private void SceneTileImage_PreviewMouseLeftButtonUp(object sender, MouseButtonE
{
new ChangeScene().ShowDialog();
}

private void CreditsBtn_Click(object sender, RoutedEventArgs e)
{
new About().ShowDialog();
}
}
}

0 comments on commit 4763013

Please sign in to comment.