diff --git a/SjUpdater/MainWindow.xaml b/SjUpdater/MainWindow.xaml
index b56ca6e..7324900 100644
--- a/SjUpdater/MainWindow.xaml
+++ b/SjUpdater/MainWindow.xaml
@@ -249,14 +249,14 @@
-
+
-
+
@@ -584,7 +584,7 @@
-
+
@@ -701,10 +701,10 @@
-
-
-
+
+
+
@@ -888,7 +888,7 @@
-
+
diff --git a/SjUpdater/MainWindow.xaml.cs b/SjUpdater/MainWindow.xaml.cs
index a4d305f..c91aeff 100644
--- a/SjUpdater/MainWindow.xaml.cs
+++ b/SjUpdater/MainWindow.xaml.cs
@@ -476,6 +476,8 @@ private void FilterFlyout_OnIsOpenChanged(object sender, EventArgs e)
{
var vm = FilterFlyout.DataContext as ShowViewModel;
vm.Show.ApplyFilter(true,false);
+ var firstSeason = vm.Seasons.FirstOrDefault();
+ if (firstSeason != null) firstSeason.IsExpanded = true;
Stats.TrackAction(Stats.TrackActivity.Filter);
}
diff --git a/SjUpdater/ViewModel/EpisodeViewModel.cs b/SjUpdater/ViewModel/EpisodeViewModel.cs
index 0163766..73e75c3 100644
--- a/SjUpdater/ViewModel/EpisodeViewModel.cs
+++ b/SjUpdater/ViewModel/EpisodeViewModel.cs
@@ -117,6 +117,7 @@ void favEpisodeData_PropertyChanged(object sender, System.ComponentModel.Propert
public FavEpisodeData Episode => _favEpisodeData;
+ public Visibility EpisodeImageVisibility => Settings.Instance.EnableImages ? Visibility.Visible : Visibility.Collapsed;
public CachedBitmap Photo
{
diff --git a/SjUpdater/ViewModel/ShowTileViewModel.cs b/SjUpdater/ViewModel/ShowTileViewModel.cs
index 8a0310e..421c7e3 100644
--- a/SjUpdater/ViewModel/ShowTileViewModel.cs
+++ b/SjUpdater/ViewModel/ShowTileViewModel.cs
@@ -272,11 +272,14 @@ public String BottomText
public Visibility BottomVisible
{
- get { return _bottomVisible;}
+ get { return _bottomVisible; }
set
{
- _bottomVisible = value;
- OnPropertyChanged();
+ if (Settings.Instance.EnableImages)
+ {
+ _bottomVisible = value;
+ OnPropertyChanged();
+ }
}
}
@@ -313,5 +316,9 @@ private set
OnPropertyChanged();
}
}
+
+ public Visibility BackgroundImageVisibility => Settings.Instance.EnableImages? Visibility.Visible : Visibility.Collapsed;
+ public Visibility OverlayDefaultVisibility => Settings.Instance.EnableImages? Visibility.Collapsed : Visibility.Visible;
+
}
}
diff --git a/SjUpdater/ViewModel/ShowViewModel.cs b/SjUpdater/ViewModel/ShowViewModel.cs
index adbcfe8..0672cce 100644
--- a/SjUpdater/ViewModel/ShowViewModel.cs
+++ b/SjUpdater/ViewModel/ShowViewModel.cs
@@ -212,23 +212,11 @@ private void UpdateNonSeasons(object sender, NotifyCollectionChangedEventArgs e)
}
- public ObservableCollection Seasons
- {
- get { return _lisSeasons; }
- }
+ public ObservableCollection Seasons => _lisSeasons;
+ public ObservableCollection NonSeasons => _lisNonSeasons;
- public ObservableCollection NonSeasons {
- get { return _lisNonSeasons; }
- }
-
- public String Title
- {
- get
- {
- return _show.Name;
- }
- }
+ public String Title => _show.Name;
public CachedBitmap Cover
{
@@ -241,6 +229,8 @@ private set
}
}
+ public Visibility SeasonImageVisibility => Settings.Instance.EnableImages ? Visibility.Visible : Visibility.Collapsed;
+
public String Description
{
get { return _description; }
@@ -328,7 +318,7 @@ public String FilterHoster
- public FavShowData Show { get { return _show; } }
+ public FavShowData Show => _show;
public ICommand UnmarkAllCommand { get; private set; }
public ICommand MarkAllDownloadedCommand { get; private set; }