Done fixing the order type and light theme config

Abdesol · Abdesol · commit 283c63330682 · 2021-08-08T11:40:49.000+03:00
diff --git a/CutCode/CutCode.csproj b/CutCode/CutCode.csproj
@@ -46,6 +46,7 @@
 
   <ItemGroup>
     <PackageReference Include="AvalonEdit" Version="6.1.2.30" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="sqlite-net-pcl" Version="1.7.335" />
     <PackageReference Include="Stylet" Version="1.3.6" />
   </ItemGroup>
diff --git a/CutCode/DataBase/DataBaseManager.cs b/CutCode/DataBase/DataBaseManager.cs
@@ -7,6 +7,8 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Newtonsoft.Json;
+using System.IO;
 
 namespace CutCode
 {
@@ -16,6 +18,8 @@ public class DataBaseManager : IDataBase
         public ObservableCollection<CodeBoxModel> FavCodes { get; set; }
         private SQLiteConnection _db;
         private readonly IThemeService themeService;
+
+        private string prefpath = "pref.json";
         public DataBaseManager(IThemeService _themeService)
         {
             var path = "DataBase.db";
@@ -38,8 +42,47 @@ public DataBaseManager(IThemeService _themeService)
                 if (code.isFav) lst.Add(code);
             }
             FavCodes = lst;
+
+            if (File.Exists(prefpath))
+            {
+                string pref = File.ReadAllText(prefpath);
+                prefModel = JsonConvert.DeserializeObject<PrefModel>(pref);
+                isLightTheme = prefModel.IsLightTheme;
+                sortBy = prefModel.SortBy;
+            }
+            else
+            {
+                isLightTheme = true;
+                sortBy = "Date";
+                prefModel = new PrefModel() { IsLightTheme = isLightTheme, SortBy = sortBy};
+                UpdatePref();
+            }
+        }
+
+        #region Preference region
+
+        private PrefModel prefModel = new PrefModel();
+        public bool isLightTheme { get; set; }
+        public string sortBy { get; set; }
+
+        public void ChangeSort(string sort) 
+        {
+            prefModel.SortBy = sort;
+            UpdatePref();
+        } 
+        public void ChangeTheme(bool IsLightTheme)
+        {
+            prefModel.IsLightTheme = IsLightTheme;
+            UpdatePref();
+        }
+        private void UpdatePref()
+        {
+            var json = JsonConvert.SerializeObject(prefModel);
+            File.WriteAllText(prefpath, json);
         }
 
+        #endregion
+
         private int GetIndex(CodeBoxModel code)
         {
             int ind = 0;
@@ -155,6 +198,8 @@ public ObservableCollection<CodeBoxModel> OrderCode(string order)
                 if (ind == 0) lst = new ObservableCollection<CodeBoxModel>(currentCodes.OrderBy(x => x.title).ToList());
                 else if(ind == 1) lst = new ObservableCollection<CodeBoxModel>(currentCodes.OrderBy(x => x.timestamp).ToList());
                 else lst = AllCodes;
+
+                if (ind == 0 || ind == 1) ChangeSort(AllOrderKind[ind]);
             }
 
             if (ind < 2) AllCodes = lst;
@@ -189,10 +234,9 @@ public ObservableCollection<CodeBoxModel> SearchCode(string text, string from)
             var currentCode = from == "Home" ? AllCodes : FavCodes;
 
             var lst = new ObservableCollection<CodeBoxModel>();
-            foreach(var code in currentCode)
+            var lst2 = new ObservableCollection<CodeBoxModel>();
+            foreach (var code in currentCode)
             {
-                bool add = false;
-
                 int f = 0;
                 if (code.title.Length >= text.Length)
                 {
@@ -207,16 +251,15 @@ public ObservableCollection<CodeBoxModel> SearchCode(string text, string from)
                 }
                 else continue;
 
-                if (code.title == text) add = true;
+                if (code.title == text) lst.Add(code);
                 else if (code.title.Length < 3)
                 {
-                    if (f >= 1) add = true;
+                    if (f >= 1) lst2.Add(code);
                 }
-                else if (f >= 3) add = true;
-
-                if (add) lst.Add(code);
+                else if (f >= 3) lst2.Add(code);
             }
 
