1.2.0 (#13)

* Font selection for map overlay text
o4oren · Jun 23, 2023 · abb2db4 · abb2db4
1 parent f58b66d
commit abb2db4
Show file tree

Hide file tree

Showing 19 changed files with 166 additions and 75 deletions.
diff --git a/FSTRaK/App.config b/FSTRaK/App.config
@@ -70,6 +70,9 @@
       <setting name="IsStartAutomatically" serializeAs="String">
         <value>True</value>
       </setting>
+      <setting name="FontName" serializeAs="String">
+        <value>Slopes</value>
+      </setting>
     </FSTRaK.Properties.Settings>
   </userSettings>
   <connectionStrings>

diff --git a/FSTRaK/App.xaml b/FSTRaK/App.xaml
@@ -8,15 +8,13 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary>
-                    <FontFamily x:Key="Slopes">pack://application:,,,/Resources/Fonts/#Slopes</FontFamily>
-                </ResourceDictionary>
-                <ResourceDictionary Source="Resources/ButtonsTheme.xaml" />
                 <ResourceDictionary Source="Resources/Theme.xaml" />
+                <ResourceDictionary Source="Resources/ButtonsTheme.xaml" />
                 <ResourceDictionary Source="Resources/Images.xaml" />
                 <ResourceDictionary Source="Resources/MapProvidersDictionary.xaml"/>
                 <ResourceDictionary Source="Resources/AircraftIconsDictionary.xaml"/>
             </ResourceDictionary.MergedDictionaries>
+            <FontFamily x:Key="Slopes">pack://application:,,,/Resources/Fonts/#Slopes</FontFamily>
             <BooleanToVisibilityConverter x:Key="BoolToVis" />
         </ResourceDictionary>
     </Application.Resources>

diff --git a/FSTRaK/App.xaml.cs b/FSTRaK/App.xaml.cs
@@ -89,7 +89,10 @@ void OnApplicationStart(object sender, StartupEventArgs args)
             }
         });
 
-        var airportResolver = AirportResolver.Instance;
+        // Set font according to settings
+        FontUtil.SetFont(FSTRaK.Properties.Settings.Default.FontName);
+
+            var airportResolver = AirportResolver.Instance;
 
     }
 

diff --git a/FSTRaK/FSTRaK.csproj b/FSTRaK/FSTRaK.csproj
@@ -150,6 +150,7 @@
     <Compile Include="Models\FlightManager\State\TaxiInState.cs" />
     <Compile Include="Models\FlightManager\State\TaxiOutState.cs" />
     <Compile Include="RelayCommand.cs" />
+    <Compile Include="Utils\FontUtil.cs" />
     <Compile Include="Utils\HyperlinkText.cs" />
     <Compile Include="Utils\MapProviderResolver.cs" />
     <Compile Include="Utils\MathUtils.cs" />

diff --git a/FSTRaK/FSTrAk.csproj b/FSTRaK/FSTrAk.csproj
@@ -150,6 +150,7 @@
     <Compile Include="Models\FlightManager\State\TaxiInState.cs" />
     <Compile Include="Models\FlightManager\State\TaxiOutState.cs" />
     <Compile Include="RelayCommand.cs" />
+    <Compile Include="Utils\FontUtil.cs" />
     <Compile Include="Utils\HyperlinkText.cs" />
     <Compile Include="Utils\MapProviderResolver.cs" />
     <Compile Include="Utils\MathUtils.cs" />

diff --git a/FSTRaK/Properties/AssemblyInfo.cs b/FSTRaK/Properties/AssemblyInfo.cs
@@ -50,6 +50,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.1.0")]
-[assembly: AssemblyFileVersion("1.1.1.0")]
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]
 [assembly: NeutralResourcesLanguage("en")]
diff --git a/FSTRaK/Properties/Settings.Designer.cs b/FSTRaK/Properties/Settings.Designer.cs
diff --git a/FSTRaK/Properties/Settings.settings b/FSTRaK/Properties/Settings.settings
@@ -38,5 +38,8 @@
     <Setting Name="IsStartAutomatically" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="FontName" Type="System.String" Scope="User">
+      <Value Profile="(Default)">Slopes</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/FSTRaK/Resources/Theme.xaml b/FSTRaK/Resources/Theme.xaml
@@ -1,5 +1,10 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:map="clr-namespace:MapControl;assembly=MapControl.WPF">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:map="clr-namespace:MapControl;assembly=MapControl.WPF" xmlns:system="clr-namespace:System;assembly=mscorlib">
+
+
+    <!-- Font params -->
+    <system:String x:Key="ThemeFontName">Slopes</system:String>
+
 
     <!--Pallete-->
     <Color x:Key="PrimaryBright">#F2F5F8</Color>
