From 171642d3027683cac1b6d31befc944e8c3640a29 Mon Sep 17 00:00:00 2001
From: netquick <netquick@gmx.ch>
Date: Wed, 17 Jul 2024 23:18:12 +0200
Subject: [PATCH] FavoriteStar fixed, visual fixes, settings added for gamepath

---
 DeFRaG_Helper/App.xaml                        |  2 +
 .../Converters/BoolToVisibilityConverter.cs   | 44 +++++++++---
 .../Converters/IntToBoolConverter.cs          | 21 ++++++
 DeFRaG_Helper/CustomStyles.xaml               | 71 ++++++++++++++++---
 DeFRaG_Helper/Helpers/CreateAndUpdateDB.cs    |  8 ++-
 .../UserControls/DropDownButton.xaml.cs       |  6 +-
 DeFRaG_Helper/UserControls/HighLightCard.xaml | 20 ++++--
 DeFRaG_Helper/UserControls/MapCard.xaml       | 27 ++++---
 DeFRaG_Helper/UserControls/MapCard.xaml.cs    | 61 ++++++++++++++--
 DeFRaG_Helper/ViewModels/MapViewModel.cs      |  4 ++
 DeFRaG_Helper/ViewModels/ServerViewModel.cs   |  5 +-
 DeFRaG_Helper/Views/Maps.xaml                 |  4 +-
 DeFRaG_Helper/Views/Settings.xaml             | 34 ++-------
 DeFRaG_Helper/Views/Settings.xaml.cs          | 58 +++++++++++++++
 14 files changed, 290 insertions(+), 75 deletions(-)
 create mode 100644 DeFRaG_Helper/Converters/IntToBoolConverter.cs

diff --git a/DeFRaG_Helper/App.xaml b/DeFRaG_Helper/App.xaml
index 7daa918..05a33b3 100644
--- a/DeFRaG_Helper/App.xaml
+++ b/DeFRaG_Helper/App.xaml
@@ -13,6 +13,8 @@
             <!-- Correctly reference the BoolToVisibilityConverter within the local XML namespace -->
             <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
             <converters:BoolToAlignmentConverter x:Key="BoolToAlignmentConverter"/>
+            <converters:IntToBoolConverter x:Key="IntToBoolConverter"/>
+
             <!-- Update this line -->
             <converters:IntToInverseBooleanConverter x:Key="IntToInverseBooleanConverter"/>
             <converters:PhysicsModeConverter x:Key="PhysicsModeConverter"/>
diff --git a/DeFRaG_Helper/Converters/BoolToVisibilityConverter.cs b/DeFRaG_Helper/Converters/BoolToVisibilityConverter.cs
index e697a06..b988859 100644
--- a/DeFRaG_Helper/Converters/BoolToVisibilityConverter.cs
+++ b/DeFRaG_Helper/Converters/BoolToVisibilityConverter.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Diagnostics;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Data;
 
@@ -13,15 +9,45 @@ public class BoolToVisibilityConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            // Assuming the value is a boolean and targetType is Visibility
-            bool isVisible = (bool)value;
+            bool isVisible;
+
+            if (value is int intValue)
+            {
+                isVisible = intValue != 0; // Treat non-zero integers as true
+            }
+            else if (value is bool boolValue)
+            {
+                isVisible = boolValue;
+            }
+            else
+            {
+                throw new InvalidOperationException("Unsupported type");
+            }
+
+            bool invert = parameter != null && bool.Parse((string)parameter);
+
+            if (invert) isVisible = !isVisible;
+
             return isVisible ? Visibility.Visible : Visibility.Collapsed;
         }
 
+
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            // ConvertBack is not necessary for this use case
-            throw new NotImplementedException();
+            if (value is bool boolValue)
+            {
+                // Convert boolean back to integer (0 or 1) for SQLite storage.
+                return boolValue ? 1 : 0;
+            }
+            else
+            {
+                throw new ArgumentException("Expected value to be of type Boolean", nameof(value));
+            }
         }
