Skip to content

Commit 65f785e

Browse files
wtcpythonwtcpython
committed
主页链接和收藏夹同步
1 parent c62cb8f commit 65f785e

File tree

10 files changed

+28
-170
lines changed

10 files changed

+28
-170
lines changed

‎Controls/FavoriteList.xaml.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public FavoriteList()
1616
{
1717
this.InitializeComponent();
1818
SetItemsPanel(HorizontalTemplate);
19-
listView.ItemsSource = App.settings.Favorites;
19+
listView.ItemsSource = Info.Favorites;
2020
}
2121

2222
public void SetItemsPanel(ItemsPanelTemplate itemsPanelTemplate)
@@ -82,7 +82,7 @@ private void CopyFavoriteWebsite(object sender, RoutedEventArgs e)
8282
private void DeleteFavoriteWebsite(object sender, RoutedEventArgs e)
8383
{
8484
WebsiteInfo info = (sender as MenuFlyoutItem).DataContext as WebsiteInfo;
85-
App.settings.Favorites.Remove(info);
85+
Info.Favorites.Remove(info);
8686
}
8787
}
8888
}

‎Data/DefaultSettings.json‎

Lines changed: 1 addition & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -14,67 +14,5 @@
1414
"ForwardButton": true,
1515
"HistoryButton": true,
1616
"DownloadButton": true
17-
},
18-
"Favorites": [
19-
{
20-
"Name": "百度",
21-
"Icon": "https://www.baidu.com/favicon.ico",
22-
"Uri": "https://www.baidu.com"
23-
},
24-
{
25-
"Name": "B 站",
26-
"Icon": "https://www.bilibili.com/favicon.ico",
27-
"Uri": "https://www.bilibili.com"
28-
},
29-
{
30-
"Name": "抖音",
31-
"Icon": "https://www.douyin.com/favicon.ico",
32-
"Uri": "https://www.douyin.com"
33-
},
34-
{
35-
"Name": "爱奇艺",
36-
"Icon": "https://www.iqiyi.com/favicon.ico",
37-
"Uri": "https://www.iqiyi.com"
38-
},
39-
{
40-
"Name": "4399",
41-
"Icon": "https://www.4399.com/favicon.ico",
42-
"Uri": "https://www.4399.com"
43-
},
44-
{
45-
"Name": "京东",
46-
"Icon": "https://www.jd.com/favicon.ico",
47-
"Uri": "https://www.jd.com"
48-
},
49-
{
50-
"Name": "淘宝",
51-
"Icon": "https://www.taobao.com/favicon.ico",
52-
"Uri": "https://www.taobao.com"
53-
},
54-
{
55-
"Name": "360 搜索",
56-
"Icon": "https://www.so.com/favicon.ico",
57-
"Uri": "https://www.so.com/"
58-
},
59-
{
60-
"Name": "天猫",
61-
"Icon": "https://www.tmall.com/favicon.ico",
62-
"Uri": "https://www.tmall.com"
63-
},
64-
{
65-
"Name": "QQ 邮箱",
66-
"Icon": "https://mail.qq.com/favicon.ico",
67-
"Uri": "https://mail.qq.com"
68-
},
69-
{
70-
"Name": "腾讯视频",
71-
"Icon": "https://v.qq.com/favicon.ico",
72-
"Uri": "https://v.qq.com"
73-
},
74-
{
75-
"Name": "小红书",
76-
"Icon": "https://www.xiaohongshu.com/favicon.ico",
77-
"Uri": "https://www.xiaohongshu.com"
78-
}
79-
]
17+
}
8018
}

‎Data/Favorites.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
[
2+
{
3+
"Name": "百度",
4+
"Icon": "https://www.baidu.com/favicon.ico",
5+
"Uri": "https://www.baidu.com"
6+
},
7+
{
8+
"Name": "B 站",
9+
"Icon": "https://www.bilibili.com/favicon.ico",
10+
"Uri": "https://www.bilibili.com"
11+
},
12+
{
13+
"Name": "Deepseek",
14+
"Icon": "https://www.deepseek.com/favicon.ico",
15+
"Uri": "https://chat.deepseek.com"
16+
}
17+
]