@@ -234,7 +239,7 @@
                                            Margin="5,5,10,5" 
                                            FontSize="34"
                                            FontWeight="Bold"
-                                           FontFamily="{StaticResource Slopes}"
+                                           FontFamily="{DynamicResource Slopes}"
                                            Foreground="{StaticResource UnselectedTextColor}"/>
                             </Border>
                         </Grid>
@@ -274,7 +279,7 @@
                                        Foreground="{StaticResource BrightTextColor}"
                                        FontSize="24"
                                        Margin="7"
-                                       FontFamily="{StaticResource Slopes}"
+                                       FontFamily="{DynamicResource Slopes}"
                                        TextWrapping="Wrap"
                                        MinWidth="200"/>
                         </Grid>
@@ -322,7 +327,7 @@
            x:Key="FSTrAkLabel">
         <Style.Setters>
             <Setter Property="Background" Value="Transparent" />
-            <Setter Property="FontFamily" Value="{StaticResource Slopes}"/>
+            <Setter Property="FontFamily" Value="{DynamicResource Slopes}"/>
             <Setter Property="FontSize" Value="28" />
             <Setter Property="Foreground" Value="{StaticResource TextColor}" />
         </Style.Setters>
@@ -457,7 +462,7 @@
                         </ContentPresenter>
                         <TextBox x:Name="PART_EditableTextBox"
                    Style="{x:Null}"
-                   FontFamily="{StaticResource Slopes}"
+                   FontFamily="{DynamicResource Slopes}"
                    Template="{StaticResource ComboBoxTextBox}"
                    HorizontalAlignment="Left"
                    VerticalAlignment="Bottom"
@@ -526,7 +531,7 @@
         <Setter Property="SnapsToDevicePixels"
           Value="true" />
         <Setter Property="FontFamily"
-          Value="{StaticResource Slopes}" />
+          Value="{DynamicResource Slopes}" />
         <Setter Property="FontSize"
           Value="20" />
         <Setter Property="OverridesDefaultStyle"
@@ -646,7 +651,7 @@
                             Margin="10 0 10 0" 
                                  BorderThickness="0"
                                  BorderBrush="Transparent" 
-                                 FontFamily="{StaticResource Slopes}" FontSize="22" Foreground="{StaticResource TextColor}"
+                                 FontFamily="{DynamicResource Slopes}" FontSize="22" Foreground="{StaticResource TextColor}"
                                  Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Text, UpdateSourceTrigger=PropertyChanged}"
 
                                  />
@@ -692,7 +697,7 @@
     </Style>
     <Style TargetType="{x:Type MenuItem}">
         <Setter Property="Background" Value="White" />
-        <Setter Property="FontFamily" Value="{StaticResource Slopes}" />
+        <Setter Property="FontFamily" Value="{DynamicResource Slopes}" />
         <Setter Property="FontSize" Value="18" />
         <Setter Property="Foreground" Value="{StaticResource TextColor}" />
         <Setter Property="Template">

diff --git a/FSTRaK/Utils/FontUtil.cs b/FSTRaK/Utils/FontUtil.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FSTRaK.Utils
+{
+    internal class FontUtil
+    {
+        public static void SetFont(string fontName)
+        {
+            var themeDictionary = System.Windows.Application.Current.Resources.MergedDictionaries[0];
+            themeDictionary.Remove("ThemeFontName");
+            themeDictionary.Remove("HeaderFontSize");
+            themeDictionary.Remove("TextFontSize");
+
+            if (fontName == "Slopes")
+            {
+                themeDictionary.Add("ThemeFontName", fontName);
+                themeDictionary.Add("HeaderFontSize", 18.0);
+                themeDictionary.Add("TextFontSize", 22.0);
+            } 
+            else if (fontName == "Arial")
+            {
+                themeDictionary.Add("ThemeFontName", fontName);
+                themeDictionary.Add("HeaderFontSize", 14.0);
+                themeDictionary.Add("TextFontSize", 17.0);
+            }
+        }
+    }
+}
diff --git a/FSTRaK/ViewModels/SettingsViewModel.cs b/FSTRaK/ViewModels/SettingsViewModel.cs
@@ -169,6 +169,25 @@ public bool IsStartAutomatically
             }
         }
 