+
+
+
+
     }
+
 }
diff --git a/DeFRaG_Helper/Converters/IntToBoolConverter.cs b/DeFRaG_Helper/Converters/IntToBoolConverter.cs
new file mode 100644
index 0000000..b55ef7a
--- /dev/null
+++ b/DeFRaG_Helper/Converters/IntToBoolConverter.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace DeFRaG_Helper.Converters
+{
+    public class IntToBoolConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            // Assuming 1 represents true/favorite, and 0 (or null) represents false/not favorite
+            return value is int intValue && intValue == 1;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            // Convert back to integer representation for the database
+            return value is bool boolValue && boolValue ? 1 : 0;
+        }
+    }
+}
diff --git a/DeFRaG_Helper/CustomStyles.xaml b/DeFRaG_Helper/CustomStyles.xaml
index 398c80b..1caa895 100644
--- a/DeFRaG_Helper/CustomStyles.xaml
+++ b/DeFRaG_Helper/CustomStyles.xaml
@@ -817,16 +817,48 @@
         </Setter>
     </Style>
 
+
+    <Style x:Key="FavoriteButtonStyle" TargetType="Button">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Grid Background="Transparent">
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CheckStates">
+                                <VisualState x:Name="Checked">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="FilledStar">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Visible"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unchecked">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="FilledStar">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Collapsed"/>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                        <Path x:Name="OutlineStar" Data="M 10,1 L 12,7 L 18,7 L 13,11 L 15,17 L 10,13 L 5,17 L 7,11 L 2,7 L 8,7 Z" Stroke="Black" Fill="Transparent"/>
+                        <Path x:Name="FilledStar" Data="M 10,1 L 12,7 L 18,7 L 13,11 L 15,17 L 10,13 L 5,17 L 7,11 L 2,7 L 8,7 Z" Fill="Gold" Visibility="Collapsed"/>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
+
+
+
     <!-- FavoriteIcon Checkbox-->
     <Style x:Key="FavoriteCheckBoxStyle" TargetType="CheckBox">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="CheckBox">
-                    <Grid>
-                        <Grid.LayoutTransform>
-                            <!-- Adjust the ScaleX and ScaleY values to scale the star size -->
-                            <ScaleTransform ScaleX="1.5" ScaleY="1.5"/>
-                        </Grid.LayoutTransform>
+                    <Grid >
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CheckStates">
                                 <VisualState x:Name="Checked">
@@ -855,15 +887,38 @@
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        <Path x:Name="OutlineStar" Data="M 10,1 L 12,7 L 18,7 L 13,11 L 15,17 L 10,13 L 5,17 L 7,11 L 2,7 L 8,7 Z" Stroke="Black" Fill="Transparent"/>
-                        <Path x:Name="FilledStar" Data="M 10,1 L 12,7 L 18,7 L 13,11 L 15,17 L 10,13 L 5,17 L 7,11 L 2,7 L 8,7 Z" Fill="Gold" Visibility="Collapsed"/>
+                        <!-- Padding sets the star Size-->
+
+                        <Border Background="Transparent" Padding="12">
+
+                            <Viewbox HorizontalAlignment="Center" VerticalAlignment="Center">
+                                <Grid>
+                                    <Grid.LayoutTransform>
+                                        <!-- Adjust the ScaleX and ScaleY values to scale the star size -->
+                                        <ScaleTransform ScaleX="0.5" ScaleY="0.5"/>
+                                    </Grid.LayoutTransform>
+                                    <Path x:Name="OutlineStar"
+                                          Data="M 10,1 L 12,7 L 18,7 L 13,11 L 15,17 L 10,13 L 5,17 L 7,11 L 2,7 L 8,7 Z" 
+                                          Stroke="Black" 
+                                          Fill="Transparent"/>
+                                                                <Path x:Name="FilledStar" 
+                                          Data="M 10,1 L 12,7 L 18,7 L 13,11 L 15,17 L 10,13 L 5,17 L 7,11 L 2,7 L 8,7 Z" 
+                                          Fill="Gold" 
+                                          Visibility="Collapsed"/>
+                                </Grid>
+                            </Viewbox>
+                        </Border>
                     </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="FilledStar" Property="Visibility" Value="Visible"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-
     <!-- Modern ProgressBar Style -->
     <Style TargetType="ProgressBar">
         <Setter Property="Foreground" Value="{DynamicResource ThemeColor}"/>
