Add an option for disabling background images

Heufneutje · Dec 3, 2024 · c029b7a · c029b7a
1 parent 92550f0
commit c029b7a
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 12 deletions.
diff --git a/SpeedrunTracker/Models/LocalStorage/UserSettings.cs b/SpeedrunTracker/Models/LocalStorage/UserSettings.cs
@@ -11,4 +11,5 @@ public class UserSettings
     public int MaxLeaderboardResults { get; set; }
     public string? DateFormat { get; set; }
     public string? TimeFormat { get; set; }
+    public bool? DisplayBackgrounds { get; set; }
 }
diff --git a/SpeedrunTracker/Services/LocalStorage/LocalSettingsService.cs b/SpeedrunTracker/Services/LocalStorage/LocalSettingsService.cs
@@ -21,7 +21,8 @@ public async Task LoadSettingsAsync()
         {
             UserSettings = new()
             {
-                MaxLeaderboardResults = Convert.ToInt32(_configuration["defaults:max-leaderboard-results"])
+                MaxLeaderboardResults = _configuration.GetValue<int>("defaults:max-leaderboard-results"),
+                DisplayBackgrounds = _configuration.GetValue<bool>("defaults:display-backgrounds")
             };
 
             await GetConnection().InsertAsync(UserSettings);
@@ -32,6 +33,9 @@ public async Task LoadSettingsAsync()
 
         if (UserSettings.TimeFormat == null)
             UserSettings.TimeFormat = _configuration["defaults:time-format"];
+
+        if (UserSettings.DisplayBackgrounds == null)
+            UserSettings.DisplayBackgrounds = _configuration.GetValue<bool>("defaults:display-backgrounds");
     }
 
     public async Task SaveSettingsAsync()

diff --git a/SpeedrunTracker/ViewModels/GameDetailViewModel.cs b/SpeedrunTracker/ViewModels/GameDetailViewModel.cs
@@ -36,6 +36,7 @@ public Game? Game
             _followEntity = value;
             NotifyPropertyChanged();
             NotifyPropertyChanged(nameof(Platforms));
+            NotifyPropertyChanged(nameof(BackgroundUri));
         }
     }
 
@@ -163,6 +164,8 @@ public string Platforms
 
     public override ShareDetails ShareDetails => new(Game?.Weblink, Game?.Names?.International);
 
+    public string? BackgroundUri => _settingsService.UserSettings.DisplayBackgrounds == true ? Game?.Assets?.Background?.Uri : null;
+
     public async Task<bool> LoadCategoriesAsync()
     {
         if (Game == null)

diff --git a/SpeedrunTracker/ViewModels/GameSeriesDetailViewModel.cs b/SpeedrunTracker/ViewModels/GameSeriesDetailViewModel.cs
@@ -1,5 +1,6 @@
 using CommunityToolkit.Maui.Core;
 using CommunityToolkit.Mvvm.Input;
+using Refit;
 using SpeedrunTracker.Extensions;
 using SpeedrunTracker.Navigation;
 using System.Collections.ObjectModel;
@@ -10,6 +11,7 @@ namespace SpeedrunTracker.ViewModels;
 public class GameSeriesDetailViewModel : BaseFollowViewModel<GameSeries>
 {
     private readonly IGameSeriesService _gameSeriesService;
+    private readonly ILocalSettingsService _settingsService;
     private int _offset;
     private bool _hasReachedEnd;
 
@@ -22,6 +24,7 @@ public GameSeries? Series
             {
                 _followEntity = value;
                 NotifyPropertyChanged();
+                NotifyPropertyChanged(nameof(BackgroundUri));
             }
         }
     }
@@ -49,10 +52,13 @@ public Game? SelectedGame
 
     public override ShareDetails ShareDetails => new(Series?.Weblink, Series?.Names?.International);
 
-    public GameSeriesDetailViewModel(IGameSeriesService gameSeriesService, ILocalFollowService followService, IShareService shareService, IToastService toastService, IPopupService popupService) : base(followService, shareService, toastService, popupService)
+    public string? BackgroundUri => _settingsService.UserSettings.DisplayBackgrounds == true ? Series?.Assets?.Background?.Uri : null;
+
+    public GameSeriesDetailViewModel(IGameSeriesService gameSeriesService, ILocalFollowService followService, IShareService shareService, IToastService toastService, IPopupService popupService, ILocalSettingsService settingsService) : base(followService, shareService, toastService, popupService)
     {
         Games = [];
         _gameSeriesService = gameSeriesService;
+        _settingsService = settingsService;
     }
 
     protected override Task FollowAsync(GameSeries entity) => _followService.FollowSeriesAsync(entity);

