First release build

AlexanderDotH · Apr 28, 2023 · 4c2dfbc · 4c2dfbc
1 parent dc70e0e
commit 4c2dfbc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 29 deletions.
diff --git a/OpenLyricsClient/Frontend/Models/Pages/LyricsPageViewModel.cs b/OpenLyricsClient/Frontend/Models/Pages/LyricsPageViewModel.cs
@@ -32,16 +32,6 @@ public class LyricsPageViewModel : INotifyPropertyChanged
 
     private TaskSuspensionToken _songInfoSuspensionToken;
 
-    private string _currentSongName;
-    private string _currentArtists;
-    private string _currentAlbumName;
-    private double _currentPercentage;
-    private long _time;
-    private string _currentTime;
-    private string _currentMaxTime;
-
-    private string _artwork;
-
     public ReactiveCommand<Unit, Unit> UpdatePlaybackCommand { get; }
     public ReactiveCommand<Unit, Unit> PreviousSongCommand { get; }
     public ReactiveCommand<Unit, Unit> NextSongCommand { get; }
@@ -57,15 +47,6 @@ public LyricsPageViewModel()
         Core.INSTANCE.ArtworkHandler.ArtworkAppliedHandler += ArtworkHandlerOnArtworkAppliedHandler;
         Core.INSTANCE.LyricHandler.LyricsFound += LyricHandlerOnLyricsFound;
         Core.INSTANCE.SongHandler.SongUpdated += SongHandlerOnSongUpdated;
-
-        this._currentSongName = string.Empty;
-        this._currentArtists = string.Empty;
-        this._currentAlbumName = string.Empty;
-        this._currentPercentage = 0;
-        this._currentTime = string.Empty;
-        this._currentMaxTime = string.Empty;
-
-        this._time = 0;
     }
 
     private void SongHandlerOnSongUpdated(object sender)
@@ -76,6 +57,7 @@ private void SongHandlerOnSongUpdated(object sender)
         OnPropertyChanged("IsSongPlaying");
         OnPropertyChanged("CurrentTime");
         OnPropertyChanged("Percentage");
+        OnPropertyChanged("CurrentTime");
         OnPropertyChanged("CurrentMaxTime");
         OnPropertyChanged("IsPlayerAvailable");
         OnPropertyChanged("IsSongAvailable");
@@ -140,8 +122,6 @@ private void SongHandlerOnSongChanged(object sender, SongChangedEventArgs songch
         OnPropertyChanged("SongName");
         OnPropertyChanged("Artists");
         OnPropertyChanged("Album");
-
-        this._time = 0;
     }
 
     public string? SongName
@@ -212,12 +192,7 @@ public double Percentage
 
     public string CurrentTime
     {
-        get => this._currentTime;
-        set
-        {
-            this._currentTime = value;
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("CurrentTime"));
-        }
+        get => Core.INSTANCE.SongHandler?.CurrentSong?.ProgressString!;
     }
 
     public string CurrentMaxTime

diff --git a/OpenLyricsClient/OpenLyricsClient.csproj b/OpenLyricsClient/OpenLyricsClient.csproj
@@ -7,8 +7,8 @@
     <TrimMode>copyused</TrimMode>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <ApplicationIcon>Assets\app-logo.ico</ApplicationIcon>
-    <AssemblyVersion>1.0.1</AssemblyVersion>
-    <FileVersion>1.0.1</FileVersion>
+    <AssemblyVersion>1.1.2</AssemblyVersion>
+    <FileVersion>1.1.2</FileVersion>
   </PropertyGroup>
   <ItemGroup>
     <AvaloniaResource Include="Assets\**" />