Skip to content

Commit 2fdc8dc

Browse files
committed
Done with the whole backend management
1 parent 283c633 commit 2fdc8dc

5 files changed

Lines changed: 31 additions & 23 deletions

File tree

CutCode/DataBase/DataBaseManager.cs

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,30 @@ public class DataBaseManager : IDataBase
2020
private readonly IThemeService themeService;
2121

2222
private string prefpath = "pref.json";
23+
#region Set region
2324
public DataBaseManager(IThemeService _themeService)
2425
{
2526
var path = "DataBase.db";
2627
_db = new SQLiteConnection(path);
2728
_db.CreateTable<CodeTable>();
2829

30+
if (File.Exists(prefpath))
31+
{
32+
string pref = File.ReadAllText(prefpath);
33+
prefModel = JsonConvert.DeserializeObject<PrefModel>(pref);
34+
isLightTheme = prefModel.IsLightTheme;
35+
sortBy = prefModel.SortBy;
36+
}
37+
else
38+
{
39+
isLightTheme = true;
40+
sortBy = "Date";
41+
prefModel = new PrefModel() { IsLightTheme = isLightTheme, SortBy = sortBy};
42+
UpdatePref();
43+
}
44+
2945
themeService = _themeService;
46+
themeService.IsLightTheme = isLightTheme;
3047

3148
AllCodes = new ObservableCollection<CodeBoxModel>();
3249

@@ -42,22 +59,8 @@ public DataBaseManager(IThemeService _themeService)
4259
if (code.isFav) lst.Add(code);
4360
}
4461
FavCodes = lst;
45-
46-
if (File.Exists(prefpath))
47-
{
48-
string pref = File.ReadAllText(prefpath);
49-
prefModel = JsonConvert.DeserializeObject<PrefModel>(pref);
50-
isLightTheme = prefModel.IsLightTheme;
51-
sortBy = prefModel.SortBy;
52-
}
53-
else
54-
{
55-
isLightTheme = true;
56-
sortBy = "Date";
57-
prefModel = new PrefModel() { IsLightTheme = isLightTheme, SortBy = sortBy};
58-
UpdatePref();
59-
}
6062
}
63+
#endregion
6164

6265
#region Preference region
6366

CutCode/Models/CodeBoxModel.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System;
33
using System.Collections.Generic;
44
using System.ComponentModel;
5+
using System.Diagnostics;
56
using System.Linq;
67
using System.Runtime.CompilerServices;
78
using System.Text;

CutCode/ViewModels/MainViewModel.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,12 @@ public MainViewModel(IThemeService themeService, IPageService _pageService, IDat
2929
{
3030
_themeService = themeService;
3131
_themeService.ThemeChanged += ThemeChanged;
32+
_themeService.IsLightTheme = _dataBase.isLightTheme;
3233

3334
pageService = _pageService;
3435
pageService.PageChanged += PageChanged;
3536
pageService.PageRemoteChanged += PageRemoteChanged;
3637

37-
database = _dataBase;
38-
_themeService.IsLightTheme = database.isLightTheme;
39-
4038
sideBarBtns = new ObservableCollection<SideBarBtnModel>();
4139

4240
// there should be some kind of condition here
@@ -47,10 +45,10 @@ public MainViewModel(IThemeService themeService, IPageService _pageService, IDat
4745
sideBarBtns[0].background = _themeService.IsLightTheme ? ColorCon.Convert("#FCFCFC") : ColorCon.Convert("#36393F");
4846

4947

50-
Pages = new List<Object>() { new HomeViewModel(themeService, pageService, database),
51-
new AddViewModel(themeService, pageService, database),
52-
new FavViewModel(themeService, pageService, database),
53-
new SettingViewModel(_themeService, database) };
48+
Pages = new List<Object>() { new HomeViewModel(themeService, pageService, _dataBase),
49+
new AddViewModel(themeService, pageService, _dataBase),
50+
new FavViewModel(themeService, pageService, _dataBase),
51+
new SettingViewModel(_themeService, _dataBase) };
5452
pageService.Page = Pages[0];
5553
}
5654

CutCode/Views/MainView.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@
140140
RenderOptions.BitmapScalingMode="HighQuality" RenderOptions.EdgeMode="Aliased"/>
141141
</Button>
142142

143-
<Button Grid.Column="2" Background="Transparent" Style="{DynamicResource ButtonStyle}" BorderBrush="#ed4245" Margin="0,3,0,5">
143+
<Button Grid.Column="2" Background="Transparent" Style="{DynamicResource ButtonStyle}"
144+
BorderBrush="#ed4245" Margin="0,3,0,5" Click="ExitClicked">
144145
<Image Source="{Binding exitImage}" Width="23" Height="23" Margin="5,4,8,8"
145146
RenderOptions.BitmapScalingMode="HighQuality" RenderOptions.EdgeMode="Aliased"/>
146147
</Button>

CutCode/Views/MainView.xaml.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,10 @@ private void MaximizeClicked(object sender, RoutedEventArgs e)
4444
{
4545
WindowState = WindowState == WindowState.Maximized ? WindowState.Normal : WindowState.Maximized;
4646
}
47+
48+
private void ExitClicked(object sender, RoutedEventArgs e)
49+
{
50+
Close();
51+
}
4752
}
4853
}

0 commit comments

Comments
 (0)