diff --git a/DeFRaG_Helper/Helpers/CreateAndUpdateDB.cs b/DeFRaG_Helper/Helpers/CreateAndUpdateDB.cs
index b1e8ce3..fd899e3 100644
--- a/DeFRaG_Helper/Helpers/CreateAndUpdateDB.cs
+++ b/DeFRaG_Helper/Helpers/CreateAndUpdateDB.cs
@@ -630,9 +630,15 @@ private async static Task GetMapDetails(MapData tempMap, int mapCount)
                 //update the map in the database with method UpdateOrAddMap in MapViewModel
                 var mapViewModel = await MapViewModel.GetInstanceAsync();
 
-                await mapViewModel.UpdateOrAddMap(map);
+                if (map.Name == null || map.Name == "")
+                    {
+                    map.Name = Path.GetFileNameWithoutExtension(tempMap.Name);
+                }
 
+                //Update or add map to the database
+                await mapViewModel.UpdateOrAddMap(map);
 
+                //set the map as parsed
                 await SetMapParsed(tempMap);
 
 
diff --git a/DeFRaG_Helper/UserControls/DropDownButton.xaml.cs b/DeFRaG_Helper/UserControls/DropDownButton.xaml.cs
index bdfd530..1002018 100644
--- a/DeFRaG_Helper/UserControls/DropDownButton.xaml.cs
+++ b/DeFRaG_Helper/UserControls/DropDownButton.xaml.cs
@@ -117,9 +117,11 @@ private async void PlayRandomMap()
             {
                 // Assuming chkPhysics is accessible or you have a method in MainWindow to get its value
                 int physicsSetting = mainWindow.GetPhysicsSetting(); // method in MainWindow
-                //from the physics setting, we need to get maps with the same physics setting or 0 or 3 to find a random map
+                                                                     //from the physics setting, we need to get maps with the same physics setting or 0 or 3 to find a random map
 
-                var matchingMaps = viewModel.Maps.Where(m => m.Physics == physicsSetting || m.Physics == 0 || m.Physics == 3).ToList();
+                var matchingMaps = viewModel.Maps
+                    .Where(m => (m.Physics == physicsSetting || m.Physics == 0 || m.Physics == 3) && m.GameType == "Defrag")
+                    .ToList();
 
                 if (matchingMaps.Any())
                 {
diff --git a/DeFRaG_Helper/UserControls/HighLightCard.xaml b/DeFRaG_Helper/UserControls/HighLightCard.xaml
index f3ab62d..c3d54a4 100644
--- a/DeFRaG_Helper/UserControls/HighLightCard.xaml
+++ b/DeFRaG_Helper/UserControls/HighLightCard.xaml
@@ -3,10 +3,17 @@
              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:DeFRaG_Helper"
+             xmlns:local="clr-namespace:DeFRaG_Helper.UserControls"
+             xmlns:converters="clr-namespace:DeFRaG_Helper.Converters"
+
              mc:Ignorable="d" 
              d:DesignHeight="200" d:DesignWidth="200">
+    <UserControl.Resources>
+        <converters:SvgPathAndColorConverter x:Key="SvgPathAndColorConverter"/>
+        <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
+        <converters:IntToBoolConverter x:Key="IntToBoolConverter"/>
 
+    </UserControl.Resources>
     <Border Margin="10" CornerRadius="10" Background="#2d2d2d" MouseLeftButtonDown="Border_MouseLeftButtonDown">
         <Grid>
             <Grid.RowDefinitions>
@@ -15,7 +22,7 @@
             </Grid.RowDefinitions>
             <Grid Grid.Row="0" Height="140" MaxWidth="200">
                 <Image Margin="10,10,10,0" Source="{Binding ImagePath}" MaxWidth="160"/>
-                <TextBlock Text="{Binding Name}" FontSize="20" Foreground="White" Margin="20,10,20,0" Height="96" VerticalAlignment="Top" TextWrapping="Wrap" MaxWidth="160"/>
+                <TextBlock Text="{Binding Name}" FontSize="20" Foreground="White" Margin="20,10,20,0" Height="96" VerticalAlignment="Top" TextWrapping="Wrap" MaxWidth="160" HorizontalAlignment="Center"/>
             </Grid>
             <!-- Adjusted inner Border with straight upper corners and rounded bottom corners -->
             <Border Grid.Row="1" Height="60" Background="#2a2a2a" CornerRadius="0,0,10,10">
@@ -33,11 +40,10 @@
                     <!-- Binding the Hits property -->
                     <TextBlock Grid.Row="2" Text="{Binding Hits}" FontSize="9" Foreground="White" HorizontalAlignment="Center"/>
                     <!-- Assuming there's a Favorite property -->
-                    <CheckBox Grid.Row="3" Height="26" Content="Favorite" Margin="0, 4, 0, 0" HorizontalAlignment="Center" IsChecked="{Binding IsFavorite}" Style="{StaticResource FavoriteCheckBoxStyle}" Checked="FavoriteCheckBox_Checked" Unchecked="FavoriteCheckBox_Unchecked">
-                        <CheckBox.LayoutTransform>
-                            <ScaleTransform ScaleX="0.5" ScaleY="0.5"/>
-                        </CheckBox.LayoutTransform>
-                    </CheckBox>
+
+                    <CheckBox Grid.Row="2" Name="chkFav" IsChecked="{Binding IsFavorite, Mode=TwoWay, Converter={StaticResource IntToBoolConverter}}"  
+          Width="40" Height="40" Style="{StaticResource FavoriteCheckBoxStyle}" VerticalAlignment="Top" Margin="70,0,70,0" 
+          Checked="FavoriteCheckBox_Checked" Unchecked="FavoriteCheckBox_Unchecked" Grid.RowSpan="2" />
                 </Grid>
             </Border>
         </Grid>
diff --git a/DeFRaG_Helper/UserControls/MapCard.xaml b/DeFRaG_Helper/UserControls/MapCard.xaml
index 56f33a5..63a7ba9 100644
--- a/DeFRaG_Helper/UserControls/MapCard.xaml
+++ b/DeFRaG_Helper/UserControls/MapCard.xaml
@@ -11,13 +11,16 @@
              d:DesignHeight="100" d:DesignWidth="1000">
     <UserControl.Resources>
         <converters:SvgPathAndColorConverter x:Key="SvgPathAndColorConverter"/>
+        <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
+        <converters:IntToBoolConverter x:Key="IntToBoolConverter"/>
+
     </UserControl.Resources>
     <Border CornerRadius="10" Background="#2c2c2c">
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="6*"/>
             <!-- Left half -->
-            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="4*"/>
             <!-- Right half (empty in this example) -->
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
@@ -39,10 +42,10 @@
                 <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="1*"/>
             </Grid.ColumnDefinitions>
             <TextBlock Grid.Row="0" Grid.Column="0" x:Name="Mapname" Text="{Binding Name}" FontSize="14" Foreground="White" Margin="10, 0, 10, 0" FontFamily="Segoe UI"/>
             <TextBlock Grid.Row="1" Grid.Column="0" x:Name="Filename" Text="{Binding Filename}" FontSize="14" Foreground="White" Margin="10, 0, 0, 10" FontFamily="Segoe UI"/>
@@ -50,7 +53,7 @@
             <TextBlock Grid.Row="1" Grid.Column="1" x:Name="Date" Text="{Binding Releasedate}" FontSize="14" Foreground="White" Margin="10, 0, 0, 10" FontFamily="Segoe UI"/>
             <TextBlock Grid.Row="0" Grid.Column="2" x:Name="Hits" Text="{Binding Hits}" FontSize="14" Foreground="White" Margin="10, 0, 0, 0" FontFamily="Segoe UI"/>
             <TextBlock Grid.Row="1" Grid.Column="2" x:Name="Size" Text="{Binding Size, Converter={StaticResource SizeFormatConverter}}" FontSize="14" Foreground="White" Margin="10, 0, 0, 10" FontFamily="Segoe UI"/>
-            <TextBlock Grid.Row="0" Grid.Column="3" x:Name="Type" Text="{Binding Gametype}" FontSize="14" Foreground="White" Margin="10, 0, 0, 0" FontFamily="Segoe UI"/>
+            <TextBlock Grid.Row="0" Grid.Column="3" x:Name="Type" Text="{Binding GameType}" FontSize="14" Foreground="White" Margin="10, 0, 0, 0" FontFamily="Segoe UI"/>
             <TextBlock Grid.Row="1" Grid.Column="3" x:Name="Style" Text="{Binding Style}" FontSize="14" Foreground="White" Margin="10, 0, 0, 10" FontFamily="Segoe UI"/>
         </Grid>
 
@@ -131,9 +134,12 @@
                 </Grid>
 
                 <Image Grid.Column="1" Source="{Binding ImagePath}" MaxHeight="70" Width="120" MaxWidth="120" Margin="5" ></Image>
-            <CheckBox Grid.Column="2" Name="chkFav" IsChecked="{Binding IsFavorite}" Style="{StaticResource FavoriteCheckBoxStyle}" VerticalAlignment="Center" Margin="20, 0, 20, 0" Checked="FavoriteCheckBox_Checked" Unchecked="FavoriteCheckBox_Unchecked"/>
+                <CheckBox Grid.Column="2" Name="chkFav" IsChecked="{Binding IsFavorite, Mode=TwoWay, Converter={StaticResource IntToBoolConverter}}"  
+                          Width="60" Height="60" Style="{StaticResource FavoriteCheckBoxStyle}" VerticalAlignment="Center" Margin="0, 0, 0, 0" 
+                          Checked="FavoriteCheckBox_Checked" Unchecked="FavoriteCheckBox_Unchecked"/>
+
 
-            <Button Name="btnPlay" Grid.Column="3" Width="40" Margin="5, 10, 5, 10" 
+                <Button Name="btnPlay" Grid.Column="3" Width="40" Margin="5, 10, 5, 10" 
                     Command="{Binding ElementName=MapsList, Path=DataContext.PlayMapCommand}" CommandParameter="{Binding}">
                 <StackPanel Orientation="Horizontal">
                     <Image Width="20" Height="20" Margin="0,0,0,0" VerticalAlignment="Center">
@@ -173,8 +179,7 @@
             </Button>
             <Button Name="btnEdit" Grid.Column="5" Width="40" Margin="5, 10, 10, 10"
                 Command="{Binding ElementName=MapsList, Path=DataContext.DownloadMapCommand}" 
-                CommandParameter="{Binding}"
-                IsEnabled="{Binding IsDownloaded, Converter={StaticResource IntToInverseBooleanConverter}}">
+                CommandParameter="{Binding}">
                 <StackPanel Orientation="Horizontal">
                     <Image Width="20" Height="20" Margin="0,0,0,0" VerticalAlignment="Center">
                         <Image.Source>
diff --git a/DeFRaG_Helper/UserControls/MapCard.xaml.cs b/DeFRaG_Helper/UserControls/MapCard.xaml.cs
index 69d1e54..c103d0e 100644
--- a/DeFRaG_Helper/UserControls/MapCard.xaml.cs
+++ b/DeFRaG_Helper/UserControls/MapCard.xaml.cs
@@ -13,14 +13,36 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using System.ComponentModel;
+using DeFRaG_Helper.ViewModels;
 
 namespace DeFRaG_Helper.UserControls
 {
     /// <summary>
     /// Interaction logic for MapCard.xaml
     /// </summary>
-    public partial class MapCard : UserControl
+    public partial class MapCard : UserControl, INotifyPropertyChanged
     {
+
+        private bool _isFavoriteChecked = false;
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        public bool IsFavoriteChecked
+        {
+            get => _isFavoriteChecked;
+            set
+            {
+                if (_isFavoriteChecked != value)
+                {
+                    _isFavoriteChecked = value;
+                    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsFavoriteChecked)));
+                    // Update visual state based on the new value
+                    VisualStateManager.GoToState(this, _isFavoriteChecked ? "MouseOver" : "Normal", true);
+                }
+            }
+        }
+
         public Map CurrentMap { get; set; }
         public static readonly DependencyProperty IconsProperty = DependencyProperty.Register(
             "Icons", typeof(IEnumerable), typeof(MapCard), new PropertyMetadata(null));
@@ -35,14 +57,43 @@ public MapCard()
         {
             InitializeComponent();
         }
-        private void FavoriteCheckBox_Checked(object sender, RoutedEventArgs e)
+
+        private bool isFavoriteChecked = false;
+        private void FavoriteButton_Click(object sender, RoutedEventArgs e)
         {
-            // Add map to favorites
+            IsFavoriteChecked = !IsFavoriteChecked; // Use the property to trigger UI update
         }
+        //private void FavoriteButton_Click(object sender, RoutedEventArgs e)
+        //{
+        //    isFavoriteChecked = !isFavoriteChecked;
+        //    VisualStateManager.GoToState((Button)sender, isFavoriteChecked ? "Checked" : "Unchecked", true);
+        //}
 
-        private void FavoriteCheckBox_Unchecked(object sender, RoutedEventArgs e)
+        private async void FavoriteCheckBox_Checked(object sender, RoutedEventArgs e)
         {
-            // Remove map from favorites
+            var checkBox = sender as CheckBox;
+            var map = checkBox.DataContext as Map;
+            if (map != null)
+            {
+                map.IsFavorite = 1;
+                var mapViewModel = await MapViewModel.GetInstanceAsync();
+
+                await mapViewModel.UpdateFavoriteStateAsync(map);
+
+            }
+        }
+
+        private async void FavoriteCheckBox_Unchecked(object sender, RoutedEventArgs e)
+        {
+            var checkBox = sender as CheckBox;
+            var map = checkBox.DataContext as Map;
+            if (map != null)
+            {
+                map.IsFavorite = 0;
+                var mapViewModel = await MapViewModel.GetInstanceAsync();
+
+                await mapViewModel.UpdateFavoriteStateAsync(map);
+            }
         }
     }
 
