From 1e0f0e769676cc14e158436fa25e90e65b546d32 Mon Sep 17 00:00:00 2001
From: Tim W <tim@weiss.moe>
Date: Sat, 24 Jun 2017 20:42:33 +0200
Subject: [PATCH] Added volume bar, configuration and small fixes

---
 LunaticPlayer/Client/Configuration.cs         |  84 ++++++++++++++++++
 LunaticPlayer/Controls/VolumeBar.xaml         |  14 +++
 LunaticPlayer/Controls/VolumeBar.xaml.cs      |  45 ++++++++++
 LunaticPlayer/LunaticPlayer.csproj            |  15 +++-
 LunaticPlayer/Player/RadioPlayer.cs           |  16 +++-
 LunaticPlayer/PlayerInterface.xaml            |  22 +++--
 LunaticPlayer/PlayerInterface.xaml.cs         |  48 +++++++++-
 LunaticPlayer/Resources/mute_92.png           | Bin 4055 -> 1058 bytes
 LunaticPlayer/Resources/voloff_92.png         | Bin 0 -> 4055 bytes
 .../{unmute_92.png => volume_92.png}          | Bin
 LunaticPlayer/SongHistoryWindow.xaml          |   4 +-
 LunaticPlayer/SongHistoryWindow.xaml.cs       |   7 +-
 12 files changed, 239 insertions(+), 16 deletions(-)
 create mode 100644 LunaticPlayer/Client/Configuration.cs
 create mode 100644 LunaticPlayer/Controls/VolumeBar.xaml
 create mode 100644 LunaticPlayer/Controls/VolumeBar.xaml.cs
 create mode 100644 LunaticPlayer/Resources/voloff_92.png
 rename LunaticPlayer/Resources/{unmute_92.png => volume_92.png} (100%)

diff --git a/LunaticPlayer/Client/Configuration.cs b/LunaticPlayer/Client/Configuration.cs
new file mode 100644
index 0000000..56044c7
--- /dev/null
+++ b/LunaticPlayer/Client/Configuration.cs
@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
+namespace LunaticPlayer.Client
+{
+    class ConfigurationData
+    {
+        public double Volume { get; set; }
+    }
+
+    class Configuration
+    {
+        private const string Filename = "config.json";
+
+        private static Configuration _instance;
+
+        public ConfigurationData Data { get; set; }
+
+        /// <summary>
+        /// The source of configuration data (Filesystem, Default Object, ...).
+        /// </summary>
+        public string Source { get; set; }
+
+        public static Configuration GetInstance()
+        {
+            if (_instance == null)
+            {
+                _instance = new Configuration();
+                _instance.Initialize();
+            }
+
+            return _instance;
+        }
+
+        /// <summary>
+        /// Loads the configuration and stores it to the filesystem if necessary.
+        /// </summary>
+        private void Initialize()
+        {
+
+            if (File.Exists(Filename))
+            {
+                Data = JsonConvert.DeserializeObject<ConfigurationData>(File.ReadAllText(Filename));
+                Source = "Filesystem";
+            }
+            else
+            {
+                Source = "DefaultDataObject";
+
+                SetupData();
+
+                // Erstellt eine Konfigurationsdatei für das nächste Mal.
+                Save();
+            }
+        }
+
+        /// <summary>
+        /// Creates a <seealso cref="ConfigurationData"/> object with default values.
+        /// </summary>
+        private void SetupData()
+        {
+            var data = new ConfigurationData()
+            {
+                Volume = 0.4
+            };
+
+            Data = data;
+        }
+
+        /// <summary>
+        /// Saves the current configuration to the file specified at <see cref="Filename"/>.
+        /// </summary>
+        public void Save()
+        {
+            Console.WriteLine("Saving configuration to filesystem.");
+            File.WriteAllText(Filename, JsonConvert.SerializeObject(Data));
+        }
+    }
+}
diff --git a/LunaticPlayer/Controls/VolumeBar.xaml b/LunaticPlayer/Controls/VolumeBar.xaml
new file mode 100644
index 0000000..1deceb8
--- /dev/null
+++ b/LunaticPlayer/Controls/VolumeBar.xaml
@@ -0,0 +1,14 @@
+<UserControl x:Class="LunaticPlayer.Controls.VolumeBar"
+             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:LunaticPlayer.Controls"
+             mc:Ignorable="d" 
+             d:DesignHeight="50" d:DesignWidth="100">
+    <Grid Background="Transparent">
+        <Border Padding="5,15">
+            <Slider Name="VolumeSlider" Orientation="Horizontal" Maximum="1" Value="{Binding Volume}" ValueChanged="VolumeSlider_ValueChanged"/>
+        </Border>
+    </Grid>
+</UserControl>
diff --git a/LunaticPlayer/Controls/VolumeBar.xaml.cs b/LunaticPlayer/Controls/VolumeBar.xaml.cs
new file mode 100644
index 0000000..4d1ccbe
--- /dev/null
+++ b/LunaticPlayer/Controls/VolumeBar.xaml.cs
@@ -0,0 +1,45 @@
+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.Navigation;
+using System.Windows.Shapes;
+
+namespace LunaticPlayer.Controls
+{
+    public class VolumeBarData
+    {
+        public double Volume { get; set; }
+    }
+
+    /// <summary>
+    /// Interaktionslogik für VolumeBar.xaml
+    /// </summary>
+    public partial class VolumeBar : UserControl
+    {
+        public VolumeBarData Data { get; set; }
+        public Action OnValueChange { get; set; }
+
+        public VolumeBar(VolumeBarData data)
+        {
+            InitializeComponent();
+
+            DataContext = Data = data;
+        }
+
+        private void VolumeSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+        {
+            Data.Volume = VolumeSlider.Value;
+
+            OnValueChange?.Invoke();
+        }
+    }
+}
diff --git a/LunaticPlayer/LunaticPlayer.csproj b/LunaticPlayer/LunaticPlayer.csproj
index 5fe0baf..2041010 100644
--- a/LunaticPlayer/LunaticPlayer.csproj
+++ b/LunaticPlayer/LunaticPlayer.csproj
@@ -66,6 +66,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="Client\Configuration.cs" />
+    <Compile Include="Controls\VolumeBar.xaml.cs">
+      <DependentUpon>VolumeBar.xaml</DependentUpon>
+    </Compile>
     <Compile Include="PopupBanner.xaml.cs">
       <DependentUpon>PopupBanner.xaml</DependentUpon>
     </Compile>
