Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Audibly.App/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Author: rstewa · https://github.com/rstewa
// Author: rstewa · https://github.com/rstewa
// Updated: 07/30/2025

using System;
Expand Down
10 changes: 5 additions & 5 deletions Audibly.App/Audibly.App.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
Expand Down Expand Up @@ -26,7 +26,7 @@
</PropertyGroup>

<!-- We recommend only using these features for release builds. -->
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
<PropertyGroup Condition="'$(Configuration)' == 'Release' and '$(SENTRY_AUTH_TOKEN)' != ''">
Comment thread
KeinNiemand marked this conversation as resolved.
<!-- Configure Sentry org and project -->
<SentryOrg>audibly</SentryOrg>
<SentryProject>audibly</SentryProject>
Expand Down Expand Up @@ -106,9 +106,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AutoMapper" Version="14.0.0"/>
<PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" Version="0.1.250206-build.2040" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.MarqueeText" Version="0.1.250206-build.2040" />
<PackageReference Include="AutoMapper" Version="14.0.0" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" Version="0.1.251217-build.2433" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.Marquee" Version="0.1.251217-build.2433" />
Comment thread
KeinNiemand marked this conversation as resolved.
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.250402" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.TokenizingTextBox" Version="8.2.250402" />
Expand Down
26 changes: 6 additions & 20 deletions Audibly.App/UserControls/TitleArtistStack.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
x:Class="Audibly.App.UserControls.TitleArtistStack"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:labs="using:CommunityToolkit.Labs.WinUI.MarqueeTextRns"
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">

Expand All @@ -17,14 +17,16 @@
x:Name="TitleArtistStackPanel">

<!-- Title -->
<labs:MarqueeText
<controls:Marquee
AutoPlay="True"
Behavior="Looping"
Direction="Left"
FontSize="{x:Bind TitleFontSize, Mode=OneWay}"
FontWeight="SemiBold"
MaxWidth="{x:Bind TitleMaxWidth, Mode=OneWay}"
RepeatBehavior="Forever"
Speed="15"
Text="{x:Bind PlayerViewModel.NowPlaying.Title, Mode=OneWay}"
Content="{x:Bind PlayerViewModel.NowPlaying.Title, Mode=OneWay}"
x:Name="TitleMarqueeText" />

<!-- Artist -->
Expand All @@ -51,21 +53,5 @@
Visibility="{x:Bind ShowChapterTitle, Mode=OneWay}"
x:Name="CurrentChapterTitleTextBlock" />

<!-- <labs:MarqueeText -->
<!-- x:Name="CurrentChapterTitleMarqueeText" -->
<!-- MaxWidth="{x:Bind TitleMaxWidth, Mode=OneWay}" -->
<!-- Margin="0,4,0,0" -->
<!-- VerticalAlignment="Bottom" -->
<!-- Behavior="Looping" -->
<!-- Direction="Left" -->
<!-- FontSize="{x:Bind ArtistFontSize, Mode=OneWay}" -->
<!-- FontStyle="Italic" -->
<!-- Foreground="{ThemeResource TextFillColorTertiaryBrush}" -->
<!-- PointerEntered="CurrentChapterTitleTextBlock_OnPointerEntered" -->
<!-- PointerExited="CurrentChapterTitleMarqueeText_OnPointerExited" -->
<!-- Speed="15" -->
<!-- Text="{x:Bind PlayerViewModel.NowPlaying.CurrentChapterTitle, Mode=OneWay}" -->
<!-- ToolTipService.ToolTip="{x:Bind PlayerViewModel.NowPlaying.CurrentChapterTitle, Mode=OneWay}" -->
<!-- Visibility="{x:Bind ShowChapterTitle, Mode=OneWay}" /> -->
</StackPanel>
</UserControl>
</UserControl>
33 changes: 0 additions & 33 deletions Audibly.App/UserControls/TitleArtistStack.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
// Author: rstewa · https://github.com/rstewa
// Updated: 08/02/2025