diff --git a/DeFRaG_Helper/ViewModels/MapViewModel.cs b/DeFRaG_Helper/ViewModels/MapViewModel.cs
index ec262fa..cef2427 100644
--- a/DeFRaG_Helper/ViewModels/MapViewModel.cs
+++ b/DeFRaG_Helper/ViewModels/MapViewModel.cs
@@ -259,6 +259,10 @@ GROUP BY
 
                             };
 
+                            if (map.Name == null || map.Name == "")
+                            {
+                                map.Name = Path.GetFileNameWithoutExtension(map.Mapname);
+                            }
 
 
                             // Since we're on a background thread, ensure UI updates are dispatched on the UI thread
diff --git a/DeFRaG_Helper/ViewModels/ServerViewModel.cs b/DeFRaG_Helper/ViewModels/ServerViewModel.cs
index cdc15f4..d724661 100644
--- a/DeFRaG_Helper/ViewModels/ServerViewModel.cs
+++ b/DeFRaG_Helper/ViewModels/ServerViewModel.cs
@@ -133,11 +133,10 @@ private async void UpdateServerData(object sender, EventArgs e)
 
             await Task.WhenAll(tasks);
 
-
-            //TODO: Make sure the mainview is updated after all servers have been updated
-            // Refresh the SortedServersView on the UI thread after all updates
+            // Refresh the ServersView on the UI thread after all updates
             App.Current.Dispatcher.Invoke(() =>
             {
+                ServersView.Refresh(); // Explicitly refresh the view
                 PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Servers)));
             });
         }
