Skip to content

Commit

Permalink
Fixed minor issue with Phone UI, added scrolling capability to nav menu
Browse files Browse the repository at this point in the history
  • Loading branch information
theweavrs committed Nov 13, 2016
1 parent 2604ee6 commit 6145212
Show file tree
Hide file tree
Showing 13 changed files with 160 additions and 101 deletions.
23 changes: 14 additions & 9 deletions BreadPlayer.Core/App.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -812,6 +812,11 @@ xmlns:Interactivity="using:Microsoft.Xaml.Interactivity" xmlns:MacalifaCore="us
<VisualState.Setters>
<Setter Target="DataStack_MOBILE.Visibility" Value="Visible"/>
<Setter Target="DataStack.Visibility" Value="Collapsed"/>
<Setter Target="TitleGrid_MOBILE.Width" Value="270"/>
<Setter Target="InfoPanel.Width" Value="270"/>
<Setter Target="Buttons_Stack.(Grid.Column)" Value="0"/>
<Setter Target="Buttons_Stack.Margin" Value="0,0,0,0"/>
<Setter Target="Buttons_Stack.HorizontalAlignment" Value="Right"/>
</VisualState.Setters>
</VisualState>
<VisualState>
Expand All @@ -820,15 +825,15 @@ xmlns:Interactivity="using:Microsoft.Xaml.Interactivity" xmlns:MacalifaCore="us
</VisualState.StateTriggers>
<VisualState.Setters></VisualState.Setters>
</VisualState>
<!--<VisualState>
<VisualState>
<VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="500"/>
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="artistTxt.Visibility" Value="Visible"/>
<Setter Target="albumTxt.Visibility" Value="Collapsed"/>
<Setter Target="DataStack_MOBILE.Visibility" Value="Visible"/>
<Setter Target="DataStack.Visibility" Value="Collapsed"/>
</VisualState.Setters>
</VisualState>-->
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
<Rectangle
Expand All @@ -845,12 +850,12 @@ xmlns:Interactivity="using:Microsoft.Xaml.Interactivity" xmlns:MacalifaCore="us
<!--<PathIcon x:Name="PlayingIndicator" Visibility="Collapsed" Data="F1 M 1.04036,13.8251C 1.61489,13.8251 2.08068,14.3045 2.08068,14.8962L 2.08068,18.4375C 2.08068,19.029 1.61489,19.5085 1.04036,19.5085C 0.465784,19.5085 -7.8934e-007,19.029 -7.8934e-007,18.4375L -7.87067e-007,14.8962C -7.87067e-007,14.3047 0.465784,13.8251 1.04036,13.8251 Z M 5.09366,13.8251C 5.66835,13.8251 6.13398,14.3045 6.13398,14.8962L 6.13398,18.4375C 6.13398,19.029 5.6682,19.5085 5.09366,19.5085C 4.51908,19.5085 4.05331,19.029 4.05331,18.4375L 4.05331,14.8962C 4.05331,14.3047 4.51908,13.8251 5.09366,13.8251 Z M 9.14698,12.3268C 9.72151,12.3268 10.1873,12.8063 10.1873,13.3978L 10.1873,19.9358C 10.1873,20.5273 9.72151,21.0067 9.14697,21.0067C 8.5724,21.0067 8.10661,20.5273 8.10661,19.9358L 8.10661,13.3978C 8.10661,12.8063 8.5724,12.3268 9.14698,12.3268 Z M 13.2001,10.5562C 13.7748,10.5562 14.2404,11.0356 14.2404,11.6272L 14.2404,21.7064C 14.2404,22.298 13.7747,22.7775 13.2001,22.7775C 12.6256,22.7775 12.1598,22.298 12.1598,21.7064L 12.1598,11.6272C 12.1598,11.0358 12.6256,10.5562 13.2001,10.5562 Z M 17.2536,7.4234C 17.8282,7.42346 18.2939,7.90295 18.2939,8.49445L 18.2939,24.8391C 18.2939,25.4307 17.8282,25.9102 17.2536,25.9102C 16.679,25.9102 16.2132,25.4307 16.2132,24.8391L 16.2132,8.49445C 16.2132,7.90295 16.679,7.4234 17.2536,7.4234 Z M 21.3067,0C 21.8813,0 22.3471,0.479553 22.3471,1.07111L 22.3471,32.2623C 22.3471,32.8538 21.8813,33.3334 21.3067,33.3334C 20.7322,33.3334 20.2664,32.8538 20.2664,32.2623L 20.2664,1.07111C 20.2664,0.479553 20.7322,0 21.3067,0 Z M 25.3601,2.65607C 25.9346,2.65607 26.4004,3.13544 26.4004,3.72711L 26.4004,29.6064C 26.4004,30.1979 25.9346,30.6774 25.3601,30.6774C 24.7855,30.6774 24.3197,30.1979 24.3197,29.6064L 24.3197,3.72711C 24.3197,3.13562 24.7855,2.65607 25.3601,2.65607 Z M 29.4132,7.96814C 29.9878,7.96814 30.4536,8.44763 30.4536,9.03918L 30.4536,24.2943C 30.4536,24.8858 29.9878,25.3652 29.4132,25.3652C 28.8386,25.3652 28.3729,24.8858 28.3729,24.2943L 28.3729,9.03918C 28.3729,8.44763 28.8386,7.96814 29.4132,7.96814 Z M 33.4667,11.1688C 34.0413,11.1688 34.507,11.6483 34.507,12.2399L 34.507,21.0934C 34.507,21.6849 34.0413,22.1644 33.4667,22.1644C 32.8921,22.1644 32.4263,21.6849 32.4263,21.0934L 32.4263,12.2399C 32.4263,11.6483 32.8921,11.1688 33.4667,11.1688 Z M 37.52,12.5312C 38.0946,12.5312 38.5603,13.0107 38.5603,13.6022L 38.5603,19.7314C 38.5603,20.323 38.0946,20.8025 37.52,20.8025C 36.9454,20.8025 36.4796,20.323 36.4796,19.7314L 36.4796,13.6022C 36.4796,13.0107 36.9454,12.5312 37.52,12.5312 Z M 41.5731,13.8251C 42.1477,13.8251 42.6135,14.3045 42.6135,14.8962L 42.6135,18.4375C 42.6135,19.029 42.1477,19.5085 41.5731,19.5085C 40.9986,19.5085 40.5328,19.029 40.5328,18.4375L 40.5328,14.8962C 40.5328,14.3047 40.9986,13.8251 41.5731,13.8251 Z M 45.6263,13.8251C 46.2009,13.8251 46.6667,14.3045 46.6667,14.8962L 46.6667,18.4375C 46.6667,19.029 46.2009,19.5085 45.6263,19.5085C 45.0517,19.5085 44.586,19.029 44.586,18.4375L 44.586,14.8962C 44.586,14.3047 45.0517,13.8251 45.6263,13.8251 Z " Width="55" Height="35"/>-->
<Grid Margin="15,0,15,0" x:Name="DataStack_MOBILE" Opacity="100" Visibility="Collapsed" Height="60" DataContext="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=Content}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" MinWidth="270"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<StackPanel Orientation="Vertical">
<Grid x:Name="TitleGrid_MOBILE" Width="300" VerticalAlignment="Top" MaxWidth="300" Margin="2,10,0,0">
<Grid x:Name="TitleGrid_MOBILE" VerticalAlignment="Top" MaxWidth="300" Margin="2,10,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
Expand All @@ -862,14 +867,14 @@ xmlns:Interactivity="using:Microsoft.Xaml.Interactivity" xmlns:MacalifaCore="us
</PathIcon>
<TextBlock Grid.Column="1" x:Name="titleTxt_MOBILE" Foreground="{Binding ElementName=DataStack, Path=Foreground}" TextWrapping="NoWrap" TextTrimming="None" Text="{Binding Title}" VerticalAlignment="Center"/>
</Grid>
<StackPanel Orientation="Horizontal" Margin="2,5,0,0" MaxWidth="300">
<StackPanel x:Name="InfoPanel" Orientation="Horizontal" Margin="2,5,0,0" MaxWidth="300">
<TextBlock x:Name="artistTxt_MOBILE" Visibility="Visible" Foreground="{Binding ElementName=DataStack, Path=Foreground}" FontSize="11" Text="{Binding LeadArtist}" />
<TextBlock Text="&#x2022;" FontSize="11" Margin="5,0,0,0" Foreground="{Binding ElementName=DataStack, Path=Foreground}"/>
<TextBlock x:Name="albumTxt_MOBILE" Visibility="Visible" Foreground="{Binding ElementName=DataStack, Path=Foreground}" FontSize="11" Text="{Binding Album}" Margin="5,0,0,0" />
</StackPanel>
</StackPanel>
<StackPanel Grid.Column="0" x:Name="Buttons_Stack" Orientation="Horizontal" Visibility="{Binding ElementName=DataStack, Path=CanDrag, Converter={StaticResource BoolToVisibilty}}"
HorizontalAlignment="Right" Background="{ThemeResource SystemControlBackgroundAccentBrush}" Margin="0,0,-100,0" VerticalAlignment="Center">
<StackPanel Grid.Column="1" x:Name="Buttons_Stack" Orientation="Horizontal" Visibility="{Binding ElementName=DataStack, Path=CanDrag, Converter={StaticResource BoolToVisibilty}}"
HorizontalAlignment="Left" Background="{ThemeResource SystemControlBackgroundAccentBrush}" Margin="10,0,0,0" VerticalAlignment="Center">
<AppBarButton Icon="Play" BorderBrush="White" HorizontalAlignment="Stretch"
DataContext="{Binding ElementName=LayoutRoot, Path=DataContext}" Width="60"
Visibility="{Binding ElementName=DataStack, Path=CanDrag, Converter={StaticResource BoolToVisibilty}}"
Expand Down
2 changes: 1 addition & 1 deletion BreadPlayer.Core/CoreWindowLogic.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ private async static void LibVM_MusicLibraryLoaded(object sender, RoutedEventArg
{
ShellVM.UpcomingSong = await ShellVM.GetUpcomingSong().ConfigureAwait(false);
if (path != "" && LibVM.TracksCollection != null && LibVM.TracksCollection.Elements.Any(t => t.Path == path) && LibVM.TracksCollection.Elements.All(t => t.State != PlayerState.Playing))
LibVM.TracksCollection.Elements.Single(t => t.Path == path).State = PlayerState.Playing;
LibVM.TracksCollection.Elements.First(t => t.Path == path).State = PlayerState.Playing;

SettingsVM.ModifiedFiles = await Common.DirectoryWalker.GetModifiedFiles(SettingsVM.LibraryFoldersCollection, SettingsVM.TimeClosed);
}
Expand Down
2 changes: 1 addition & 1 deletion BreadPlayer.Core/Extensions/GroupedObservableCollection.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ private Grouping<TKey, TElement> FindOrCreateGroup(TKey key)
try
{

var match = this.Select((group, index) => new { group, index }).FirstOrDefault(i => i.group.Key.CompareTo(key) >= 0);
var match = this.ToArray().Select((group, index) => new { group, index }).FirstOrDefault(i => i.group.Key.CompareTo(key) >= 0);

if (match == null)
{
Expand Down
9 changes: 8 additions & 1 deletion BreadPlayer.Core/Extensions/ThreadSafeObservableCollection.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,14 @@ private void DoAdd(T item)

protected async override void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
{
await _dispatcher.RunAsync(CoreDispatcherPriority.Normal, () => { if (_isObserving) base.OnCollectionChanged(e); });
await _dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
{
try
{
if (_isObserving) base.OnCollectionChanged(e);
}
catch { }
});
}
protected async override void OnPropertyChanged(PropertyChangedEventArgs e)
{
Expand Down
2 changes: 1 addition & 1 deletion BreadPlayer.Core/Package.appxmanifest
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" IgnorableNamespaces="uap mp uap3">
<Identity Name="22102thecodrr.BreadPlayer" Publisher="CN=C12EF191-B051-4B71-922F-A3597A07F49E" Version="0.1.5.0" />
<Identity Name="22102thecodrr.BreadPlayer" Publisher="CN=C12EF191-B051-4B71-922F-A3597A07F49E" Version="0.1.6.0" />
<mp:PhoneIdentity PhoneProductId="f2586309-8386-46e9-9e86-c9b0a8a075b0" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>Bread Player</DisplayName>
Expand Down
Loading

0 comments on commit 6145212

Please sign in to comment.