+            lst.Concat(lst2);
             return lst;
         }
     }
diff --git a/CutCode/DataBase/pref.json b/CutCode/DataBase/pref.json
@@ -0,0 +1,4 @@
+{
+  "IsLightTheme": true,
+  "SortBy": "Date"
+}
diff --git a/CutCode/Interfaces/IDataBase.cs b/CutCode/Interfaces/IDataBase.cs
@@ -19,5 +19,11 @@ public interface IDataBase
         ObservableCollection<CodeBoxModel> OrderCode(string order);
         bool FavModify(CodeBoxModel code);
         ObservableCollection<CodeBoxModel> SearchCode(string text, string from);
+
+        bool isLightTheme { get; set; }
+        string sortBy { get; set; }
+
+        void ChangeSort(string sort);
+        void ChangeTheme(bool IsLightTheme);
     }
 }
diff --git a/CutCode/Models/PrefModel.cs b/CutCode/Models/PrefModel.cs
@@ -0,0 +1,18 @@
+﻿using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CutCode
+{
+    public class PrefModel
+    {
+        [JsonProperty("IsLightTheme")]
+        public bool IsLightTheme { get; set; }
+
+        [JsonProperty("SortBy")]
+        public string SortBy { get; set; }
+    }
+}
diff --git a/CutCode/ViewModels/AddViewModel.cs b/CutCode/ViewModels/AddViewModel.cs
@@ -30,7 +30,6 @@ public AddViewModel(IThemeService _themeService, IPageService _pageService, IDat
                 "Javascript", "Kotlin", "Php", "C", "Ruby", "Rust","Sql", "Swift"
             };
             leftText = "";
-            CurrentLang = AllLangs[0];
             SetAppearance();
         }
         private void ThemeChanged(Object sender, EventArgs e)
@@ -141,7 +140,7 @@ public void SaveCommand()
                 pageService.remoteChange = "Home";
                 pageService.Page = new CodeViewModel(themeService, pageService, database, codeModel);
 
-                title = ""; desc = ""; code = ""; CurrentLang = AllLangs[0]; 
+                MainViewModel.Pages[1] = new AddViewModel(themeService, pageService, database);
             }
         }
 
@@ -150,7 +149,7 @@ public void CancelCommand()
             pageService.remoteChange = "Home";
             pageService.Page = MainViewModel.Pages[0];
 
-            title = ""; desc = ""; code = ""; CurrentLang = AllLangs[0];
+            MainViewModel.Pages[1] = new AddViewModel(themeService, pageService, database);
         }
     }
 }
diff --git a/CutCode/ViewModels/HomeViewModel.cs b/CutCode/ViewModels/HomeViewModel.cs
@@ -27,6 +27,8 @@ public HomeViewModel(IThemeService _themeService, IPageService _pageService, IDa
             AllCodes = database.AllCodes;
             database.AllCodesUpdated += AllCodesUpdated;
 
+            sortby = database.sortBy == "Date" ? 0 : 1;
+
             SetAppearance();
             IsSearched = false;
 
@@ -136,6 +138,7 @@ public Visibility codesVis
             get => _codesVis;
             set => SetAndNotify(ref _codesVis, value);
         }
+        public int sortby { get; set; }
 
         private string _emptyLabel;
         public string emptyLabel
@@ -166,7 +169,11 @@ public string CurrentSort1
             set
             {
                 SetAndNotify(ref _CurrentSort1, value);
-                Application.Current.Dispatcher.Invoke(new Action(() => { ComboBoxItemSelected(value); }));
+                Application.Current.Dispatcher.Invoke(new Action(() => 
+                { 
+                    ComboBoxItemSelected(value);
+                    database.sortBy = value;
+                }));
             }
         }
 