diff --git a/DeFRaG_Helper/Views/Maps.xaml b/DeFRaG_Helper/Views/Maps.xaml
index bc419c0..bda146b 100644
--- a/DeFRaG_Helper/Views/Maps.xaml
+++ b/DeFRaG_Helper/Views/Maps.xaml
@@ -11,7 +11,9 @@
       d:DesignHeight="450" d:DesignWidth="800"
       x:Name="MapsList"
       Title="Mapspage">
-
+    <Page.Resources>
+        <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
+    </Page.Resources>
     <Border CornerRadius="10" Background="#222222">
     <Grid>
         <Grid.RowDefinitions>
diff --git a/DeFRaG_Helper/Views/Settings.xaml b/DeFRaG_Helper/Views/Settings.xaml
index 75310ff..fedab11 100644
--- a/DeFRaG_Helper/Views/Settings.xaml
+++ b/DeFRaG_Helper/Views/Settings.xaml
@@ -45,36 +45,14 @@
 
 
             </ComboBox>
-            <Button Name="btnSync" Content="Sync maps" Margin="636,10,10,0" VerticalAlignment="Top" Height="35" Click="btnSync_Click" IsEnabled="False"/>
-            <TextBox Name="txtGamePath" HorizontalAlignment="Left" FontFamily="Segoe UI" FontSize="14" Height="31" Margin="10,159,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="433"/>
+            <TextBox Name="txtGamePath" HorizontalAlignment="Left" FontFamily="Segoe UI" FontSize="20" Height="32" Margin="10,159,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="433" LostFocus="txtGamePath_LostFocus"/>
             <Label Content="Theme Color" FontFamily="Segoe UI" FontSize="14" Foreground="White" HorizontalAlignment="Left" Height="29" Margin="10,10,0,0" VerticalAlignment="Top" Width="180"/>
             <Label Content="Game Path" FontFamily="Segoe UI" FontSize="14" Foreground="White" HorizontalAlignment="Left" Height="29" Margin="10,125,0,0" VerticalAlignment="Top" Width="180"/>
