Skip to content

Commit

Permalink
feat: new scenes and ads (thx discord community!!)
Browse files Browse the repository at this point in the history
  • Loading branch information
not-nullptr committed Sep 22, 2024
1 parent 12b9e9a commit 1febf7d
Show file tree
Hide file tree
Showing 36 changed files with 396 additions and 98 deletions.
12 changes: 12 additions & 0 deletions Aerochat/Ads/Ads.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,16 @@
<Ad Image="LibreWolf.png" Url="https://librewolf.net/" />
<Ad Image="ZorinOS.png" Url="https://zorin.com/os/" />
<Ad Image="Yume2kki.png" Url="https://yume.wiki/2kki/Yume_2kki_Wiki" />
<Ad Image="LineageOS.png" Url="https://lineageos.org" />
<Ad Image="Aerocat.png" Url="https://www.youtube.com/results?search_query=Cats" />
<Ad Image="TheMostAmazingSite.png" Url="http://www.themostamazingwebsiteontheinternet.com/" />
<Ad Image="MirandaNG.png" Url="https://miranda-ng.org" />
<Ad Image="ErrorOliver.png" Url="https://erroroliver.neocities.org/" />
<Ad Image="VibRibbon.png" Url="https://vibribbon.neocities.org/" />
<Ad Image="GameBanana.png" Url="https://gamebanana.com/" />
<Ad Image="Blabla.png" Url="https://blablaland.co/" />
<Ad Image="OpenJDK.png" Url="https://openjdk.org/" />
<Ad Image="NetRestore.png" Url="https://www.tumblr.com/netrestore/" />
<Ad Image="Cobalt.png" Url="https://cobalt.tools/" />
<Ad Image="Fin.png" Url="https://ftolnks.xyz/" />
</Ads>
Binary file added Aerochat/Ads/Aerocat.png
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/Ads/Blabla.png
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/Ads/Cobalt.png
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/Ads/ErrorOliver.png
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/Ads/Fin.png
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/Ads/GTDB.png
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/Ads/GameBanana.png
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/Ads/LineageOS.png
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/Ads/MirandaNG.png
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/Ads/NetRestore.png
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/Ads/OpenJDK.png
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/Ads/TheMostAmazingSite.png
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/Ads/VibRibbon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file added Aerochat/Ads/x3oj.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 50 additions & 2 deletions Aerochat/Aerochat.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,28 @@

