From 7253a0ee124bd6fd87b008fcfe7e730c63d28402 Mon Sep 17 00:00:00 2001 From: croire <1432593898@qq.com> Date: Sun, 13 Mar 2022 17:18:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E9=A1=B5=E9=9D=A2=E6=A1=86?= =?UTF-8?q?=E6=9E=B6=E6=90=AD=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DownKyi/App.xaml.cs | 7 + DownKyi/DownKyi.csproj | 24 +++ DownKyi/Languages/Default.xaml | 5 + .../Friend/ViewFollowerViewModel.cs | 18 +++ .../Friend/ViewFollowingViewModel.cs | 18 +++ .../ViewModels/PageViewModels/SpaceItem.cs | 7 + .../ViewModels/UserSpace/TabRightBanner.cs | 2 + .../UserSpace/ViewArchiveViewModel.cs | 11 +- .../UserSpace/ViewChannelViewModel.cs | 10 +- DownKyi/ViewModels/ViewFriendViewModel.cs | 152 ++++++++++++++++++ .../ViewMyBangumiFollowViewModel.cs | 2 +- DownKyi/ViewModels/ViewMySpaceViewModel.cs | 70 ++++++-- DownKyi/ViewModels/ViewUserSpaceViewModel.cs | 48 +++++- DownKyi/Views/Friend/ViewFollower.xaml | 14 ++ DownKyi/Views/Friend/ViewFollower.xaml.cs | 28 ++++ DownKyi/Views/Friend/ViewFollowing.xaml | 14 ++ DownKyi/Views/Friend/ViewFollowing.xaml.cs | 28 ++++ DownKyi/Views/ViewFriend.xaml | 139 ++++++++++++++++ DownKyi/Views/ViewFriend.xaml.cs | 28 ++++ DownKyi/Views/ViewMySpace.xaml | 8 + DownKyi/Views/ViewUserSpace.xaml | 7 + 21 files changed, 611 insertions(+), 29 deletions(-) create mode 100644 DownKyi/ViewModels/Friend/ViewFollowerViewModel.cs create mode 100644 DownKyi/ViewModels/Friend/ViewFollowingViewModel.cs create mode 100644 DownKyi/ViewModels/ViewFriendViewModel.cs create mode 100644 DownKyi/Views/Friend/ViewFollower.xaml create mode 100644 DownKyi/Views/Friend/ViewFollower.xaml.cs create mode 100644 DownKyi/Views/Friend/ViewFollowing.xaml create mode 100644 DownKyi/Views/Friend/ViewFollowing.xaml.cs create mode 100644 DownKyi/Views/ViewFriend.xaml create mode 100644 DownKyi/Views/ViewFriend.xaml.cs diff --git a/DownKyi/App.xaml.cs b/DownKyi/App.xaml.cs index 6a5d6a9..1ef4e1f 100644 --- a/DownKyi/App.xaml.cs +++ b/DownKyi/App.xaml.cs @@ -4,12 +4,14 @@ using DownKyi.Utils; using DownKyi.ViewModels; using DownKyi.ViewModels.Dialogs; using DownKyi.ViewModels.DownloadManager; +using DownKyi.ViewModels.Friend; using DownKyi.ViewModels.Settings; using DownKyi.ViewModels.Toolbox; using DownKyi.ViewModels.UserSpace; using DownKyi.Views; using DownKyi.Views.Dialogs; using DownKyi.Views.DownloadManager; +using DownKyi.Views.Friend; using DownKyi.Views.Settings; using DownKyi.Views.Toolbox; using DownKyi.Views.UserSpace; @@ -166,6 +168,7 @@ namespace DownKyi containerRegistry.RegisterForNavigation(ViewUserSpaceViewModel.Tag); containerRegistry.RegisterForNavigation(ViewPublicationViewModel.Tag); containerRegistry.RegisterForNavigation(ViewModels.ViewChannelViewModel.Tag); + containerRegistry.RegisterForNavigation(ViewFriendViewModel.Tag); containerRegistry.RegisterForNavigation(ViewMySpaceViewModel.Tag); containerRegistry.RegisterForNavigation(ViewMyFavoritesViewModel.Tag); @@ -177,6 +180,10 @@ namespace DownKyi containerRegistry.RegisterForNavigation(ViewDownloadingViewModel.Tag); containerRegistry.RegisterForNavigation(ViewDownloadFinishedViewModel.Tag); + // Friend + containerRegistry.RegisterForNavigation(ViewFollowingViewModel.Tag); + containerRegistry.RegisterForNavigation(ViewFollowerViewModel.Tag); + // settings pages containerRegistry.RegisterForNavigation(ViewBasicViewModel.Tag); containerRegistry.RegisterForNavigation(ViewNetworkViewModel.Tag); diff --git a/DownKyi/DownKyi.csproj b/DownKyi/DownKyi.csproj index 1ee1080..7a7c8b2 100644 --- a/DownKyi/DownKyi.csproj +++ b/DownKyi/DownKyi.csproj @@ -100,6 +100,8 @@ + + @@ -151,6 +153,7 @@ + @@ -179,6 +182,12 @@ ViewDownloading.xaml + + ViewFollower.xaml + + + ViewFollowing.xaml + ViewAbout.xaml @@ -218,6 +227,9 @@ ViewDownloadManager.xaml + + ViewFriend.xaml + ViewIndex.xaml @@ -341,6 +353,14 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + + + Designer + MSBuild:Compile + MSBuild:Compile Designer @@ -409,6 +429,10 @@ Designer MSBuild:Compile + + Designer + MSBuild:Compile + Designer MSBuild:Compile diff --git a/DownKyi/Languages/Default.xaml b/DownKyi/Languages/Default.xaml index a590212..7617c23 100644 --- a/DownKyi/Languages/Default.xaml +++ b/DownKyi/Languages/Default.xaml @@ -96,6 +96,11 @@ 下载全部 请稍等，马上就好~ + + 好友 + 关注 + 粉丝 + 复制封面图片 复制封面URL diff --git a/DownKyi/ViewModels/Friend/ViewFollowerViewModel.cs b/DownKyi/ViewModels/Friend/ViewFollowerViewModel.cs new file mode 100644 index 0000000..964cb0d --- /dev/null +++ b/DownKyi/ViewModels/Friend/ViewFollowerViewModel.cs @@ -0,0 +1,18 @@ +using Prism.Events; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DownKyi.ViewModels.Friend +{ + public class ViewFollowerViewModel : BaseViewModel + { + public const string Tag = "PageFriendFollower"; + + public ViewFollowerViewModel(IEventAggregator eventAggregator) : base(eventAggregator) + { + } + } +} diff --git a/DownKyi/ViewModels/Friend/ViewFollowingViewModel.cs b/DownKyi/ViewModels/Friend/ViewFollowingViewModel.cs new file mode 100644 index 0000000..693cd24 --- /dev/null +++ b/DownKyi/ViewModels/Friend/ViewFollowingViewModel.cs @@ -0,0 +1,18 @@ +using Prism.Events; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DownKyi.ViewModels.Friend +{ + public class ViewFollowingViewModel : BaseViewModel + { + public const string Tag = "PageFriendFollowing"; + + public ViewFollowingViewModel(IEventAggregator eventAggregator) : base(eventAggregator) + { + } + } +} diff --git a/DownKyi/ViewModels/PageViewModels/SpaceItem.cs b/DownKyi/ViewModels/PageViewModels/SpaceItem.cs index 091cb9f..8eb149c 100644 --- a/DownKyi/ViewModels/PageViewModels/SpaceItem.cs +++ b/DownKyi/ViewModels/PageViewModels/SpaceItem.cs @@ -5,6 +5,13 @@ namespace DownKyi.ViewModels.PageViewModels { public class SpaceItem : BindableBase { + private bool isEnabled; + public bool IsEnabled + { + get => isEnabled; + set => SetProperty(ref isEnabled, value); + } + private VectorImage image; public VectorImage Image { diff --git a/DownKyi/ViewModels/UserSpace/TabRightBanner.cs b/DownKyi/ViewModels/UserSpace/TabRightBanner.cs index f36a678..252c3ce 100644 --- a/DownKyi/ViewModels/UserSpace/TabRightBanner.cs +++ b/DownKyi/ViewModels/UserSpace/TabRightBanner.cs @@ -4,6 +4,8 @@ namespace DownKyi.ViewModels.UserSpace { public class TabRightBanner : BindableBase { + public int Id { get; set; } + private bool isEnabled; public bool IsEnabled { diff --git a/DownKyi/ViewModels/UserSpace/ViewArchiveViewModel.cs b/DownKyi/ViewModels/UserSpace/ViewArchiveViewModel.cs index 407000d..f280cca 100644 --- a/DownKyi/ViewModels/UserSpace/ViewArchiveViewModel.cs +++ b/DownKyi/ViewModels/UserSpace/ViewArchiveViewModel.cs @@ -1,6 +1,5 @@ using DownKyi.Core.BiliApi.Users.Models; using DownKyi.Core.BiliApi.Zone; -using DownKyi.Events; using DownKyi.Utils; using Prism.Commands; using Prism.Events; @@ -15,7 +14,7 @@ namespace DownKyi.ViewModels.UserSpace { public class ViewArchiveViewModel : BaseViewModel { - public const string Tag = "PageUserSpaceArchiveView"; + public const string Tag = "PageUserSpaceArchive"; private long mid = -1; @@ -68,13 +67,7 @@ namespace DownKyi.ViewModels.UserSpace }; // 进入视频页面 - NavigationParam param = new NavigationParam - { - ViewName = ViewPublicationViewModel.Tag, - ParentViewName = ViewUserSpaceViewModel.Tag, - Parameter = data - }; - eventAggregator.GetEvent().Publish(param); + NavigateToView.NavigationView(eventAggregator, ViewPublicationViewModel.Tag, ViewUserSpaceViewModel.Tag, data); SelectedItem = -1; } diff --git a/DownKyi/ViewModels/UserSpace/ViewChannelViewModel.cs b/DownKyi/ViewModels/UserSpace/ViewChannelViewModel.cs index c5776bb..82e67c0 100644 --- a/DownKyi/ViewModels/UserSpace/ViewChannelViewModel.cs +++ b/DownKyi/ViewModels/UserSpace/ViewChannelViewModel.cs @@ -1,6 +1,6 @@ using DownKyi.Core.BiliApi.Users.Models; using DownKyi.Core.Storage; -using DownKyi.Events; +using DownKyi.Utils; using Prism.Commands; using Prism.Events; using Prism.Regions; @@ -68,13 +68,7 @@ namespace DownKyi.ViewModels.UserSpace }; // 进入视频页面 - NavigationParam param = new NavigationParam - { - ViewName = ViewModels.ViewChannelViewModel.Tag, - ParentViewName = ViewUserSpaceViewModel.Tag, - Parameter = data - }; - eventAggregator.GetEvent().Publish(param); + NavigateToView.NavigationView(eventAggregator, ViewModels.ViewChannelViewModel.Tag, ViewUserSpaceViewModel.Tag, data); SelectedItem = -1; } diff --git a/DownKyi/ViewModels/ViewFriendViewModel.cs b/DownKyi/ViewModels/ViewFriendViewModel.cs new file mode 100644 index 0000000..8b3a8d8 --- /dev/null +++ b/DownKyi/ViewModels/ViewFriendViewModel.cs @@ -0,0 +1,152 @@ +using DownKyi.Events; +using DownKyi.Images; +using DownKyi.Utils; +using DownKyi.ViewModels.Friend; +using DownKyi.ViewModels.PageViewModels; +using Prism.Commands; +using Prism.Events; +using Prism.Regions; +using System.Collections.Generic; +using System.Collections.ObjectModel; + +namespace DownKyi.ViewModels +{ + public class ViewFriendViewModel : BaseViewModel + { + public const string Tag = "PageFriend"; + + private readonly IRegionManager regionManager; + + private long mid = -1; + + #region 页面属性申明 + + private VectorImage arrowBack; + public VectorImage ArrowBack + { + get => arrowBack; + set => SetProperty(ref arrowBack, value); + } + + private ObservableCollection tabHeaders; + public ObservableCollection TabHeaders + { + get => tabHeaders; + set => SetProperty(ref tabHeaders, value); + } + + private int selectTabId; + public int SelectTabId + { + get => selectTabId; + set => SetProperty(ref selectTabId, value); + } + + #endregion + + public ViewFriendViewModel(IRegionManager regionManager, IEventAggregator eventAggregator) : base(eventAggregator) + { + this.regionManager = regionManager; + + #region 属性初始化 + + ArrowBack = NavigationIcon.Instance().ArrowBack; + ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark"); + + TabHeaders = new ObservableCollection + { + new TabHeader { Id = 0, Title = DictionaryResource.GetString("FriendFollowing") }, + new TabHeader { Id = 1, Title = DictionaryResource.GetString("FriendFollower") }, + }; + + #endregion + } + + #region 命令申明 + + // 返回事件 + private DelegateCommand backSpaceCommand; + public DelegateCommand BackSpaceCommand => backSpaceCommand ?? (backSpaceCommand = new DelegateCommand(ExecuteBackSpace)); + + /// + /// 返回事件 + /// + private void ExecuteBackSpace() + { + //InitView(); + + ArrowBack.Fill = DictionaryResource.GetColor("ColorText"); + + NavigationParam parameter = new NavigationParam + { + ViewName = ParentView, + ParentViewName = null, + Parameter = null + }; + eventAggregator.GetEvent().Publish(parameter); + } + + // 顶部tab点击事件 + private DelegateCommand tabHeadersCommand; + public DelegateCommand TabHeadersCommand => tabHeadersCommand ?? (tabHeadersCommand = new DelegateCommand(ExecuteTabHeadersCommand)); + + /// + /// 顶部tab点击事件 + /// + /// + private void ExecuteTabHeadersCommand(object parameter) + { + if (!(parameter is TabHeader tabHeader)) { return; } + + NavigationView(tabHeader.Id); + } + + #endregion + + /// + /// 进入子页面 + /// + /// + private void NavigationView(int id) + { + NavigationParameters param = new NavigationParameters() + { + { "mid", mid }, + }; + + switch (id) + { + case 0: + regionManager.RequestNavigate("FriendContentRegion", ViewFollowerViewModel.Tag, param); + break; + case 1: + regionManager.RequestNavigate("FriendContentRegion", ViewFollowingViewModel.Tag, param); + break; + } + } + + /// + /// 导航到VideoDetail页面时执行 + /// + /// + public override void OnNavigatedTo(NavigationContext navigationContext) + { + base.OnNavigatedTo(navigationContext); + + ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark"); + + // 根据传入参数不同执行不同任务 + var parameter = navigationContext.Parameters.GetValue>("Parameter"); + if (parameter == null) + { + return; + } + + mid = (long)parameter["mid"]; + SelectTabId = (int)parameter["friendId"]; + + NavigationView(SelectTabId); + } + + } +} diff --git a/DownKyi/ViewModels/ViewMyBangumiFollowViewModel.cs b/DownKyi/ViewModels/ViewMyBangumiFollowViewModel.cs index caa760e..42b15eb 100644 --- a/DownKyi/ViewModels/ViewMyBangumiFollowViewModel.cs +++ b/DownKyi/ViewModels/ViewMyBangumiFollowViewModel.cs @@ -183,7 +183,7 @@ namespace DownKyi.ViewModels public DelegateCommand TabHeadersCommand => tabHeadersCommand ?? (tabHeadersCommand = new DelegateCommand(ExecuteTabHeadersCommand, CanExecuteTabHeadersCommand)); /// - /// 左侧tab点击事件 + /// 顶部tab点击事件 /// /// private void ExecuteTabHeadersCommand(object parameter) diff --git a/DownKyi/ViewModels/ViewMySpaceViewModel.cs b/DownKyi/ViewModels/ViewMySpaceViewModel.cs index 01a8d94..28f987b 100644 --- a/DownKyi/ViewModels/ViewMySpaceViewModel.cs +++ b/DownKyi/ViewModels/ViewMySpaceViewModel.cs @@ -11,6 +11,7 @@ using Prism.Commands; using Prism.Events; using Prism.Regions; using System; +using System.Collections.Generic; using System.Collections.ObjectModel; using System.Threading; using System.Threading.Tasks; @@ -240,6 +241,13 @@ namespace DownKyi.ViewModels set => SetProperty(ref packageList, value); } + private int selectedStatus; + public int SelectedStatus + { + get => selectedStatus; + set => SetProperty(ref selectedStatus, value); + } + private int selectedPackage; public int SelectedPackage { @@ -328,6 +336,47 @@ namespace DownKyi.ViewModels eventAggregator.GetEvent().Publish(parameter); } + // 页面选择事件 + private DelegateCommand statusListCommand; + public DelegateCommand StatusListCommand => statusListCommand ?? (statusListCommand = new DelegateCommand(ExecuteStatusListCommand)); + + /// + /// 页面选择事件 + /// + private void ExecuteStatusListCommand() + { + if (SelectedStatus == -1) + { + return; + } + + Dictionary data = new Dictionary + { + { "mid", mid }, + { "friendId", 0 } + }; + + switch (SelectedStatus) + { + case 0: + data["friendId"] = 0; + NavigateToView.NavigationView(eventAggregator, ViewFriendViewModel.Tag, Tag, data); + break; + case 1: + data["friendId"] = 0; + NavigateToView.NavigationView(eventAggregator, ViewFriendViewModel.Tag, Tag, data); + break; + case 2: + data["friendId"] = 1; + NavigateToView.NavigationView(eventAggregator, ViewFriendViewModel.Tag, Tag, data); + break; + default: + break; + } + + SelectedStatus = -1; + } + // 页面选择事件 private DelegateCommand packageListCommand; public DelegateCommand PackageListCommand => packageListCommand ?? (packageListCommand = new DelegateCommand(ExecutePackageListCommand)); @@ -391,23 +440,24 @@ namespace DownKyi.ViewModels CurrentExp = "--/--"; StatusList.Clear(); - StatusList.Add(new SpaceItem { Title = DictionaryResource.GetString("Following"), Subtitle = "--" }); - StatusList.Add(new SpaceItem { Title = DictionaryResource.GetString("Whisper"), Subtitle = "--" }); - StatusList.Add(new SpaceItem { Title = DictionaryResource.GetString("Follower"), Subtitle = "--" }); - StatusList.Add(new SpaceItem { Title = DictionaryResource.GetString("Black"), Subtitle = "--" }); - StatusList.Add(new SpaceItem { Title = DictionaryResource.GetString("Moral"), Subtitle = "--" }); - StatusList.Add(new SpaceItem { Title = DictionaryResource.GetString("Silence"), Subtitle = "N/A" }); + StatusList.Add(new SpaceItem { IsEnabled = true, Title = DictionaryResource.GetString("Following"), Subtitle = "--" }); + StatusList.Add(new SpaceItem { IsEnabled = true, Title = DictionaryResource.GetString("Whisper"), Subtitle = "--" }); + StatusList.Add(new SpaceItem { IsEnabled = true, Title = DictionaryResource.GetString("Follower"), Subtitle = "--" }); + StatusList.Add(new SpaceItem { IsEnabled = false, Title = DictionaryResource.GetString("Black"), Subtitle = "--" }); + StatusList.Add(new SpaceItem { IsEnabled = false, Title = DictionaryResource.GetString("Moral"), Subtitle = "--" }); + StatusList.Add(new SpaceItem { IsEnabled = false, Title = DictionaryResource.GetString("Silence"), Subtitle = "N/A" }); PackageList.Clear(); - PackageList.Add(new SpaceItem { Image = NormalIcon.Instance().FavoriteOutline, Title = DictionaryResource.GetString("Favorites") }); - PackageList.Add(new SpaceItem { Image = NormalIcon.Instance().Subscription, Title = DictionaryResource.GetString("Subscription") }); - PackageList.Add(new SpaceItem { Image = NormalIcon.Instance().ToView, Title = DictionaryResource.GetString("ToView") }); - PackageList.Add(new SpaceItem { Image = NormalIcon.Instance().History, Title = DictionaryResource.GetString("History") }); + PackageList.Add(new SpaceItem { IsEnabled = true, Image = NormalIcon.Instance().FavoriteOutline, Title = DictionaryResource.GetString("Favorites") }); + PackageList.Add(new SpaceItem { IsEnabled = true, Image = NormalIcon.Instance().Subscription, Title = DictionaryResource.GetString("Subscription") }); + PackageList.Add(new SpaceItem { IsEnabled = true, Image = NormalIcon.Instance().ToView, Title = DictionaryResource.GetString("ToView") }); + PackageList.Add(new SpaceItem { IsEnabled = true, Image = NormalIcon.Instance().History, Title = DictionaryResource.GetString("History") }); NormalIcon.Instance().FavoriteOutline.Fill = DictionaryResource.GetColor("ColorPrimary"); NormalIcon.Instance().Subscription.Fill = DictionaryResource.GetColor("ColorPrimary"); NormalIcon.Instance().ToView.Fill = DictionaryResource.GetColor("ColorPrimary"); NormalIcon.Instance().History.Fill = DictionaryResource.GetColor("ColorPrimary"); + SelectedStatus = -1; SelectedPackage = -1; ContentVisibility = Visibility.Collapsed; diff --git a/DownKyi/ViewModels/ViewUserSpaceViewModel.cs b/DownKyi/ViewModels/ViewUserSpaceViewModel.cs index 9cecb51..6bef7cb 100644 --- a/DownKyi/ViewModels/ViewUserSpaceViewModel.cs +++ b/DownKyi/ViewModels/ViewUserSpaceViewModel.cs @@ -156,6 +156,14 @@ namespace DownKyi.ViewModels set => SetProperty(ref tabRightBanners, value); } + private int selectedRightBanner; + public int SelectedRightBanner + { + get => selectedRightBanner; + set => SetProperty(ref selectedRightBanner, value); + } + + #endregion public ViewUserSpaceViewModel(IRegionManager regionManager, IEventAggregator eventAggregator) : base(eventAggregator) @@ -200,7 +208,6 @@ namespace DownKyi.ViewModels eventAggregator.GetEvent().Publish(parameter); } - // 左侧tab点击事件 private DelegateCommand tabLeftBannersCommand; public DelegateCommand TabLeftBannersCommand => tabLeftBannersCommand ?? (tabLeftBannersCommand = new DelegateCommand(ExecuteTabLeftBannersCommand)); @@ -230,6 +237,38 @@ namespace DownKyi.ViewModels } } + // 右侧tab点击事件 + private DelegateCommand tabRightBannersCommand; + public DelegateCommand TabRightBannersCommand => tabRightBannersCommand ?? (tabRightBannersCommand = new DelegateCommand(ExecuteTabRightBannersCommand)); + + /// + /// 右侧tab点击事件 + /// + private void ExecuteTabRightBannersCommand(object parameter) + { + if (!(parameter is TabRightBanner banner)) { return; } + + Dictionary data = new Dictionary + { + { "mid", mid }, + { "friendId", 0 } + }; + + switch (banner.Id) + { + case 0: + data["friendId"] = 0; + NavigateToView.NavigationView(eventAggregator, ViewFriendViewModel.Tag, Tag, data); + break; + case 1: + data["friendId"] = 1; + NavigateToView.NavigationView(eventAggregator, ViewFriendViewModel.Tag, Tag, data); + break; + } + + SelectedRightBanner = -1; + } + #endregion /// @@ -252,6 +291,8 @@ namespace DownKyi.ViewModels TabLeftBanners.Clear(); TabRightBanners.Clear(); + SelectedRightBanner = -1; + // 将内容置空，使其不指向任何页面 regionManager.RequestNavigate("UserSpaceContentRegion", ""); @@ -416,6 +457,7 @@ namespace DownKyi.ViewModels { TabRightBanners.Add(new TabRightBanner { + Id = 0, IsEnabled = true, LabelColor = DictionaryResource.GetColor("ColorPrimary"), CountColor = DictionaryResource.GetColor("ColorPrimary"), @@ -424,6 +466,7 @@ namespace DownKyi.ViewModels }); TabRightBanners.Add(new TabRightBanner { + Id = 1, IsEnabled = true, LabelColor = DictionaryResource.GetColor("ColorPrimary"), CountColor = DictionaryResource.GetColor("ColorPrimary"), @@ -442,6 +485,7 @@ namespace DownKyi.ViewModels { TabRightBanners.Add(new TabRightBanner { + Id = 2, IsEnabled = false, LabelColor = DictionaryResource.GetColor("ColorTextGrey"), CountColor = DictionaryResource.GetColor("ColorTextDark"), @@ -456,6 +500,7 @@ namespace DownKyi.ViewModels } TabRightBanners.Add(new TabRightBanner { + Id = 3, IsEnabled = false, LabelColor = DictionaryResource.GetColor("ColorTextGrey"), CountColor = DictionaryResource.GetColor("ColorTextDark"), @@ -470,6 +515,7 @@ namespace DownKyi.ViewModels } TabRightBanners.Add(new TabRightBanner { + Id = 4, IsEnabled = false, LabelColor = DictionaryResource.GetColor("ColorTextGrey"), CountColor = DictionaryResource.GetColor("ColorTextDark"), diff --git a/DownKyi/Views/Friend/ViewFollower.xaml b/DownKyi/Views/Friend/ViewFollower.xaml new file mode 100644 index 0000000..4419847 --- /dev/null +++ b/DownKyi/Views/Friend/ViewFollower.xaml @@ -0,0 +1,14 @@ + + + + + + + diff --git a/DownKyi/Views/Friend/ViewFollower.xaml.cs b/DownKyi/Views/Friend/ViewFollower.xaml.cs new file mode 100644 index 0000000..93d62da --- /dev/null +++ b/DownKyi/Views/Friend/ViewFollower.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace DownKyi.Views.Friend +{ + /// + /// ViewFollower.xaml 的交互逻辑 + /// + public partial class ViewFollower : UserControl + { + public ViewFollower() + { + InitializeComponent(); + } + } +} diff --git a/DownKyi/Views/Friend/ViewFollowing.xaml b/DownKyi/Views/Friend/ViewFollowing.xaml new file mode 100644 index 0000000..5fb0017 --- /dev/null +++ b/DownKyi/Views/Friend/ViewFollowing.xaml @@ -0,0 +1,14 @@ + + + + + + + diff --git a/DownKyi/Views/Friend/ViewFollowing.xaml.cs b/DownKyi/Views/Friend/ViewFollowing.xaml.cs new file mode 100644 index 0000000..40e5bba --- /dev/null +++ b/DownKyi/Views/Friend/ViewFollowing.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace DownKyi.Views.Friend +{ + /// + /// ViewFollowing.xaml 的交互逻辑 + /// + public partial class ViewFollowing : UserControl + { + public ViewFollowing() + { + InitializeComponent(); + } + } +} diff --git a/DownKyi/Views/ViewFriend.xaml b/DownKyi/Views/ViewFriend.xaml new file mode 100644 index 0000000..40ad395 --- /dev/null +++ b/DownKyi/Views/ViewFriend.xaml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DownKyi/Views/ViewFriend.xaml.cs b/DownKyi/Views/ViewFriend.xaml.cs new file mode 100644 index 0000000..36445f6 --- /dev/null +++ b/DownKyi/Views/ViewFriend.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace DownKyi.Views +{ + /// + /// ViewFriend.xaml 的交互逻辑 + /// + public partial class ViewFriend : UserControl + { + public ViewFriend() + { + InitializeComponent(); + } + } +} diff --git a/DownKyi/Views/ViewMySpace.xaml b/DownKyi/Views/ViewMySpace.xaml index 409c3b9..fc165c9 100644 --- a/DownKyi/Views/ViewMySpace.xaml +++ b/DownKyi/Views/ViewMySpace.xaml @@ -256,8 +256,14 @@ BorderBrush="{x:Null}" BorderThickness="0" ItemsSource="{Binding StatusList}" + SelectedIndex="{Binding SelectedStatus}" SelectionMode="Single" Style="{StaticResource SpaceStyle}"> + + + + +