-            <Button x:Name="btnUpdate" Content="Update Maps" Margin="636,62,10,0" VerticalAlignment="Top" Height="34" Click="btnUpdate_Click" IsEnabled="False"/>
-            <Image x:Name="Icon" Height="30" Width="30" Margin="10,30,0,30" HorizontalAlignment="Left" IsHitTestVisible="False">
-                <Image.Source>
-                    <Binding>
-                        <Binding.Converter>
-                            <converters:DynamicSvgConverter/>
-                        </Binding.Converter>
-                        <Binding.Source>
-                            <sys:String>Icons/Weapons/iconw_rocket.svg</sys:String>
-                        </Binding.Source>
-                    </Binding>
-                </Image.Source>
-            </Image>
-            <Image x:Name="Icon2" Height="30" Width="30" Margin="50,30,0,30" HorizontalAlignment="Left" IsHitTestVisible="False">
-                <Image.Source>
-                    <Binding>
-                        <Binding.Converter>
-                            <converters:DynamicSvgConverter/>
-                        </Binding.Converter>
-                        <Binding.Source>
-                            <sys:String>Icons/Weapons/iconw_shotgun.svg</sys:String>
-                        </Binding.Source>
-                    </Binding>
-                </Image.Source>
-            </Image>
-            <Image Source="{Binding PathToSvg, Converter={StaticResource DynamicSvgConverter}, ConverterParameter='Red'}"/>
+            <Button Content="set" Name="btnSet" HorizontalAlignment="Left" Height="32" Margin="448,159,0,0" VerticalAlignment="Top" Width="56" RenderTransformOrigin="4.143,-2.414" Click="btnSet_Click"/>
+            <CheckBox Content="CheckBox" Style="{StaticResource DarkModeToggleSwitchStyle}" HorizontalAlignment="Left" Margin="10,225,0,0" VerticalAlignment="Top"/>
+            <Label Content="Download Images on Map update" FontFamily="Segoe UI" FontSize="12" Foreground="White" HorizontalAlignment="Left" Height="25" Margin="65,225,0,0" VerticalAlignment="Top" Width="208"/>
+
+
 
 
         </Grid>