diff --git a/CutCode/ViewModels/MainViewModel.cs b/CutCode/ViewModels/MainViewModel.cs
@@ -29,13 +29,13 @@ public MainViewModel(IThemeService themeService, IPageService _pageService, IDat
         {
             _themeService = themeService;
             _themeService.ThemeChanged += ThemeChanged;
-            _themeService.IsLightTheme = false;
 
             pageService = _pageService;
             pageService.PageChanged += PageChanged;
             pageService.PageRemoteChanged += PageRemoteChanged;
 
             database = _dataBase;
+            _themeService.IsLightTheme = database.isLightTheme;
 
             sideBarBtns = new ObservableCollection<SideBarBtnModel>();
 
@@ -50,7 +50,7 @@ public MainViewModel(IThemeService themeService, IPageService _pageService, IDat
             Pages = new List<Object>() {    new HomeViewModel(themeService, pageService, database), 
                                             new AddViewModel(themeService, pageService, database), 
                                             new FavViewModel(themeService, pageService, database), 
-                                            new SettingViewModel(_themeService) };
+                                            new SettingViewModel(_themeService, database) };
             pageService.Page = Pages[0];
         }
 
diff --git a/CutCode/ViewModels/SettingViewModel.cs b/CutCode/ViewModels/SettingViewModel.cs
@@ -15,9 +15,11 @@ public class SettingViewModel : Screen
     {
         public ObservableCollection<ThemeButtonModel> themeBtns { get; set; }
         private readonly IThemeService themeService;
-
-        public SettingViewModel(IThemeService _themeService)
+        private readonly IDataBase database;
+        public SettingViewModel(IThemeService _themeService, IDataBase _database)
         {
+            database = _database;
+
             themeService = _themeService;
             themeService.ThemeChanged += ThemeChanged;
 
@@ -60,7 +62,11 @@ public SolidColorBrush cardBackgroundColor
                 }
             }
         }
-        public void ThemeChangeCommand(string selectedTheme) => themeService.IsLightTheme = selectedTheme == "Light Mode" ?  true : false;
+        public void ThemeChangeCommand(string selectedTheme) 
+        {
+            themeService.IsLightTheme = selectedTheme == "Light Mode" ? true : false;
+            database.ChangeTheme(themeService.IsLightTheme);
+        } 
 
     }
 }
diff --git a/CutCode/Views/HomeView.xaml b/CutCode/Views/HomeView.xaml
@@ -43,7 +43,7 @@
                    FontSize="12" FontFamily="{StaticResource poppins_regular}"/>
             <ComboBox x:Name="sortCombobox" Grid.Row="1" Height="30" Width="150" Text="Sort by" Margin="5,5,15,5" BorderThickness="0"
                       Foreground="{Binding searchBarTextColor}"   FontFamily="{StaticResource poppins_regular}"
-                        Background="{Binding comboboxBackgroundColor}"  SelectedIndex="0"
+                        Background="{Binding comboboxBackgroundColor}"  SelectedIndex="{Binding sortby}"
                         IsDropDownOpen="false" Style="{StaticResource comboBoxStyle}" 
                       SelectedValue="{Binding CurrentSort1}" ItemsSource="{Binding Sorts}"
                       BorderBrush="{Binding comboboxHoverColor}">

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "IsLightTheme": true,
 +  "SortBy": "Date"
 +}
Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,11 @@ public interface IDataBase`
`19`	`19`	`ObservableCollection<CodeBoxModel> OrderCode(string order);`
`20`	`20`	`bool FavModify(CodeBoxModel code);`
`21`	`21`	`ObservableCollection<CodeBoxModel> SearchCode(string text, string from);`
	`22`	`+`
	`23`	`+ bool isLightTheme { get; set; }`
	`24`	`+ string sortBy { get; set; }`
	`25`	`+`
	`26`	`+ void ChangeSort(string sort);`
	`27`	`+ void ChangeTheme(bool IsLightTheme);`
`22`	`28`	`}`
`23`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ public AddViewModel(IThemeService _themeService, IPageService _pageService, IDat`
`30`	`30`	`"Javascript", "Kotlin", "Php", "C", "Ruby", "Rust","Sql", "Swift"`
`31`	`31`	`};`
`32`	`32`	`leftText = "";`
`33`		`- CurrentLang = AllLangs[0];`
`34`	`33`	`SetAppearance();`
`35`	`34`	`}`
`36`	`35`	`private void ThemeChanged(Object sender, EventArgs e)`
`@@ -141,7 +140,7 @@ public void SaveCommand()`
`141`	`140`	`pageService.remoteChange = "Home";`
`142`	`141`	`pageService.Page = new CodeViewModel(themeService, pageService, database, codeModel);`
`143`	`142`
`144`		`- title = ""; desc = ""; code = ""; CurrentLang = AllLangs[0];`
	`143`	`+ MainViewModel.Pages[1] = new AddViewModel(themeService, pageService, database);`