@@ -81,6 +85,10 @@
     <Compile Include="Windows\DialogWindow.xaml.cs">
       <DependentUpon>DialogWindow.xaml</DependentUpon>
     </Compile>
+    <Page Include="Controls\VolumeBar.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="PlayerInterface.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -163,8 +171,8 @@
     <Resource Include="Resources\unmute_mat.ico" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Resources\mute_92.png" />
-    <Resource Include="Resources\unmute_92.png" />
+    <Resource Include="Resources\voloff_92.png" />
+    <Resource Include="Resources\volume_92.png" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\list_92.png" />
@@ -200,6 +208,9 @@
   <ItemGroup>
     <Resource Include="Resources\help_white_92.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\mute_92.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\System.Data.SQLite.Core.1.0.105.0\build\net451\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.105.0\build\net451\System.Data.SQLite.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/LunaticPlayer/Player/RadioPlayer.cs b/LunaticPlayer/Player/RadioPlayer.cs
index 8d6e94f..675d4e3 100644
--- a/LunaticPlayer/Player/RadioPlayer.cs
+++ b/LunaticPlayer/Player/RadioPlayer.cs
@@ -7,7 +7,7 @@ class RadioPlayer
     {
         private readonly MediaPlayer _player;
 
-        public bool Muted => _player.Volume == 0.0;
+        public bool Muted { get; set; }
 
         public double Volume => _player.Volume;
 
@@ -39,5 +39,19 @@ public void ToggleMute()
         {
             _player.Volume = _player.Volume == 0.0 ? 0.5 : 0.0;
         }
+
+        public void ToggleMute(double volume)
+        {
+            if (Muted)
+            {
+                _player.Volume = volume;
+                Muted = false;
+            }
+            else
+            {
+                _player.Volume = 0.0;
+                Muted = true;
+            }
+        }
     }
 }
diff --git a/LunaticPlayer/PlayerInterface.xaml b/LunaticPlayer/PlayerInterface.xaml
index b1c64fe..f569519 100644
--- a/LunaticPlayer/PlayerInterface.xaml
+++ b/LunaticPlayer/PlayerInterface.xaml
@@ -4,6 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:LunaticPlayer"
+        xmlns:controls="clr-namespace:LunaticPlayer.Controls"
         mc:Ignorable="d"
         Title="Lunatic Player" Height="245" Width="375" Closed="Window_Closed" Loaded="Window_Loaded">
     
