Skip to content

Commit daf25bf

Browse files
AbdesolAbdesol
committed
Added prototype of syncing and sharing
1 parent eb9d3ce commit daf25bf

16 files changed

Lines changed: 292 additions & 66 deletions

‎CutCode/CutCode.csproj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,15 @@
2222
<None Remove="Resources\Images\Icons\edit_white.png" />
2323
<None Remove="Resources\Images\Icons\exit_black.png" />
2424
<None Remove="Resources\Images\Icons\exit_white.png" />
25+
<None Remove="Resources\Images\Icons\export_icon_black.png" />
26+
<None Remove="Resources\Images\Icons\export_icon_white.png" />
2527
<None Remove="Resources\Images\Icons\fav.png" />
2628
<None Remove="Resources\Images\Icons\fav_black.png" />
2729
<None Remove="Resources\Images\Icons\fav_white.png" />
2830
<None Remove="Resources\Images\Icons\home_black.png" />
2931
<None Remove="Resources\Images\Icons\home_white.png" />
32+
<None Remove="Resources\Images\Icons\import_icon_black.png" />
33+
<None Remove="Resources\Images\Icons\import_icon_white.png" />
3034
<None Remove="Resources\Images\Icons\max_black.png" />
3135
<None Remove="Resources\Images\Icons\max_white.png" />
3236
<None Remove="Resources\Images\Icons\min_black.png" />
@@ -35,6 +39,8 @@
3539
<None Remove="Resources\Images\Icons\save_white.png" />
3640
<None Remove="Resources\Images\Icons\settings_black.png" />
3741
<None Remove="Resources\Images\Icons\settings_white.png" />
42+
<None Remove="Resources\Images\Icons\share_black.png" />
43+
<None Remove="Resources\Images\Icons\share_white.png" />
3844
<None Remove="Resources\Images\Icons\toggle_off_black.png" />
3945
<None Remove="Resources\Images\Icons\toggle_off_white.png" />
4046
<None Remove="Resources\Images\Icons\toggle_on_black.png" />
@@ -67,11 +73,15 @@
6773
<Resource Include="Resources\Images\Icons\edit_white.png" />
6874
<Resource Include="Resources\Images\Icons\exit_black.png" />
6975
<Resource Include="Resources\Images\Icons\exit_white.png" />
76+
<Resource Include="Resources\Images\Icons\export_icon_black.png" />
77+
<Resource Include="Resources\Images\Icons\export_icon_white.png" />
7078
<Resource Include="Resources\Images\Icons\fav.png" />
7179
<Resource Include="Resources\Images\Icons\fav_black.png" />
7280
<Resource Include="Resources\Images\Icons\fav_white.png" />
7381
<Resource Include="Resources\Images\Icons\home_black.png" />
7482
<Resource Include="Resources\Images\Icons\home_white.png" />
83+
<Resource Include="Resources\Images\Icons\import_icon_black.png" />
84+
<Resource Include="Resources\Images\Icons\import_icon_white.png" />
7585
<Resource Include="Resources\Images\Icons\max_black.png" />
7686
<Resource Include="Resources\Images\Icons\max_white.png" />
7787
<Resource Include="Resources\Images\Icons\min_black.png" />
@@ -80,6 +90,8 @@
8090
<Resource Include="Resources\Images\Icons\save_white.png" />
8191
<Resource Include="Resources\Images\Icons\settings_black.png" />
8292
<Resource Include="Resources\Images\Icons\settings_white.png" />
93+
<Resource Include="Resources\Images\Icons\share_black.png" />
94+
<Resource Include="Resources\Images\Icons\share_white.png" />
8395
<Resource Include="Resources\Images\Icons\toggle_off_black.png" />
8496
<Resource Include="Resources\Images\Icons\toggle_off_white.png" />
8597
<Resource Include="Resources\Images\Icons\toggle_on_black.png" />