<ItemGroup>
<None Remove="Ads\Ads.xml" />
<None Remove="Ads\Aerocat.png" />
<None Remove="Ads\Blabla.png" />
<None Remove="Ads\Cobalt.png" />
<None Remove="Ads\CursorInvisible.png" />
<None Remove="Ads\ENA.png" />
<None Remove="Ads\ErrorOliver.png" />
<None Remove="Ads\Fin.png" />
<None Remove="Ads\GameBanana.png" />
<None Remove="Ads\GTDB.png" />
<None Remove="Ads\LibreWolf.png" />
<None Remove="Ads\LineageOS.png" />
<None Remove="Ads\MirandaNG.png" />
<None Remove="Ads\NetRestore.png" />
<None Remove="Ads\OpenJDK.png" />
<None Remove="Ads\Photopea.png" />
<None Remove="Ads\PrismLauncher.png" />
<None Remove="Ads\RingRacers.png" />
<None Remove="Ads\SecretCult.png" />
<None Remove="Ads\TheMostAmazingSite.png" />
<None Remove="Ads\VibRibbon.png" />
<None Remove="Ads\WiiLink.png" />
<None Remove="Ads\x3oj.png" />
<None Remove="Ads\Yume2kki.png" />
<None Remove="Ads\ZorinOS.png" />
<None Remove="Resources\bg-1.png" />
Expand Down Expand Up @@ -135,12 +149,12 @@
<None Remove="Resources\Frames\LargeFrameIdleAnimation.png" />
<None Remove="Resources\Frames\LargeFrameOffline.png" />
<None Remove="Resources\Frames\MediumFrameActive.png" />
<None Remove="Resources\Frames\MediumFrameActiveAnimation.png" />
<None Remove="Resources\Frames\MediumFrameDnd.png" />
<None Remove="Resources\Frames\MediumFrameDndAnimation.png" />
<None Remove="Resources\Frames\MediumFrameIdle.png" />
<None Remove="Resources\Frames\MediumFrameIdleAnimation.png" />
<None Remove="Resources\Frames\MediumFrameOffline.png" />
<None Remove="Resources\Frames\MediumFrameOnlineAnimation.png" />
<None Remove="Resources\Frames\PlaceholderPfp.png" />
<None Remove="Resources\Frames\SmallFrameActive.png" />
<None Remove="Resources\Frames\SmallFrameActiveAnimation.png" />
Expand Down Expand Up @@ -290,6 +304,7 @@
<None Remove="Scenes\0006.png" />
<None Remove="Scenes\0007.png" />
<None Remove="Scenes\0008.png" />
<None Remove="Scenes\AeroTrail.png" />
<None Remove="Scenes\Arrowfunk.png" />
<None Remove="Scenes\BetaFish.png" />
<None Remove="Scenes\Bliss.png" />
Expand All @@ -302,11 +317,16 @@
<None Remove="Scenes\default.png" />
<None Remove="Scenes\DottieGreen.png" />
<None Remove="Scenes\Floral.png" />
<None Remove="Scenes\GordonFreeman.png" />
<None Remove="Scenes\Graffiti.jpg" />
<None Remove="Scenes\Graffiti.png" />
<None Remove="Scenes\Halo.png" />
<None Remove="Scenes\HappyAccidents.jpeg" />
<None Remove="Scenes\Harmony.png" />
<None Remove="Scenes\HelloKitty.png" />
<None Remove="Scenes\hexes.png" />
<None Remove="Scenes\HydroTouch.png" />
<None Remove="Scenes\Lighthouse.png" />
<None Remove="Scenes\LiveLights.png" />
<None Remove="Scenes\MajorasMask.png" />
<None Remove="Scenes\MesmerizingWhite.png" />
Expand All @@ -318,9 +338,13 @@
<None Remove="Scenes\RoadToWebTV.png" />
<None Remove="Scenes\Robot.jpg" />
<None Remove="Scenes\Robot.png" />
<None Remove="Scenes\RunningFigure.png" />
<None Remove="Scenes\Silhouette.jpg" />
<None Remove="Scenes\Silhouette.png" />
<None Remove="Scenes\SonicRivals2.png" />
<None Remove="Scenes\TheSwordOfOrion.png" />
<None Remove="Scenes\TropicalLeafs.png" />
<None Remove="Scenes\Vista.png" />
<None Remove="Scenes\VolumeBeta.png" />
<None Remove="Scenes\XboxGreen.png" />
<None Remove="Scenes\XboxGrunge.png" />
Expand Down Expand Up @@ -348,14 +372,28 @@