diff --git a/SpeedrunTracker/ViewModels/RunDetailsViewModel.cs b/SpeedrunTracker/ViewModels/RunDetailsViewModel.cs
@@ -24,6 +24,7 @@ public RunDetails? RunDetails
         {
             _runDetails = value;
             NotifyPropertyChanged();
+            NotifyPropertyChanged(nameof(BackgroundUri));
 
             if (value?.Run.Videos?.Links != null)
                 VideoUrls.AddRange(_embedService.GetEmbeddableUrls(value.Run.Videos));
@@ -129,6 +130,8 @@ public string? StatusDescription
 
     private bool ShouldShowTimingType(TimingType timingType) => RunDetails?.Ruleset?.TimingTypes?.Contains(timingType) == true && RunDetails?.Ruleset?.DefaultTimingType != timingType;
 
+    public string? BackgroundUri => _settingsService.UserSettings.DisplayBackgrounds == true ? RunDetails?.GameAssets?.Background?.Uri : null;
+
     public override ShareDetails ShareDetails => new(RunDetails?.Run?.Weblink, Title);
 
     public RunDetailsViewModel(IBrowserService browserService, IUserService userService, IEmbedService embedService, IShareService shareService, IToastService toastService, IConfiguration config, ILocalSettingsService settingsService, IPopupService popupService) : base(shareService, toastService, popupService)
@@ -147,7 +150,6 @@ private async Task ShowVideo()
             await _browserService.OpenAsync(_selectedVideo.Url);
     }
 
-
     public async Task LoadData()
     {
         if (RunDetails?.Examiner == null && RunDetails?.Run.Status?.ExaminerId != null)

diff --git a/SpeedrunTracker/ViewModels/SettingsViewModel.cs b/SpeedrunTracker/ViewModels/SettingsViewModel.cs
@@ -76,6 +76,20 @@ public FormatSetting? TimeFormat
         }
     }
 
+    public bool DisplayBackgrounds
+    {
+        get => _settingsService.UserSettings.DisplayBackgrounds ?? false;
+        set
+        {
+            if (_settingsService.UserSettings.DisplayBackgrounds != value)
+            {
+                _settingsService.UserSettings.DisplayBackgrounds = value;
+                _hasChanges = true;
+                NotifyPropertyChanged();
+            }
+        }
+    }
+
     private ObservableCollection<ThemeSetting>? _themeSettings;
 
     public ObservableCollection<ThemeSetting> Themes

diff --git a/SpeedrunTracker/Views/GameDetailsPage.xaml b/SpeedrunTracker/Views/GameDetailsPage.xaml
@@ -7,10 +7,10 @@
              x:Class="SpeedrunTracker.Views.GameDetailPage"
              Appearing="ContentPage_Appearing">
     <Shell.TitleView>
-        <Label Text="{Binding Game.Names.International}" TextColor="White" FontSize="Medium" FontAttributes="Bold" VerticalTextAlignment="Center" MaxLines="2" FontAutoScalingEnabled="True"/>
+        <Label Text="{Binding Game.Names.International}" TextColor="White" FontSize="Medium" FontAttributes="Bold" VerticalTextAlignment="Center" MaxLines="2" FontAutoScalingEnabled="True" />
     </Shell.TitleView>
     <Grid>
-        <Image Source="{Binding Game.Assets.Background.Uri}" Style="{StaticResource CustomBackgroundImage}" />
+        <Image Source="{Binding BackgroundUri}" Style="{StaticResource CustomBackgroundImage}" />
         <Grid Padding="20">
             <CollectionView Style="{StaticResource ThresholdCollectionViewStyle}" ItemsSource="{Binding LeaderboardEntries}" ItemTemplate="{StaticResource LeaderboardTemplate}" RemainingItemsThresholdReachedCommand="{Binding DisplayLeaderboardEntriesCommand}" SelectedItem="{Binding SelectedLeaderboardEntry}" SelectionChangedCommand="{Binding NavigateToRunCommand}">
                 <CollectionView.Header>