diff --git a/DeFRaG_Helper/Views/Settings.xaml.cs b/DeFRaG_Helper/Views/Settings.xaml.cs
index 2531085..cd6d95d 100644
--- a/DeFRaG_Helper/Views/Settings.xaml.cs
+++ b/DeFRaG_Helper/Views/Settings.xaml.cs
@@ -14,6 +14,7 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using WPFFolderBrowser;
 
 namespace DeFRaG_Helper
 {
@@ -60,6 +61,14 @@ private async void ColorComboBox_SelectionChanged(object sender, SelectionChange
             }
         }
 
+        private async void txtGamePath_LostFocus(object sender, RoutedEventArgs e)
+        {
+            // Update the GameDirectoryPath in AppConfig
+            AppConfig.GameDirectoryPath = txtGamePath.Text;
+
+            // Optionally, save the configuration to persist the change
+            await AppConfig.SaveConfigurationAsync();
+        }
 
         private async void btnSync_Click(object sender, RoutedEventArgs e)
         {
@@ -130,6 +139,55 @@ private void btnUpdate_Click(object sender, RoutedEventArgs e)
             });
         }
 
+        private async void btnSet_Click(object sender, RoutedEventArgs e)
+        {
+            await RequestGameDirectoryAsync();
+        }
+
+        //Method to request game directory
+        private async Task<string> RequestGameDirectoryAsync()
+        {
+            // Save the current path from the txtGamePath TextBox
+            string currentPath = txtGamePath.Text;
+
+            // Show the directory selection dialog and get the selected path
+            string selectedPath = await ShowDirectorySelectionDialogAsync();
+
+            // Check if a folder was selected (i.e., the dialog was not canceled)
+            if (!string.IsNullOrEmpty(selectedPath))
+            {
+                // Update the txtGamePath TextBox only if a new folder was selected
+                txtGamePath.Text = selectedPath;
+            }
+            else
+            {
+                // If the dialog was canceled, restore the previous path
+                selectedPath = currentPath;
+            }
+
+            return selectedPath;
+        }
+
+
+        //Method to show a folder selection dialog
+        public static async Task<string> ShowDirectorySelectionDialogAsync()
+        {
+            string folderPath = string.Empty;
+            await Application.Current.Dispatcher.InvokeAsync(() =>
+            {
+                var dialog = new WPFFolderBrowserDialog
+                {
+                    Title = "Select a folder" // You can customize the dialog title here
+                };
+                var result = dialog.ShowDialog();
+                if (result == true) // Check if the dialog was accepted
+                {
+                    folderPath = dialog.FileName; // Get the selected folder path
+                }
+            });
+            return folderPath;
+        }
+
 
     }