From 4929cb6901a939338319df262493bd4399d033e6 Mon Sep 17 00:00:00 2001
From: amazing-username <kundeng94@gmail.com>
Date: Mon, 24 Jun 2019 16:59:57 -0700
Subject: [PATCH] Working on the default previous track interval #38

---
 Mear/Mear/Playback/MearPlayer.cs          |  2 +-
 Mear/Mear/ViewModels/SettingsViewModel.cs | 26 +++++++++++++++
 Mear/Mear/Views/SettingsPage.xaml         | 39 ++++++++++++++++++++++-
 Mear/Mear/Views/SettingsPage.xaml.cs      |  9 ++++++
 4 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/Mear/Mear/Playback/MearPlayer.cs b/Mear/Mear/Playback/MearPlayer.cs
index be3f450..7e14702 100644
--- a/Mear/Mear/Playback/MearPlayer.cs
+++ b/Mear/Mear/Playback/MearPlayer.cs
@@ -99,7 +99,7 @@ namespace Mear.Playback
                     break;
                 case PlayControls.STREAM:
                     InitializeRepeatMode();
-                    return StreamSong().Result; ;
+                    return await StreamSong();
                 case PlayControls.REPEAT:
                     ToggleRepeat();
                     break;
diff --git a/Mear/Mear/ViewModels/SettingsViewModel.cs b/Mear/Mear/ViewModels/SettingsViewModel.cs
index 0133ac4..6a24a29 100644
--- a/Mear/Mear/ViewModels/SettingsViewModel.cs
+++ b/Mear/Mear/ViewModels/SettingsViewModel.cs
@@ -15,6 +15,7 @@ namespace Mear.ViewModels
         #region Fields
         private ObservableCollection<SwitchItem> _switchItems;
         private ObservableCollection<SelectionItem> _selectionItems;
+        private ObservableCollection<SliderItem> _sliderItems;
         #endregion
 
 
@@ -29,6 +30,11 @@ namespace Mear.ViewModels
             get => _selectionItems;
             set => _selectionItems = value;
         }
+        public ObservableCollection<SliderItem> SliderItems
+        {
+            get => _sliderItems;
+            set => _sliderItems = value;
+        }
         #endregion
 
 
@@ -40,6 +46,7 @@ namespace Mear.ViewModels
 
             PopulateSwitch();
             PopulateSelections();
+            PopulateSliderItems();
         }
         #endregion
 
@@ -80,6 +87,18 @@ namespace Mear.ViewModels
                 Description = "Information about the software"
             });
         }
+        private void PopulateSliderItems()
+        {
+            _sliderItems = new ObservableCollection<SliderItem>();
+            _sliderItems.Clear();
+            _sliderItems.Add(new SliderItem
+            {
+                Title = "Default Track Interval",
+                Minimum = 0,
+                Maximum = 10,
+                DefaultInterval = 3
+            });
+        }
         #endregion
 
 
@@ -94,6 +113,13 @@ namespace Mear.ViewModels
             public string Title { get; set; }
             public string Description { get; set; }
         }
+        public class SliderItem
+        {
+            public string Title { get; set; }
+            public int Minimum { get; set; }
+            public int Maximum { get; set; }
+            public int DefaultInterval { get; set; }
+        }
         #endregion
     }
 }
diff --git a/Mear/Mear/Views/SettingsPage.xaml b/Mear/Mear/Views/SettingsPage.xaml
index 2dd81e0..6a32576 100644
--- a/Mear/Mear/Views/SettingsPage.xaml
+++ b/Mear/Mear/Views/SettingsPage.xaml
@@ -10,7 +10,7 @@
 
     <ContentPage.Content>
         <StackLayout>
-            <ListView x:Name="Sliders"
+            <ListView x:Name="Switchers"
                       VerticalOptions="Start"
                       ItemsSource="{Binding SwitchItems}"
                       HasUnevenRows="False"
@@ -64,6 +64,43 @@
                     </DataTemplate>
                 </ListView.ItemTemplate>
             </ListView>
+            <ListView x:Name="Sliders"
+                      VerticalOptions="Start"
+                      ItemsSource="{Binding SliderItems}"
+                      HasUnevenRows="False"
+                      RowHeight="70" >
+                <ListView.ItemTemplate>
+                    <DataTemplate>
+                        <ViewCell>
+                            <Grid Padding="5">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+
+                                <Label Text="{Binding Title}"
+                                       Grid.Row="0" Grid.Column="0"
+                                       d:Text="{Binding .}"
+                                       LineBreakMode="NoWrap"
+                                       FontSize="22" />
+                                <Label Grid.Row="0" Grid.Column="1"
+                                       Text="{Binding DefaultInterval}"
+                                       d:Text="{Binding .}"
+                                       LineBreakMode="NoWrap" />
+                                <Slider Grid.Row="0" Grid.Column="2"
+                                       ValueChanged="Slider_ValueChanged"
+                                       Minimum="{Binding Minimum}"
+                                       Maximum="{Binding Maximum}"
+                                       Value="{Binding DefaultInterval}" />
+                            </Grid>
+                        </ViewCell>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
         </StackLayout>
     </ContentPage.Content>
 </ContentPage>
\ No newline at end of file
diff --git a/Mear/Mear/Views/SettingsPage.xaml.cs b/Mear/Mear/Views/SettingsPage.xaml.cs
index 43653b9..a174859 100644
--- a/Mear/Mear/Views/SettingsPage.xaml.cs
+++ b/Mear/Mear/Views/SettingsPage.xaml.cs
@@ -59,6 +59,15 @@ namespace Mear.Views
             (sender as ListView).SelectedItem = null;
         }
         #endregion
+
         #endregion
+
+        private void Slider_ValueChanged(object sender, ValueChangedEventArgs e)
+        {
+            var e_var = e;
+            var s_var = (Slider)sender;
+            _viewModel.SliderItems.First().DefaultInterval = Convert.ToInt32(s_var.Value);
+            var stopper = 0;
+        }
     }
 }
\ No newline at end of file