diff --git a/SpeedrunTracker/Views/GameSeriesDetailsPage.xaml b/SpeedrunTracker/Views/GameSeriesDetailsPage.xaml
@@ -10,7 +10,7 @@
         <Label Text="{Binding Series.Names.International}" TextColor="White" FontSize="Medium" FontAttributes="Bold" VerticalTextAlignment="Center" MaxLines="2" FontAutoScalingEnabled="True" />
     </Shell.TitleView>
     <Grid>
-        <Image Source="{Binding Series.Assets.Background.Uri}" Style="{StaticResource CustomBackgroundImage}" />
+        <Image Source="{Binding BackgroundUri}" Style="{StaticResource CustomBackgroundImage}" />
         <Grid Padding="20">
             <CollectionView Style="{StaticResource ThresholdCollectionViewStyle}"
                             ItemsSource="{Binding Games}"

diff --git a/SpeedrunTracker/Views/RunDetailsPage.xaml b/SpeedrunTracker/Views/RunDetailsPage.xaml
@@ -19,7 +19,7 @@
         <ToolbarItem IconImageSource="share" Text="Share" Command="{Binding ShareCommand}" />
     </ContentPage.ToolbarItems>
     <Grid>
-        <Image Source="{Binding RunDetails.GameAssets.Background.Uri}" Style="{StaticResource CustomBackgroundImage}" />
+        <Image Source="{Binding BackgroundUri}" Style="{StaticResource CustomBackgroundImage}" />
         <ScrollView>
             <Grid Padding="10" RowDefinitions="Auto,Auto,Auto,Auto,Auto">
                 <Border Style="{StaticResource TransparentGridElementBorder}" Grid.Row="0">

diff --git a/SpeedrunTracker/Views/SettingsPage.xaml b/SpeedrunTracker/Views/SettingsPage.xaml
@@ -9,16 +9,17 @@
     <VerticalStackLayout Padding="10">
         <Border Style="{StaticResource TransparentGridElementBorder}">
             <VerticalStackLayout>
-                <Label Text="Theme" Style="{StaticResource GroupHeaderLabel}" />
-                <Line />
+                <Label Text="Interface" Style="{StaticResource GroupHeaderLabel}" />
+                <Label Text="Theme" Style="{StaticResource SettingsItemSubLabel}" />
                 <Picker ItemsSource="{Binding Themes}" SelectedItem="{Binding Theme}" Margin="20,5,20,5" />
+                <Label Text="Display Backgrounds" Style="{StaticResource SettingsItemSubLabel}" />
+                <Switch IsToggled="{Binding DisplayBackgrounds}" HorizontalOptions="Start" Margin="15,5,20,5" />
             </VerticalStackLayout>
         </Border>
 
         <Border Style="{StaticResource TransparentGridElementBorder}">
             <VerticalStackLayout>
                 <Label Text="Date and Time" Style="{StaticResource GroupHeaderLabel}" />
-                <Line />
                 <Label Text="Date Format" Style="{StaticResource SettingsItemSubLabel}" />
                 <Picker ItemsSource="{Binding DateFormats}" SelectedItem="{Binding DateFormat}" Margin="20,5,20,5" />
                 <Label Text="Time Format" Style="{StaticResource SettingsItemSubLabel}" />
@@ -29,7 +30,6 @@
         <Border Style="{StaticResource TransparentGridElementBorder}">
             <VerticalStackLayout>
                 <Label Text="Maximum Leaderboard Results" Style="{StaticResource GroupHeaderLabel}" />
-                <Line />
                 <Grid ColumnDefinitions="*,Auto" Margin="0,0,10,0">
                     <Slider Grid.Column="0" Margin="10" Minimum="1" Maximum="1000" Value="{Binding MaxLeaderboardResults, Mode=TwoWay}" />
                     <Label Grid.Column="1" Margin="10" Text="{Binding MaxLeaderboardResults}" />

diff --git a/SpeedrunTracker/appsettings.json b/SpeedrunTracker/appsettings.json
@@ -12,6 +12,7 @@
   "defaults": {
     "max-leaderboard-results": 500,
     "date-format": "yyyy-MM-dd",
-    "time-format": "HH:mm"
+    "time-format": "HH:mm",
+    "display-backgrounds": true
   }
 }