@@ -79,20 +80,27 @@
                 </Border>
             </DockPanel>
         </Grid>
-        
+
         <Grid Height="45" VerticalAlignment="Bottom" Background="#FF767676">
             <Grid.Effect>
                 <DropShadowEffect Direction="90" Opacity="0.2" ShadowDepth="4"/>
             </Grid.Effect>
-            <StackPanel Orientation="Horizontal" Height="45" VerticalAlignment="Bottom" Margin="0,0,50,0">
-                <Border Padding="5" Height="45" Width="45" HorizontalAlignment="Left">
+            <StackPanel Name="ButtonToolbar" Orientation="Horizontal" Height="45" VerticalAlignment="Bottom" Margin="0,0,50,0">
+                <Border ToolTip="Change Volume" Padding="5" Height="45" Width="45" HorizontalAlignment="Left">
+                    <Button Style="{StaticResource TransparentImageButton}" Name="VolumeMeterButton" Click="VolumeButton_OnClick" >
+                        <Button.Background>
+                            <ImageBrush ImageSource="Resources/volume_92.png"/>
+                        </Button.Background>
+                    </Button>
+                </Border>
+                <Border ToolTip="Mute" Padding="5" Height="45" Width="45" HorizontalAlignment="Left">
                     <Button Style="{StaticResource TransparentImageButton}" Name="MuteButton" Click="MuteButton_Click">
                         <Button.Background>
-                            <ImageBrush ImageSource="Resources/mute_92.png"/>
+                            <ImageBrush ImageSource="Resources/voloff_92.png"/>
                         </Button.Background>
                     </Button>
                 </Border>
-                <Border Padding="5" Height="45" Width="45" HorizontalAlignment="Left">
+                <Border ToolTip="Show History" Padding="5" Height="45" Width="45" HorizontalAlignment="Left">
                     <Button Style="{StaticResource TransparentImageButton}" Name="SongListButton" Click="SongListButton_OnClick" >
                         <Button.Background>
                             <ImageBrush ImageSource="Resources/list_92.png"/>
@@ -100,8 +108,8 @@
                     </Button>
                 </Border>
             </StackPanel>
-            
-            <Border Padding="5" Height="45" Width="45" HorizontalAlignment="Right">
+
+            <Border ToolTip="Settings" Padding="5" Height="45" Width="45" HorizontalAlignment="Right">
                 <Button Style="{StaticResource TransparentImageButton}" Name="OptionsButton" Click="OptionsButton_OnClick" >
                     <Button.Background>
                         <ImageBrush ImageSource="Resources/settings_92.png"/>
diff --git a/LunaticPlayer/PlayerInterface.xaml.cs b/LunaticPlayer/PlayerInterface.xaml.cs
index 83cf09d..83a8039 100644
--- a/LunaticPlayer/PlayerInterface.xaml.cs
+++ b/LunaticPlayer/PlayerInterface.xaml.cs
@@ -10,6 +10,8 @@
 using System.Windows.Media.Animation;
 using System.Windows.Media.Effects;
 using LunaticPlayer.Classes;
+using LunaticPlayer.Client;
+using LunaticPlayer.Controls;
 
 namespace LunaticPlayer
 {
@@ -40,6 +42,7 @@ public MainWindow()
             _interfaceTimer.Interval = 1000;
             _interfaceTimer.Elapsed += ReloadInterface;
 
+            _radioPlayer.SetVolume(Configuration.GetInstance().Data.Volume);
 
             LanguageProperty.OverrideMetadata(typeof(FrameworkElement),
                 new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag)));