`145`	`144`	`}`
`146`	`145`	`}`
`147`	`146`
`@@ -150,7 +149,7 @@ public void CancelCommand()`
`150`	`149`	`pageService.remoteChange = "Home";`
`151`	`150`	`pageService.Page = MainViewModel.Pages[0];`
`152`	`151`
`153`		`- title = ""; desc = ""; code = ""; CurrentLang = AllLangs[0];`
	`152`	`+ MainViewModel.Pages[1] = new AddViewModel(themeService, pageService, database);`
`154`	`153`	`}`
`155`	`154`	`}`
`156`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@ public HomeViewModel(IThemeService _themeService, IPageService _pageService, IDa`
`27`	`27`	`AllCodes = database.AllCodes;`
`28`	`28`	`database.AllCodesUpdated += AllCodesUpdated;`
`29`	`29`
	`30`	`+ sortby = database.sortBy == "Date" ? 0 : 1;`
	`31`	`+`
`30`	`32`	`SetAppearance();`
`31`	`33`	`IsSearched = false;`
`32`	`34`
`@@ -136,6 +138,7 @@ public Visibility codesVis`
`136`	`138`	`get => _codesVis;`
`137`	`139`	`set => SetAndNotify(ref _codesVis, value);`
`138`	`140`	`}`
	`141`	`+ public int sortby { get; set; }`
`139`	`142`
`140`	`143`	`private string _emptyLabel;`
`141`	`144`	`public string emptyLabel`
`@@ -166,7 +169,11 @@ public string CurrentSort1`
`166`	`169`	`set`
`167`	`170`	`{`
`168`	`171`	`SetAndNotify(ref _CurrentSort1, value);`
`169`		`- Application.Current.Dispatcher.Invoke(new Action(() => { ComboBoxItemSelected(value); }));`
	`172`	`+ Application.Current.Dispatcher.Invoke(new Action(() =>`
	`173`	`+ {`
	`174`	`+ ComboBoxItemSelected(value);`
	`175`	`+ database.sortBy = value;`
	`176`	`+ }));`
`170`	`177`	`}`
`171`	`178`	`}`
`172`	`179`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,11 @@ public class SettingViewModel : Screen`
`15`	`15`	`{`
`16`	`16`	`public ObservableCollection<ThemeButtonModel> themeBtns { get; set; }`
`17`	`17`	`private readonly IThemeService themeService;`
`18`		`-`
`19`		`- public SettingViewModel(IThemeService _themeService)`
	`18`	`+ private readonly IDataBase database;`
	`19`	`+ public SettingViewModel(IThemeService _themeService, IDataBase _database)`
`20`	`20`	`{`
	`21`	`+ database = _database;`
	`22`	`+`
`21`	`23`	`themeService = _themeService;`
`22`	`24`	`themeService.ThemeChanged += ThemeChanged;`
`23`	`25`
`@@ -60,7 +62,11 @@ public SolidColorBrush cardBackgroundColor`
`60`	`62`	`}`
`61`	`63`	`}`
`62`	`64`	`}`
`63`		`- public void ThemeChangeCommand(string selectedTheme) => themeService.IsLightTheme = selectedTheme == "Light Mode" ? true : false;`
	`65`	`+ public void ThemeChangeCommand(string selectedTheme)`
	`66`	`+ {`
	`67`	`+ themeService.IsLightTheme = selectedTheme == "Light Mode" ? true : false;`
	`68`	`+ database.ChangeTheme(themeService.IsLightTheme);`
	`69`	`+ }`
`64`	`70`
`65`	`71`	`}`
`66`	`72`	`}`