+
+
+        public ObservableCollection<string> Fonts { get; set; } = new ObservableCollection<string>(new []{"Slopes", "Arial"});
+        private string _fontName = "Slopes";
+        public string FontName
+        {
+            get => _fontName;
+            set
+            {
+                if (value != null && value != _fontName)
+                {
+                    _fontName = value;
+                    FontUtil.SetFont(_fontName);
+                    Properties.Settings.Default.FontName = _fontName;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
         public SettingsViewModel() : base()
         {
             var mapProviders = new ResourceDictionary();
@@ -196,6 +215,7 @@ public void OnLoaded()
             IsStartMinimized = Properties.Settings.Default.IsStartMinimized;
             IsMinimizeToTray = Properties.Settings.Default.IsMinimizeToTray;
             IsStartAutomatically = Properties.Settings.Default.IsStartAutomatically;
+            FontName = Properties.Settings.Default.FontName;
         }
     }
 }
diff --git a/FSTRaK/Views/FlightDetailsParamsView.xaml b/FSTRaK/Views/FlightDetailsParamsView.xaml
@@ -9,7 +9,7 @@
              d:DataContext="{d:DesignInstance Type=viewModels:FlightDetailsParamsViewModel}"
              d:DesignHeight="450" d:DesignWidth="800">
     <StackPanel>
-        <local:OverlayTextCardControl Header="Aircraft:" Text="{Binding Aircraft}" Visibility="Visible"/>
+        <local:OverlayTextCardControl Header="Aircraft" Text="{Binding Aircraft}" Visibility="Visible"/>
 
         <Grid 
             Margin="5"
@@ -29,19 +29,19 @@
             />
             <Label Grid.Row="0"
                    Foreground="{StaticResource BrightTextColor}"
-                   FontSize="18"
-                   Margin="2"
-                   FontFamily="{StaticResource Slopes}"
+                   FontSize="{DynamicResource  HeaderFontSize}"
+                   Margin="5"
+                   FontFamily="{DynamicResource {StaticResource ThemeFontName}}"
                    Content="Flight Data"
                    HorizontalAlignment="Left"
                    VerticalAlignment="Center"
             />
             <TextBlock 
                 Grid.Row="1"                                        
                 Foreground="{StaticResource BrightTextColor}"
-                FontSize="22"
+                FontSize="{DynamicResource  TextFontSize}"
                 Margin="5"
-                FontFamily="{StaticResource Slopes}"
+                FontFamily="{DynamicResource {StaticResource ThemeFontName}}"
                 TextWrapping="Wrap"
                 Text="{Binding ElementName=OverlayTextCard, Path=Text}"
                 HorizontalAlignment="Left"

diff --git a/FSTRaK/Views/FlightDetailsView.xaml b/FSTRaK/Views/FlightDetailsView.xaml
@@ -26,7 +26,7 @@
                         <map:MapItem Location="{Binding Location}">
                             <Canvas Width="50" Height="80">
                                 <Path Data="M 0,0 L 50,0 50,50 25,80 0,50 0,0" Fill="{Binding Color}" Stroke="Wheat" StrokeThickness="2" Width="50"/>
-                                <TextBlock FontSize="14" Foreground="White" Margin="5" TextAlignment="Center" FontFamily="{StaticResource Slopes}" Text="{Binding Text}"/>
+                                <TextBlock FontSize="14" Foreground="White" Margin="5" TextAlignment="Center" FontFamily="{DynamicResource Slopes}" Text="{Binding Text}"/>
                             </Canvas>
                         </map:MapItem>
                     </ControlTemplate>

diff --git a/FSTRaK/Views/LogbookView.xaml b/FSTRaK/Views/LogbookView.xaml
@@ -121,10 +121,10 @@
                                 <RowDefinition />
                                 <RowDefinition />
                             </Grid.RowDefinitions>
-                            <TextBlock Grid.Row="0" Grid.Column="0" HorizontalAlignment="Left" FontFamily="{StaticResource Slopes}" FontSize="20" Foreground="{StaticResource TextColor}">
+                            <TextBlock Grid.Row="0" Grid.Column="0" HorizontalAlignment="Left" FontFamily="{DynamicResource Slopes}" FontSize="20" Foreground="{StaticResource TextColor}">
                                 <Run Text="{Binding DepartureAirport, Mode=OneTime}"/>
                             </TextBlock>
-                            <TextBlock Grid.Column="0" Grid.Row="1" HorizontalAlignment="Left" FontFamily="{StaticResource Slopes}" FontSize="16" Foreground="{StaticResource TextColor}">
+                            <TextBlock Grid.Column="0" Grid.Row="1" HorizontalAlignment="Left" FontFamily="{DynamicResource Slopes}" FontSize="16" Foreground="{StaticResource TextColor}">
                                 <Run Text="{Binding StartTime, Mode=OneTime}"/>
                             </TextBlock>
 
@@ -140,16 +140,16 @@
                                 </Path>
                             </ContentControl>
 
-                            <TextBlock Grid.Row="0" Grid.Column="2" HorizontalAlignment="Left" FontFamily="{StaticResource Slopes}" FontSize="20" Foreground="{StaticResource TextColor}">
+                            <TextBlock Grid.Row="0" Grid.Column="2" HorizontalAlignment="Left" FontFamily="{DynamicResource Slopes}" FontSize="20" Foreground="{StaticResource TextColor}">
                                 <Run Text="{Binding ArrivalAirport, Mode=OneTime}"/>
                             </TextBlock>
-                            <TextBlock Grid.Column="2" Grid.Row="1" HorizontalAlignment="Left" FontFamily="{StaticResource Slopes}" FontSize="16" Foreground="{StaticResource TextColor}">
+                            <TextBlock Grid.Column="2" Grid.Row="1" HorizontalAlignment="Left" FontFamily="{DynamicResource Slopes}" FontSize="16" Foreground="{StaticResource TextColor}">
                                 <Run Text="{Binding EndTime, Mode=OneTime}"/>
                             </TextBlock>
                         </Grid>
 
                         <TextBlock
-                            FontFamily="{StaticResource Slopes}" FontSize="20" Foreground="{StaticResource TextColor}">
+                            FontFamily="{DynamicResource Slopes}" FontSize="20" Foreground="{StaticResource TextColor}">
                             <Run Text="{Binding FlightDistanceNm, StringFormat=N2}"/> NM / <Run Text="{Binding FlightTime}"/>
                             <LineBreak />
                             <Run Text="{Binding Path=Aircraft.Manufacturer}"/> <Run Text="{Binding Path=Aircraft.AircraftType}"/>, <Run Text="{Binding Path=Aircraft.TailNumber}"/>

diff --git a/FSTRaK/Views/MainWindow.xaml b/FSTRaK/Views/MainWindow.xaml
@@ -57,7 +57,7 @@
                     <Canvas Width="128" Height="47" >
                         <StaticResource ResourceKey="logo"/>
                     </Canvas>
-                    <Label FontSize="30" FontWeight="Bold" Foreground="{StaticResource TextColor}" FontFamily="{StaticResource Slopes}" HorizontalAlignment="Center" VerticalAlignment="Center">FSTrAk</Label>
+                    <Label FontSize="30" FontWeight="Bold" Foreground="{StaticResource TextColor}" FontFamily="{DynamicResource Slopes}" HorizontalAlignment="Center" VerticalAlignment="Center">FSTrAk</Label>
 
                 </StackPanel>
             </Border>

diff --git a/FSTRaK/Views/MainWindow.xaml.cs b/FSTRaK/Views/MainWindow.xaml.cs
@@ -75,13 +75,10 @@ private void OnLoad(object sender, RoutedEventArgs e)
             ImageLoader.HttpClient.DefaultRequestHeaders.Add("User-Agent", "FSTrAk - Flight Simulator logbook and tracker");
             TileImageLoader.Cache = new SQLiteCache(PathUtil.GetApplicationLocalDataPath());
 
-
-
             if (Properties.Settings.Default.IsStartMinimized)
             {
                 WindowState = WindowState.Minimized;
             }
-
         }
 
         private void ButtonClick_CloseApplication (object sender, RoutedEventArgs e) 