‎Data/SuggestWebsite.json‎

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎JsonLoad.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,9 @@ public class Settings
2424
public string SearchEngine { get; set; }
2525
public bool ShowBackground { get; set; }
2626
public bool ShowFlyoutWhenStartDownloading { get; set; }
27-
public bool ShowSuggestUri { get; set; }
2827
public string SpecificUri { get; set; }
2928
public int StartBehavior { get; set; }
3029
public Dictionary<string, bool> ToolBar { get; set; }
31-
public ObservableCollection<WebsiteInfo> Favorites { get; set; }
3230
}
3331

3432
public class WebsiteInfo
@@ -50,7 +48,7 @@ public static class Info
5048
public static Dictionary<string, string> LanguageDict = JsonSerializer.Deserialize(File.ReadAllText("./Data/LanguageType.json"), JsonContext.Default.DictionaryStringString);
5149
public static Dictionary<string, string> ImageDict = JsonSerializer.Deserialize(File.ReadAllText("./Data/ImageType.json"), JsonContext.Default.DictionaryStringString);
5250
public static List<WebsiteInfo> SearchEngineList = JsonSerializer.Deserialize(File.ReadAllText("./Data/SearchEngine.json"), JsonContext.Default.ListWebsiteInfo);
53-
public static ObservableCollection<WebsiteInfo> SuggestWebsiteList = JsonSerializer.Deserialize(File.ReadAllText("./Data/SuggestWebsite.json"), JsonContext.Default.ObservableCollectionWebsiteInfo);
51+
public static ObservableCollection<WebsiteInfo> Favorites = JsonSerializer.Deserialize(File.ReadAllText("./Data/Favorites.json"), JsonContext.Default.ObservableCollectionWebsiteInfo);
5452

5553
public static Settings LoadSettings(bool overwrite = false)
5654
{

‎Pages/HomePage.xaml‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
CornerRadius="15" FontSize="18"/>
2323

2424
<GridView Name="View" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Center"
25-
IsItemClickEnabled="True" ItemClick="OpenSuggestWebsite" SelectionMode="Single">
25+
IsItemClickEnabled="True" ItemClick="OpenFavoriteWebsite" SelectionMode="Single">
2626

2727
<GridView.ItemContainerStyle>
2828
<Style TargetType="GridViewItem" BasedOn="{StaticResource DefaultGridViewItemStyle}">
@@ -41,15 +41,6 @@
4141
</Image.Source>
4242
</Image>
4343
<TextBlock Text="{x:Bind Name}" HorizontalAlignment="Center"/>
44-
<StackPanel.ContextFlyout>
45-
<MenuFlyout>
46-
<MenuFlyoutItem Text="隐藏" Click="HideItem">
47-
<MenuFlyoutItem.Icon>
48-
<FontIcon Glyph="&#xed1a;"/>
49-
</MenuFlyoutItem.Icon>
50-
</MenuFlyoutItem>
51-
</MenuFlyout>
52-
</StackPanel.ContextFlyout>
5344
</StackPanel>
5445

5546
</DataTemplate>

‎Pages/HomePage.xaml.cs‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,7 @@ public HomePage()
1717
this.InitializeComponent();
1818
this.Loaded += InstallWebView2;
1919

20-
if (App.settings.ShowSuggestUri)
21-
{
22-
View.ItemsSource = Info.SuggestWebsiteList;
23-
}
24-
else
25-
{
26-
View.Visibility = Visibility.Collapsed;
27-
}
20+
View.ItemsSource = Info.Favorites;
2821

2922
if (App.settings.ShowBackground)
3023
{
@@ -72,15 +65,10 @@ public async void InstallWebView2(object sender, RoutedEventArgs e)
7265
}
7366
}
7467