@@ -134,6 +137,7 @@ private void PlayButtonClicked()
             else
             {
                 _radioPlayer.PlayFromUrl(ApiClient.StreamUrl);
+                _radioPlayer.SetVolume(Configuration.GetInstance().Data.Volume);
                 _isPlaying = true;
                 TBPlayButton.Description = "Stop";
 
@@ -153,7 +157,7 @@ private void PlayButtonClicked()
         /// </summary>
         private void MuteRadioStream()
         {
-            _radioPlayer.ToggleMute();
+            _radioPlayer.ToggleMute(Configuration.GetInstance().Data.Volume);
 
             if (_radioPlayer.Muted)
             {
@@ -161,7 +165,7 @@ private void MuteRadioStream()
                 var packUri = "pack://application:,,,/LunaticPlayer;component/Resources/unmute_mat.ico";
                 TBMuteButton.ImageSource = new ImageSourceConverter().ConvertFromString(packUri) as ImageSource;
 
-                var appUri = new Uri("pack://application:,,,/LunaticPlayer;component/Resources/unmute_92.png");
+                var appUri = new Uri("pack://application:,,,/LunaticPlayer;component/Resources/mute_92.png");
                 MuteButton.Background = new ImageBrush(new BitmapImage(appUri));
             }
             else
@@ -170,11 +174,13 @@ private void MuteRadioStream()
                 var packUri = "pack://application:,,,/LunaticPlayer;component/Resources/mute_92.png";
                 TBMuteButton.ImageSource = new ImageSourceConverter().ConvertFromString(packUri) as ImageSource;
 
-                var appUri = new Uri("pack://application:,,,/LunaticPlayer;component/Resources/mute_92.png");
+                var appUri = new Uri("pack://application:,,,/LunaticPlayer;component/Resources/voloff_92.png");
                 MuteButton.Background = new ImageBrush(new BitmapImage(appUri));
             }
         }
 
+        private VolumeBar volumeBar;
+
         #region Button Events
 
         private void Button_Click(object sender, RoutedEventArgs e)
@@ -215,6 +221,35 @@ private void SongListButton_OnClick(object sender, RoutedEventArgs e)
             sWindow.Show();
         }
 
+        private void VolumeButton_OnClick(object sender, RoutedEventArgs e)
+        {
+            if (volumeBar == null)
+            {
+                var vol = Configuration.GetInstance().Data.Volume;
+                volumeBar = new VolumeBar(new VolumeBarData() { Volume = vol });
+                volumeBar.Height = 50;
+                volumeBar.Width = 100;
+                volumeBar.OnValueChange = OnVolumeChange;
+            }
+
+            if (this.ButtonToolbar.Children.Contains(volumeBar))
+            {
+                if (volumeBar.Visibility == Visibility.Visible)
+                {
+                    volumeBar.Visibility = Visibility.Collapsed;
+                }
+                else
+                {
+                    volumeBar.Visibility = Visibility.Visible;
+                }
+
+            }
+            else
+            {
+                this.ButtonToolbar.Children.Insert(1, volumeBar);
+            }
+        }
+
         #endregion
 
         /// <summary>
@@ -224,6 +259,7 @@ private void SongListButton_OnClick(object sender, RoutedEventArgs e)
         /// <param name="e"></param>
         private void Window_Closed(object sender, EventArgs e)
         {
+            Configuration.GetInstance().Save();
             _radioPlayer.Stop();
             Application.Current.Shutdown();
         }
@@ -297,5 +333,11 @@ private void RunFadeInAnimation()
             Storyboard.SetTarget(sb, this.PlayerContent);
             sb.Begin();
         }
+
+        private void OnVolumeChange()
+        {
+            _radioPlayer.SetVolume(volumeBar.Data.Volume);
+            Configuration.GetInstance().Data.Volume = Math.Round(volumeBar.Data.Volume, 2);
+        }
     }
 }