using System;
using System.Threading.Tasks;
using Audibly.App.ViewModels;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Input;

namespace Audibly.App.UserControls;

Expand All @@ -28,15 +24,9 @@ public sealed partial class TitleArtistStack : UserControl
public static readonly DependencyProperty ShowChapterTitleProperty = DependencyProperty.Register(
nameof(ShowChapterTitle), typeof(bool), typeof(TitleArtistStack), new PropertyMetadata(false));

private readonly DispatcherQueue _dispatcherQueue = DispatcherQueue.GetForCurrentThread();

private bool _isPointerOver;

public TitleArtistStack()
{
InitializeComponent();
TitleMarqueeText.MarqueeCompleted += TitleMarqueeText_MarqueeCompleted;
// CurrentChapterTitleMarqueeText.MarqueeCompleted += CurrentChapterTitleMarqueeText_MarqueeCompleted;
}

/// <summary>
Expand Down Expand Up @@ -74,27 +64,4 @@ public bool ShowChapterTitle
set => SetValue(ShowChapterTitleProperty, value);
}

private async void TitleMarqueeText_MarqueeCompleted(object? sender, EventArgs e)
{
_dispatcherQueue.TryEnqueue(() => TitleMarqueeText.StopMarquee());
await Task.Delay(TimeSpan.FromSeconds(5)); // wait for 3 seconds
_dispatcherQueue.TryEnqueue(() => TitleMarqueeText.StartMarquee());
}

// private void CurrentChapterTitleMarqueeText_MarqueeCompleted(object? sender, EventArgs e)
// {
// if (!_isPointerOver) _dispatcherQueue.TryEnqueue(() => CurrentChapterTitleMarqueeText.StopMarquee());
// }
//
// private void CurrentChapterTitleTextBlock_OnPointerEntered(object sender, PointerRoutedEventArgs e)
// {
// _dispatcherQueue.TryEnqueue(() => CurrentChapterTitleMarqueeText.StartMarquee());
// _isPointerOver = true;
// }

private void CurrentChapterTitleMarqueeText_OnPointerExited(object sender, PointerRoutedEventArgs e)
{
_isPointerOver = false;
// _dispatcherQueue.TryEnqueue(() => CurrentChapterTitleMarqueeText.StopMarquee());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:Audibly.App.Views.ContentDialogs"
xmlns:markdownTextBlock="using:CommunityToolkit.Labs.WinUI.MarkdownTextBlock"
xmlns:markdownTextBlock="using:CommunityToolkit.WinUI.Controls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- ReSharper disable all Xaml.RedundantResource -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using CommunityToolkit.Labs.WinUI.MarkdownTextBlock;
using CommunityToolkit.WinUI.Controls;
using Microsoft.UI.Xaml.Controls;

namespace Audibly.App.Views.ContentDialogs;
Expand Down
2 changes: 1 addition & 1 deletion Audibly.App/Views/ControlPages/ChangelogDialogContent.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
x:Class="Audibly.App.Views.ControlPages.ChangelogDialogContent"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:markdownTextBlock="using:CommunityToolkit.Labs.WinUI.MarkdownTextBlock"
xmlns:markdownTextBlock="using:CommunityToolkit.WinUI.Controls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// Updated: 6/1/2024

using Audibly.App.Helpers;
using CommunityToolkit.Labs.WinUI.MarkdownTextBlock;
using CommunityToolkit.WinUI.Controls;
using Microsoft.UI.Xaml.Controls;

namespace Audibly.App.Views.ControlPages;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Audibly.App.Helpers;
using CommunityToolkit.Labs.WinUI.MarkdownTextBlock;
using CommunityToolkit.WinUI.Controls;
using Microsoft.UI.Xaml.Controls;

namespace Audibly.App.Views.ControlPages;
Expand Down