Skip to content

Commit

Permalink
Merge pull request #708 from ywmoyue/dev
Browse files Browse the repository at this point in the history 
4.7.0
  • Loading branch information
@ywmoyue
ywmoyue authored Jul 19, 2024
2 parents 7802364 + 44e5537 commit 52860d7
Show file tree
Hide file tree
Showing 77 changed files with 4,812 additions and 2,332 deletions.
94 changes: 92 additions & 2 deletions src/BiliLite.UWP/BiliLite.UWP.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
<UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
<AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
<DebugSymbols>false</DebugSymbols>
</PropertyGroup>
Expand All @@ -139,19 +139,50 @@
<Compile Include="Controls\AttentionButton.xaml.cs">
<DependentUpon>AttentionButton.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\Common\PieControl.xaml.cs">
<DependentUpon>PieControl.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\DataTemplateSelectors\UserDynamicItemV2DataTemplateSelector.cs" />
<Compile Include="Controls\Dynamic\DynamicItemV2Control.xaml.cs">
<DependentUpon>DynamicItemV2Control.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\Settings\AboutSettingsControl.xaml.cs">
<DependentUpon>AboutSettingsControl.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\Settings\DevSettingsControl.xaml.cs">
<DependentUpon>DevSettingsControl.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\Settings\DownloadSettingsControl.xaml.cs">
<DependentUpon>DownloadSettingsControl.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\Settings\FilterSettingsControl.xaml.cs">
<DependentUpon>FilterSettingsControl.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\PlayerToast.xaml.cs">
<DependentUpon>PlayerToast.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\Settings\LiveSettingsControl.xaml.cs">
<DependentUpon>LiveSettingsControl.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\Settings\PlaySettingsControl.xaml.cs">
<DependentUpon>PlaySettingsControl.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\Settings\ProxySettingsControl.xaml.cs">
<DependentUpon>ProxySettingsControl.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\Settings\UISettingsControl.xaml.cs">
<DependentUpon>UISettingsControl.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\Settings\VideoDanmakuSettingsControl.xaml.cs">
<DependentUpon>VideoDanmakuSettingsControl.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\UserFollowingTagsFlyout.xaml.cs">
<DependentUpon>UserFollowingTagsFlyout.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\VideoListView.xaml.cs">
<DependentUpon>VideoListView.xaml</DependentUpon>
</Compile>
<Compile Include="Converters\FilterRuleTypeConverter.cs" />
<Compile Include="Dialogs\EditPlaySpeedMenuDialog.xaml.cs">
<DependentUpon>EditPlaySpeedMenuDialog.xaml</DependentUpon>
</Compile>
Expand All @@ -162,13 +193,18 @@
<Compile Include="Extensions\ControlsExtensions.cs" />
<Compile Include="Extensions\QrCodeExtensions.cs" />
<Compile Include="Extensions\RegexExtensions.cs" />
<Compile Include="Extensions\DynamicExtensions.cs" />
<Compile Include="Models\Attributes\SettingDefaultValueAttribute.cs" />
<Compile Include="Models\Attributes\SettingKeyAttribute.cs" />
<Compile Include="Models\Common\Anime\ISeasonItem.cs" />
<Compile Include="Models\Common\Comment\HotReply.cs" />
<Compile Include="Models\Common\Danmaku\BiliDanmakuItem.cs" />
<Compile Include="Models\Common\Dynamic\DynamicUgcSeasonCardModel.cs" />
<Compile Include="Models\Common\Player\PlaySpeedMenu.cs" />
<Compile Include="Models\Common\Settings\FilterRule.cs" />
<Compile Include="Models\Common\Settings\FilterRuleTypes.cs" />
<Compile Include="Models\Common\UploadFileInfo.cs" />
<Compile Include="Models\Common\UserDynamic\DynamicPicture.cs" />
<Compile Include="Models\Common\UserDynamic\DynLiveInfo.cs" />
<Compile Include="Models\Common\UserDynamic\IUserDynamicCommands.cs" />
<Compile Include="Models\Common\UserDynamic\NavDynArticle.cs" />
Expand All @@ -191,10 +227,22 @@
<Compile Include="Models\Common\Rank\RankItemModel.cs" />
<Compile Include="Models\Common\Rank\RankItemOwnerModel.cs" />
<Compile Include="Models\Common\Rank\RankItemStatModel.cs" />
<Compile Include="Models\Functions\SaveFunction.cs" />
<Compile Include="Models\Common\Danmaku\DanmuFilterItem.cs" />
<Compile Include="ViewModels\Common\PieControlViewModel.cs" />
<Compile Include="ViewModels\Settings\CDNServerItemViewModel.cs" />
<Compile Include="Pages\ISavablePage.cs" />
<Compile Include="Services\Biz\MediaListService.cs" />
<Compile Include="Services\ContentFilterService.cs" />
<Compile Include="Services\PlaySpeedMenuService.cs" />
<Compile Include="ViewModels\Comment\SendCommentDialogViewModel.cs" />
<Compile Include="ViewModels\Rank\RankRegionViewModel.cs" />
<Compile Include="ViewModels\Settings\EditPlaySpeedMenuViewModel.cs" />
<Compile Include="ViewModels\Settings\FilterRuleViewModel.cs" />
<Compile Include="ViewModels\Settings\FilterSettingsViewModel.cs" />
<Compile Include="ViewModels\Settings\LiveSettingsControlViewModel.cs" />
<Compile Include="ViewModels\Settings\PlaySettingsControlViewModel.cs" />
<Compile Include="ViewModels\Settings\VideoDanmakuSettingsControlViewModel.cs" />
<Compile Include="ViewModels\User\FavoriteItemViewModel.cs" />
<Compile Include="Pages\Home\UserDynamicPage.xaml.cs">
<DependentUpon>UserDynamicPage.xaml</DependentUpon>
Expand Down Expand Up @@ -717,7 +765,6 @@
<Compile Include="Modules\RelayCommand.cs" />
<Compile Include="ViewModels\Season\SeasonDetailPageViewModel.cs" />
<Compile Include="Modules\Season\SeasonIndexVM.cs" />
<Compile Include="Modules\SettingVM.cs" />
<Compile Include="ViewModels\Video\VideoDetailPageViewModel.cs" />
<Compile Include="ViewModels\User\MyFollowVideoViewModel.cs" />
<Compile Include="ViewModels\User\SendDynamic\SendDynamicViewModel.cs" />
Expand Down Expand Up @@ -1003,6 +1050,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Controls\Common\PieControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Controls\Dynamic\DynamicItemV2Control.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
Expand All @@ -1011,10 +1062,46 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Controls\Settings\AboutSettingsControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Controls\Settings\DevSettingsControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Controls\Settings\DownloadSettingsControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Controls\Settings\FilterSettingsControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Controls\PlayerToast.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Controls\Settings\LiveSettingsControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Controls\Settings\PlaySettingsControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Controls\Settings\ProxySettingsControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Controls\Settings\UISettingsControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Controls\Settings\VideoDanmakuSettingsControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Controls\UserFollowingTagsFlyout.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
Expand Down Expand Up @@ -1304,6 +1391,9 @@
<PackageReference Include="AutoMapper">
<Version>10.1.1</Version>
</PackageReference>
<PackageReference Include="CommunityToolkit.Uwp.Controls.SettingsControls">
<Version>8.0.240109</Version>
</PackageReference>
<PackageReference Include="DanmakuFrostMaster.muyan">
<Version>1.0.2</Version>
</PackageReference>
Expand Down
7 changes: 3 additions & 4 deletions src/BiliLite.UWP/Controls/CommentControl.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@
</Flyout>