diff --git a/LunaticPlayer/Resources/mute_92.png b/LunaticPlayer/Resources/mute_92.png
index 2fd3f7a886f31337187f64ad3016e73cff98377c..f29af8c116a9af43511840ab6c597d0a62e2c1a5 100644
GIT binary patch
delta 693
zcmcaEzldW)6=OZqBu^K|kcv5P?;gyO3KVJocs@z~fI~rG%oVNP=bT(+lY>66?kZha
zaye9fp}%76t}m)i-r;Ajot-dgQmN)6Zj)}k5G%pl+>*ZHynpg6YLidSJ>8!;;Y<Ou
zm*&zbL0}^5x|S>7y_Y3jGIiOJ({lgLoH>{2{3e~<F>hCg)N`foxU9V0Sk}_m+I+M2
z1N9GA&(zJl8U4P}hNHmPn%$1^eDUtp2i)K94B6|y!@GXB>Ysee90or>zYG&8pXI>~
zt7h(H(A)m^-$L(ST=!dS<@z(tX8$~V&gS_PogZdz%68WtiB#o^3(N5k*mLH_1c{29
z8x<8laNL-{Q6ZA!!C+G_WX8hY-^SZ`P&vst;KPa=0s=NhW-QG8eY}kaf)BJQJXo2~
z{Qmyo`waT!mKV-kE8iQR>vD`u{)1e%y0-s!Sq&?*A9sRU=B|FB{fE>0P1W9W1r~e0
zJKW7H|Lf^{qKnNwHup-F>94<a2bXKtE7~nxGUdQr;T^?H<$e#&ao(|PthZJ#c+T=}
z4yq`Ipy=N#|Bh!Ro6R<q>V0P$u>Shut68!sLC4Q9|FOPsOT5Ntrpia93CDGx%5s0%
zJL~*&9yaE6>(}!eEPed+W8Op73v6+lAD^Bh{fnXgf^z)JdHLt#boT$d`72APKJ8oU
z)7PgiUUaVUI=ShM@rSIhwNGw)a};>6+wxc}X_VuVd9=8lx&6iq#e<4^RS^XpopMq#
zj~2GGw@1A2Y;czOl5#+itt#k2K;4%o2NvFW;o0O|d2upp``Z`h=H@>Sud{jnML{el
zKK`Hb_1tNx{aX`$H=d4tdB13Pex%L6;<dU{Ubl;16#AQUdA~{kBFQ{`W3HQO^TD!q
R?<58w@O1TaS?83{1ORcfO#=V`

delta 3713
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

diff --git a/LunaticPlayer/Resources/voloff_92.png b/LunaticPlayer/Resources/voloff_92.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fd3f7a886f31337187f64ad3016e73cff98377c
GIT binary patch
literal 4055
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

literal 0
HcmV?d00001

diff --git a/LunaticPlayer/Resources/unmute_92.png b/LunaticPlayer/Resources/volume_92.png
similarity index 100%
rename from LunaticPlayer/Resources/unmute_92.png
rename to LunaticPlayer/Resources/volume_92.png
diff --git a/LunaticPlayer/SongHistoryWindow.xaml b/LunaticPlayer/SongHistoryWindow.xaml
index b38aaf6..f732c04 100644
--- a/LunaticPlayer/SongHistoryWindow.xaml
+++ b/LunaticPlayer/SongHistoryWindow.xaml
@@ -35,7 +35,7 @@
         <DockPanel>
             <DockPanel Height="60" Background="#FF5F5F5F" Dock="Top">
                 <Border Padding="12">
-                    <Button Click="HelpButton_OnClick" ToolTip="Help" Style="{StaticResource TransparentImageButton}" Width="36" HorizontalAlignment="Left" BorderBrush="{x:Null}" Background="WhiteSmoke" RenderOptions.BitmapScalingMode="Fant">
+                    <Button Click="HelpButton_OnClick" ToolTip="Search Help" Style="{StaticResource TransparentImageButton}" Width="36" HorizontalAlignment="Left" BorderBrush="{x:Null}" Background="WhiteSmoke" RenderOptions.BitmapScalingMode="Fant">
                         <Button.OpacityMask>
                             <ImageBrush ImageSource="Resources/help_black_92.png"/>
                         </Button.OpacityMask>
@@ -48,7 +48,7 @@
                 </Border>
             </DockPanel>
 
-            <ListBox x:Name="SongList" Background="{x:Null}" Margin="2" BorderBrush="{x:Null}">
+            <ListBox x:Name="SongList" Background="{x:Null}" Margin="2" BorderBrush="{x:Null}" MouseDoubleClick="SongList_OnMouseDoubleClick">
                 <ListBox.ContextMenu>
                     <ContextMenu>
                         <MenuItem Header="Show details" Click="ShowDetails_OnClick"/>
diff --git a/LunaticPlayer/SongHistoryWindow.xaml.cs b/LunaticPlayer/SongHistoryWindow.xaml.cs
index a09d7ec..b93320d 100644
--- a/LunaticPlayer/SongHistoryWindow.xaml.cs
+++ b/LunaticPlayer/SongHistoryWindow.xaml.cs
@@ -98,7 +98,7 @@ private void ShowDetails_OnClick(object sender, RoutedEventArgs e)
             HandleClick(CMenuAction.ShowDetails);
         }
 
-        private void SearchQueryBox_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)
+        private void SearchQueryBox_KeyDown(object sender, KeyEventArgs e)
         {
             var liveSearch = true;
 
@@ -130,6 +130,11 @@ private void HelpButton_OnClick(object sender, RoutedEventArgs e)
 
             dialogWindow.ShowDialog();
         }
+
+        private void SongList_OnMouseDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            HandleClick(CMenuAction.ShowDetails);
+        }
     }
 
     internal enum CMenuAction