75-
private void OpenSuggestWebsite(object sender, ItemClickEventArgs e)
68+
private void OpenFavoriteWebsite(object sender, ItemClickEventArgs e)
7669
{
7770
MainWindow mainWindow = App.GetWindowForElement(this);
7871
mainWindow.AddNewTab(new WebViewPage((e.ClickedItem as WebsiteInfo).Uri));
7972
}
80-
81-
private void HideItem(object sender, RoutedEventArgs e)
82-
{
83-
Info.SuggestWebsiteList.Remove((sender as MenuFlyoutItem).DataContext as WebsiteInfo);
84-
}
8573
}
8674
}

‎Pages/WebViewPage.xaml.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ private void CoreWebView2_DOMContentLoaded(CoreWebView2 sender, CoreWebView2DOMC
5353
Time = DateTime.Now.ToString()
5454
});
5555

56-
if (App.settings.Favorites.Where(x => x.Uri.Equals(sender.Source)).Any())
56+
if (Info.Favorites.Where(x => x.Uri.Equals(sender.Source)).Any())
5757
{
5858
InFavoriteList = true;
5959
}
@@ -311,10 +311,10 @@ public void ShowFlyout(string name)
311311

312312
private void FavoriteStateChanged(object sender, RoutedEventArgs e)
313313
{
314-
WebsiteInfo info = App.settings.Favorites.FirstOrDefault(x => x.Uri.Equals(WebViewEngine.Source));
314+
WebsiteInfo info = Info.Favorites.FirstOrDefault(x => x.Uri.Equals(WebViewEngine.Source));
315315
if (info != null)
316316
{
317-
App.settings.Favorites.Remove(info);
317+
Info.Favorites.Remove(info);
318318
InFavoriteList = false;
319319
}
320320
else
@@ -325,7 +325,7 @@ private void FavoriteStateChanged(object sender, RoutedEventArgs e)
325325
Icon = WebViewEngine.CoreWebView2.FaviconUri,
326326
Uri = WebViewEngine.Source
327327
};
328-
App.settings.Favorites.Add(newInfo);
328+
Info.Favorites.Add(newInfo);
329329
InFavoriteList = true;
330330
}
331331
SetFavoriteIcon();

‎Settings/StartItem.xaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,6 @@
5454

5555
<TextBlock Text="新标签页" Style="{ThemeResource FlyoutPickerTitleTextBlockStyle}" Margin="5,10,0,0"/>
5656

57-
<controls:SettingsCard
58-
Header="在新标签页显示推荐的网站">
59-
<ToggleSwitch Name="showSuggestUri" Toggled="SuggestUriVisualChanged"/>
60-
</controls:SettingsCard>
61-
6257
<controls:SettingsExpander
6358
Header="在新标签页显示背景图">
6459
<ToggleSwitch Name="showBackground" Toggled="ShowBackgroundChanged"/>

‎Settings/StartItem.xaml.cs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ public StartItem()
2626
searchEngineBox.ItemsSource = Info.SearchEngineList.Select(x => x.Name).ToList();
2727
searchEngineBox.SelectedItem = Info.SearchEngineList.First(x => x.Name.Equals(App.settings.SearchEngine)).Name;
2828

29-
showSuggestUri.IsOn = App.settings.ShowSuggestUri;
30-
3129
showBackground.IsOn = backgroundCard.IsEnabled = App.settings.ShowBackground;
3230
}
3331

@@ -75,11 +73,6 @@ private void BehaviorChanged(object sender, SelectionChangedEventArgs e)
7573
}
7674
}
7775

78-
private void SuggestUriVisualChanged(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
79-
{
80-
App.settings.ShowSuggestUri = showSuggestUri.IsOn;
81-
}
82-
8376
private void ShowBackgroundChanged(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
8477
{
8578
backgroundCard.IsEnabled = showBackground.IsOn;

0 commit comments

Comments
 (0)