refactor: source files are transfered to resources, preference deacti…

…vated for deploying.
eymenefealtun · Aug 29, 2023 · ee9378f · ee9378f
1 parent 50cafc4
commit ee9378f
Show file tree

Hide file tree

Showing 20 changed files with 431 additions and 109 deletions.
diff --git a/TarotType.Main/MainWindow.xaml b/TarotType.Main/MainWindow.xaml
@@ -12,7 +12,8 @@
         WindowStartupLocation="CenterScreen"
         Background="#eeeee4">
 
-    <Grid x:Name="mainGrid">
+    <Grid x:Name="mainGrid"
+          Loaded="mainGrid_Loaded">
 
         <Grid>
             <StackPanel Orientation="Horizontal"

diff --git a/TarotType.Main/MainWindow.xaml.cs b/TarotType.Main/MainWindow.xaml.cs
@@ -1,12 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Threading;
 using TarotType.Main.Settings;
 using TarotType.Main.Utilities;
+using TarotType.Main.Utilities.Words.EnglishFolder;
 using TarotType.Main.View;
 
 namespace TarotType.Main
@@ -32,6 +34,7 @@ public partial class MainWindow : Window
         bool _isTextBoxChangedCanFire;
         bool _isStartedBefore;
         bool _canComboBoxChangedFired = false;
+        bool _canSettignsChange = false;
 
         string[] _sourceWords;
 
@@ -41,6 +44,7 @@ public partial class MainWindow : Window
         public MainWindow()
         {
             InitializeComponent();
+
             _words1 = new List<Label>();
             _words2 = new List<Label>();
 
@@ -49,8 +53,15 @@ public MainWindow()
             _dispatcherTimer.Tick += new EventHandler(dispatcherTimer_Tick);
             _dispatcherTimer.Interval = new TimeSpan(0, 0, 1);
 
-            Preferences.GetPreferences(btnTheme, this, cBoxLanguages);
+
+            SourceManager.CurrentLanguage = new English();
+            Preferences.CurrentTheme = _lightThemeCode;
+            Preferences.LanguageName = "English";
+            cBoxLanguages.SelectedValue = "English";
+
+            //Preferences.GetPreferences(btnTheme, this, cBoxLanguages);
             _sourceWords = SourceManager.GetLanguageArray(SourceManager.CurrentLanguage);
+            //_sourceWords = SourceManager.GetLanguageArray();
 
             if (SourceManager.CurrentLanguage.FlowDirection() == SourceManager.flowDirections.right)
             {
@@ -62,7 +73,7 @@ public MainWindow()
             RefreshGame();
         }
 
-        public bool IsRefreshing = false; 
+        public bool IsRefreshing = false;
         private void btnRefresh_Click(object sender, RoutedEventArgs e)
         {
             IsRefreshing = true;
@@ -240,7 +251,7 @@ private void RefreshStack(StackPanel panel, List<Label> labels)
 
             string[] wordArray = WordManager.GetRandomWord(20, _sourceWords);
 
-            int currentLength = 0;          
+            int currentLength = 0;
 
             for (int i = 0; i < wordArray.Length; i++)
             {
@@ -264,39 +275,32 @@ private void RefreshStack(StackPanel panel, List<Label> labels)
                 labels.Add(lbl);
                 panel.Children.Insert(i, lbl);
 
-                if (SourceManager.CurrentLanguage.FlowDirection() == SourceManager.flowDirections.right)
-                    panel.FlowDirection = FlowDirection.RightToLeft;
-                else
-                    panel.FlowDirection = FlowDirection.LeftToRight;
+                panel.FlowDirection = SourceManager.CurrentLanguage.FlowDirection() == SourceManager.flowDirections.right ? FlowDirection.RightToLeft : FlowDirection.LeftToRight;
             }
         }
 
         private void btnTheme_Click(object sender, RoutedEventArgs e)
         {
-            if (btnTheme.IsChecked == false)
-                Preferences.ThemeHexCode = _darkThemeCode;
-            else
-                Preferences.ThemeHexCode = _lightThemeCode;
-
-            SettingsChanged(Preferences.ThemeHexCode, cBoxLanguages.SelectedValue.ToString());
+            Preferences.CurrentTheme = btnTheme.IsChecked == false ? _darkThemeCode : _lightThemeCode;
+            SettingsChanged(Preferences.CurrentTheme, cBoxLanguages.SelectedValue.ToString());
         }
 
         private void cBoxLanguages_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (_canComboBoxChangedFired == false)
-            {
-                _canComboBoxChangedFired = true;
-                return;
-            }
-                            
+            //if (_canComboBoxChangedFired == false)
+            //{
+            //    _canComboBoxChangedFired = true;
+            //    return;
+            //}
+
 
-            SettingsChanged(Preferences.ThemeHexCode,cBoxLanguages.SelectedValue.ToString());
+            SettingsChanged(Preferences.CurrentTheme, cBoxLanguages.SelectedValue.ToString());
 
             Mouse.OverrideCursor = Cursors.Wait;
 
             _sourceWords = SourceManager.GetLanguageArray(SourceManager.CurrentLanguage);
 
-            if (SourceManager.CurrentLanguage.FlowDirection() == SourceManager.flowDirections.right)            
+            if (SourceManager.CurrentLanguage.FlowDirection() == SourceManager.flowDirections.right)
             {
                 tboxWrite.FlowDirection = FlowDirection.RightToLeft;
                 stckPanel1.FlowDirection = FlowDirection.RightToLeft;
@@ -316,12 +320,27 @@ private void cBoxLanguages_SelectionChanged(object sender, SelectionChangedEvent
 
         private void SettingsChanged(string themeCode, string languageName)
         {
-            Preferences.ThemeHexCode = themeCode;
+            if (_canSettignsChange == false)
+            {
+                _canSettignsChange = true;          
+                return;
+            }
+
+            Preferences.CurrentTheme = themeCode;
             Preferences.LanguageName = languageName;
-            Preferences.SetPreferences();
-            Preferences.GetPreferences(btnTheme, this, cBoxLanguages);
+            SourceManager.CurrentLanguage = SourceManager._languageDictionary.FirstOrDefault(x => x.Value.ToString() == Preferences.LanguageName).Key;
+            this.Background = (SolidColorBrush)new BrushConverter().ConvertFrom(Preferences.CurrentTheme);
+
+
+            //this.Background = (SolidColorBrush)new BrushConverter().ConvertFrom(Preferences.CurrentTheme);
+            //Preferences.SetPreferences();
+            //Preferences.GetPreferences(btnTheme, this, cBoxLanguages);
         }
 
+        private void mainGrid_Loaded(object sender, RoutedEventArgs e)
+        {
+
+        }
     }
 
 }
diff --git a/TarotType.Main/Properties/Resources.Designer.cs b/TarotType.Main/Properties/Resources.Designer.cs