<MenuFlyout x:Key="menu">
<MenuFlyoutItem Click="BtnDeleteComment_Click" Visibility="{Binding showDelete}">删除</MenuFlyoutItem>
<MenuFlyoutItem>举报</MenuFlyoutItem>
<MenuFlyoutItem Click="BtnDeleteComment_Click" Visibility="{Binding ShowDelete}">删除</MenuFlyoutItem>
<MenuFlyoutItem Click="MenuFlyoutItem_OnClick">举报</MenuFlyoutItem>
</MenuFlyout>
<DataTemplate x:Key="commentTemplate" x:DataType="comment:CommentViewModel">
<Grid>
Expand Down Expand Up @@ -135,7 +135,7 @@
</Border>
</Grid>

<StackPanel Orientation="Horizontal" Margin="4 0" Grid.Column="1" >
<StackPanel ContextFlyout="{StaticResource menu}" Orientation="Horizontal" Margin="4 0" Grid.Column="1" >
<TextBlock VerticalAlignment="Center" Visibility="{x:Bind ShowTop}" FontSize="14" Margin="0 0 8 0" Foreground="DeepPink">[置顶]</TextBlock>
<TextBlock Text="{x:Bind Path=Member.Uname}"
Foreground="{x:Bind Path=Member.Vip.VipType,Converter={StaticResource colorSelct},ConverterParameter=2}" VerticalAlignment="Center"></TextBlock>
Expand Down Expand Up @@ -183,7 +183,6 @@
Text="{x:Bind Path=Member.UserSailing.Cardbg.Fan.NumDesc,Mode=OneWay}"></TextBlock>
</StackPanel>
</StackPanel>
<AppBarButton Visibility="Collapsed" Style="{StaticResource AppBarButtonNoChevronStyle}" Flyout="{StaticResource ResourceKey=menu}" HorizontalAlignment="Right" Icon="More" Width="48" ></AppBarButton>
</StackPanel>

<TextBlock Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2" FontSize="12" Foreground="Gray" Margin="4 0" VerticalAlignment="Top" ToolTipService.ToolTip="{x:Bind Path=Ctime,Converter={StaticResource Datetime}}">
Expand Down
5 changes: 5 additions & 0 deletions src/BiliLite.UWP/Controls/CommentControl.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -596,6 +596,11 @@ private void CommentControl_OnSizeChanged(object sender, SizeChangedEventArgs e)
}
}

private void MenuFlyoutItem_OnClick(object sender, RoutedEventArgs e)
{
throw new NotImplementedException();
}

#endregion

#region Public Methods
Expand Down
Loading

0 comments on commit 52860d7

Please sign in to comment.