<ItemGroup>
<EmbeddedResource Include="Ads\Ads.xml" />
<Resource Include="Ads\Aerocat.png" />
<Resource Include="Ads\Blabla.png" />
<Resource Include="Ads\Cobalt.png" />
<Resource Include="Ads\CursorInvisible.png" />
<Resource Include="Ads\ENA.png" />
<Resource Include="Ads\ErrorOliver.png" />
<Resource Include="Ads\Fin.png" />
<Resource Include="Ads\GameBanana.png" />
<Resource Include="Ads\GTDB.png" />
<Resource Include="Ads\LibreWolf.png" />
<Resource Include="Ads\LineageOS.png" />
<Resource Include="Ads\MirandaNG.png" />
<Resource Include="Ads\NetRestore.png" />
<Resource Include="Ads\OpenJDK.png" />
<Resource Include="Ads\Photopea.png" />
<Resource Include="Ads\PrismLauncher.png" />
<Resource Include="Ads\RingRacers.png" />
<Resource Include="Ads\SecretCult.png" />
<Resource Include="Ads\TheMostAmazingSite.png" />
<Resource Include="Ads\VibRibbon.png" />
<Resource Include="Ads\WiiLink.png" />
<Resource Include="Ads\x3oj.png" />
<Resource Include="Ads\Yume2kki.png" />
<Resource Include="Ads\ZorinOS.png" />
<Resource Include="Resources\Emoji\Angel.png" />
Expand Down Expand Up @@ -443,7 +481,7 @@
<Resource Include="Resources\Frames\LargeFrameIdleAnimation.png" />
<Resource Include="Resources\Frames\MediumFrameDndAnimation.png" />
<Resource Include="Resources\Frames\MediumFrameIdleAnimation.png" />
<Resource Include="Resources\Frames\MediumFrameOnlineAnimation.png" />
<Resource Include="Resources\Frames\MediumFrameActiveAnimation.png" />
<Resource Include="Resources\Frames\SmallFrameActiveAnimation.png" />
<Resource Include="Resources\Frames\XLFrameActiveAnimation.png" />
<Resource Include="Resources\Frames\XLFrameDndAnimation.png" />
Expand Down Expand Up @@ -634,6 +672,12 @@
<Resource Include="Scenes\0006.png" />
<Resource Include="Scenes\0007.png" />
<Resource Include="Scenes\0008.png" />
<Resource Include="Scenes\AeroTrail.png" />
<Resource Include="Scenes\GordonFreeman.png" />
<Resource Include="Scenes\HappyAccidents.jpeg" />
<Resource Include="Scenes\hexes.png" />
<Resource Include="Scenes\HydroTouch.png" />
<Resource Include="Scenes\Lighthouse.png" />
<Resource Include="Scenes\Nineties.png" />
<Resource Include="Scenes\Arrowfunk.png" />
<Resource Include="Scenes\BetaFish.png" />
Expand All @@ -657,9 +701,13 @@
<Resource Include="Scenes\PurpleRain.png" />
<Resource Include="Scenes\RoadToWebTV.png" />
<Resource Include="Scenes\Robot.png" />
<Resource Include="Scenes\RunningFigure.png" />
<Resource Include="Scenes\Silhouette.png" />
<Resource Include="Scenes\default.png" />
<Resource Include="Scenes\SonicRivals2.png" />
<Resource Include="Scenes\TheSwordOfOrion.png" />
<Resource Include="Scenes\TropicalLeafs.png" />
<Resource Include="Scenes\Vista.png" />
<Resource Include="Scenes\VolumeBeta.png" />
<Resource Include="Scenes\XboxGreen.png" />
<Resource Include="Scenes\XboxGrunge.png" />
Expand Down
2 changes: 1 addition & 1 deletion Aerochat/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@

static class AssemblyInfo
{
public const string Version = "0.0.0.4";
public const string Version = "0.0.0.5";
}
17 changes: 16 additions & 1 deletion Aerochat/Controls/AnimatedTileImage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ namespace Aerochat.Controls
/// </summary>
public partial class AnimatedTileImage : UserControl
{
private bool _paused = false;
public AnimatedTileImage()
{
InitializeComponent();
Expand Down Expand Up @@ -150,7 +151,7 @@ private void UpdateFrameRenderProperties()

private void Timer_Elapsed(object sender, ElapsedEventArgs e)
{
if (Application.Current == null) return;
if (Application.Current == null || _paused) return;
if (_frameCount > 0)
{
Application.Current.Dispatcher.Invoke(() =>
Expand All @@ -172,6 +173,20 @@ private void Timer_Elapsed(object sender, ElapsedEventArgs e)
public void Reset()
{
CurrentFrame = 0;
_timer.Start();
_paused = false;
}

public void Pause()
{
_timer.Stop();
_paused = true;
}

public void Play()
{
_timer.Start();
_paused = false;
}

protected override Size MeasureOverride(Size constraint)
Expand Down
13 changes: 13 additions & 0 deletions Aerochat/Controls/ProfilePictureFrame.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<UserControl x:Class="Aerochat.Controls.ProfilePictureFrame"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Aerochat.Controls"
mc:Ignorable="d" d:DesignWidth="139" d:DesignHeight="139">
<Grid>
<Image Width="24" Height="24" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="11,10,0,0" x:Name="ProfilePictureControl" />
<local:AnimatedTileImage HorizontalAlignment="Left" VerticalAlignment="Top" Loop="False" x:Name="ForegroundTileImage" FrameDuration="50" FrameWidth="139" FrameHeight="139" />
<local:AnimatedTileImage HorizontalAlignment="Left" VerticalAlignment="Top" Loop="False" x:Name="BackgroundTileImage" FrameDuration="50" FrameWidth="139" FrameHeight="139" />
</Grid>
</UserControl>
Loading

0 comments on commit 1febf7d

Please sign in to comment.