diff --git a/FSTRaK/Views/OverlayTextCardControl.xaml b/FSTRaK/Views/OverlayTextCardControl.xaml
@@ -26,9 +26,9 @@
         <Label Grid.Row="0"
                x:Name="header"
                        Foreground="{StaticResource BrightTextColor}"
-                       FontSize="18"
-                       Margin="2"
-                       FontFamily="{StaticResource Slopes}"
+                       FontSize="{DynamicResource HeaderFontSize}"
+                       Margin="5"
+                       FontFamily="{DynamicResource {StaticResource ThemeFontName}}"
                        Content="{Binding ElementName=OpverlayTextCard, Path=Header}"
                        HorizontalAlignment="Left"
                        VerticalAlignment="Center"
@@ -37,9 +37,9 @@
                 x:Name="text"
                 Grid.Row="1"                                        
                        Foreground="{StaticResource BrightTextColor}"
-                       FontSize="22"
+                       FontSize="{DynamicResource TextFontSize}"
                        Margin="5"
-                       FontFamily="{StaticResource Slopes}"
+                       FontFamily="{DynamicResource {StaticResource ThemeFontName}}"
                        TextWrapping="Wrap"
                        Text="{Binding ElementName=OpverlayTextCard, Path=Text}"
                        HorizontalAlignment="Left"