‎CutCode/Models/SideBarBtnModel.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ namespace CutCode
1010
{
1111
public static class SideBarBtns
1212
{
13-
public static List<string> AllSideBarBtns = new List<string>() { "Home", "Add", "Favourite", "Settings"};
14-
public static List<string> SideBarBtnsDarkTheme = new List<string>() { "home_white.png", "add_white.png", "fav_white.png", "settings_white.png" };
15-
public static List<string> SideBarBtnsLightTheme = new List<string>() { "home_black.png", "add_black.png", "fav_black.png", "settings_black.png" };
13+
public static List<string> AllSideBarBtns = new List<string>() { "Home", "Add", "Favourite", "Share","Settings"};
14+
public static List<string> SideBarBtnsDarkTheme = new List<string>() { "home_white.png", "add_white.png", "fav_white.png", "share_white.png", "settings_white.png" };
15+
public static List<string> SideBarBtnsLightTheme = new List<string>() { "home_black.png", "add_black.png", "fav_black.png", "share_black.png", "settings_black.png" };
1616

1717
}
1818
public class SideBarBtnModel : PropertyChangedBase

‎CutCode/Models/SyncBtnModel.cs‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
using Stylet;
2+
using System;
3+
using System.Collections.Generic;
4+
using System.Linq;
5+
using System.Text;
6+
using System.Threading.Tasks;
7+
using System.Windows.Media;
8+
9+
namespace CutCode
10+
{
11+
public class SyncBtnModel : PropertyChangedBase
12+
{
13+
private readonly IThemeService themeService;
14+
public SyncBtnModel(string _text, IThemeService _themeService)
15+
{
16+
themeService = _themeService;
17+
themeService.ThemeChanged += ThemeChanged;
18+
text = _text;
19+
SetAppearance();
20+
}
21+
22+
private void ThemeChanged(object sender, EventArgs e)
23+
{
24+
SetAppearance();
25+
}
26+
27+
private void SetAppearance()
28+
{
29+
textColor = themeService.IsLightTheme ? ColorCon.Convert("#0B0B13") : ColorCon.Convert("#94969A");
30+
backgroundColor = themeService.IsLightTheme ? ColorCon.Convert("#E5E6E8") : ColorCon.Convert("#27282C");
31+
HoverbackgroundColor = themeService.IsLightTheme ? ColorCon.Convert("#DADDE1") : ColorCon.Convert("#202225");
32+
33+
if (text == "Import") img = themeService.IsLightTheme ? "../Resources/Images/Icons/import_icon_black.png" : "../Resources/Images/Icons/import_icon_white.png";
34+
else img = themeService.IsLightTheme ? "../Resources/Images/Icons/export_icon_black.png" : "../Resources/Images/Icons/export_icon_white.png";
35+
}
36+
37+
private string _text;
38+
public string text
39+
{
40+
get => _text;
41+
set { SetAndNotify(ref _text, value); }
42+
}
43+
44+
private SolidColorBrush _textColor;
45+
public SolidColorBrush textColor
46+
{
47+
get => _textColor;
48+
set
49+
{
50+
if (value != _textColor)
51+
{
52+
SetAndNotify(ref _textColor, value);
53+
}
54+
}
55+
}
56+
57+
private string _img;
58+
public string img
59+
{
60+
get => _img;
61+
set { SetAndNotify(ref _img, value); }
62+
}
63+
64+
private SolidColorBrush _backgroundColor;
65+
public SolidColorBrush backgroundColor
66+
{
67+
get => _backgroundColor;
68+
set
69+
{
70+
if (value != _backgroundColor)
71+
{
72+
SetAndNotify(ref _backgroundColor, value);
73+
}
74+
}
75+
}
76+
77+
private SolidColorBrush _HoverbackgroundColor;
78+
public SolidColorBrush HoverbackgroundColor
79+
{
80+
get => _HoverbackgroundColor;
81+
set
82+
{
83+
if (value != _HoverbackgroundColor)
84+
{
85+
SetAndNotify(ref _HoverbackgroundColor, value);
86+
}
87+
}
88+
}
89+
}
90+
}

‎CutCode/Resources/Images/Icons/export_icon_black.png‎

1.36 KB
Loading

‎CutCode/Resources/Images/Icons/export_icon_white.png‎

993 Bytes
Loading

‎CutCode/Resources/Images/Icons/import_icon_black.png‎

1.37 KB
Loading

‎CutCode/Resources/Images/Icons/import_icon_white.png‎

938 Bytes
Loading

‎CutCode/Resources/Images/Icons/share_black.png‎

6.36 KB
Loading

‎CutCode/Resources/Images/Icons/share_white.png‎

8.4 KB
Loading

‎CutCode/ViewModels/MainViewModel.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,15 @@ public MainViewModel(IThemeService themeService, IPageService _pageService, IDat
4040
sideBarBtns.Add(new SideBarBtnModel("Home", _themeService));
4141
sideBarBtns.Add(new SideBarBtnModel("Add", _themeService));
4242
sideBarBtns.Add(new SideBarBtnModel("Favourite", _themeService));
43+
sideBarBtns.Add(new SideBarBtnModel("Share", _themeService));
4344
sideBarBtns.Add(new SideBarBtnModel("Settings", _themeService));
4445
sideBarBtns[0].background = _themeService.IsLightTheme ? ColorCon.Convert("#FCFCFC") : ColorCon.Convert("#36393F");
4546

4647

4748
Pages = new List<Object>() { new HomeViewModel(_themeService, pageService, _dataBase),
4849
new AddViewModel(_themeService, pageService, _dataBase),
49-
new FavViewModel(_themeService, pageService, _dataBase),
50+
new FavViewModel(_themeService, pageService, _dataBase),
51+
new ShareViewModel(_themeService, pageService, _dataBase),
5052
new SettingViewModel(_themeService, _dataBase) };
5153
pageService.Page = Pages[0];
5254
}

0 commit comments

Comments
 (0)