Skip to content

Commit

Permalink
Merge pull request #600 from ywmoyue/dev
Browse files Browse the repository at this point in the history 
4.6.30
  • Loading branch information
@ywmoyue
ywmoyue authored Apr 28, 2024
2 parents 88f0b37 + f69abe3 commit 3ab13e3
Show file tree
Hide file tree
Showing 81 changed files with 2,608 additions and 624 deletions.
42 changes: 35 additions & 7 deletions src/BiliLite.UWP/BiliLite.UWP.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@
<Compile Include="Controls\Dynamic\DynamicItemV2Control.xaml.cs">
<DependentUpon>DynamicItemV2Control.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\PlayerToast.xaml.cs">
<DependentUpon>PlayerToast.xaml</DependentUpon>
</Compile>
<Compile Include="Controls\UserFollowingTagsFlyout.xaml.cs">
<DependentUpon>UserFollowingTagsFlyout.xaml</DependentUpon>
</Compile>
Expand All @@ -151,16 +154,33 @@
</Compile>
<Compile Include="Extensions\ControlsExtensions.cs" />
<Compile Include="Extensions\QrCodeExtensions.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\UserDynamic\DynLiveInfo.cs" />
<Compile Include="Models\Common\UserDynamic\IUserDynamicCommands.cs" />
<Compile Include="Models\Common\UserDynamic\NavDynArticle.cs" />
<Compile Include="Models\Common\UserDynamic\NavDynArticles.cs" />
<Compile Include="Models\Common\UserDynamic\UserDynamicSeasonInfo.cs" />
<Compile Include="Models\Common\User\SendDynamic\AtDisplayModel.cs" />
<Compile Include="Models\Common\User\SendDynamic\AtModel.cs" />
<Compile Include="Models\Common\User\SendDynamic\SendImagesModel.cs" />
<Compile Include="Models\Common\User\SendDynamic\UploadImagesModel.cs" />
<Compile Include="Models\Common\User\SendDynamic\RcmdTopicModel.cs" />
<Compile Include="Models\Functions\IShortcutFunction.cs" />
<Compile Include="Models\Functions\RefreshShortcutFunction.cs" />
<Compile Include="Pages\Home\UserDynamicPage.xaml.cs">
<DependentUpon>UserDynamicPage.xaml</DependentUpon>
</Compile>
<Compile Include="Pages\IMainPage.cs" />
<Compile Include="Pages\IRefreshablePage.cs" />
<Compile Include="Services\PlayerToastService.cs" />
<Compile Include="Services\SettingsImportExportService.cs" />
<Compile Include="Services\ShortcutKeyService.cs" />
<Compile Include="ViewModels\PlayerToastViewModel.cs" />
<Compile Include="ViewModels\UserDynamic\DynamicV2ItemViewModel.cs" />
<Compile Include="Models\Common\Home\DefaultHomeNavItems.cs" />
<Compile Include="Models\Common\Live\DefaultPlayUrlSourceOptions.cs" />
Expand Down Expand Up @@ -213,6 +233,7 @@
<Compile Include="Pages\User\DynamicSpacePage.xaml.cs">
<DependentUpon>DynamicSpacePage.xaml</DependentUpon>
</Compile>
<Compile Include="ViewModels\UserDynamic\UserDynamicAllViewModel.cs" />
<Compile Include="ViewModels\UserDynamic\UserDynamicSpaceViewModel.cs" />
<Compile Include="Models\Common\User\SendDynamic\AtUserModel.cs" />
<Compile Include="ViewModels\User\SendDynamic\SendDynamicV2ViewModel.cs" />
Expand Down Expand Up @@ -722,9 +743,6 @@
<Compile Include="Pages\Home\RecommendPage.xaml.cs">
<DependentUpon>RecommendPage.xaml</DependentUpon>
</Compile>
<Compile Include="Pages\Home\UserDynamicPage.xaml.cs">
<DependentUpon>UserDynamicPage.xaml</DependentUpon>
</Compile>
<Compile Include="Pages\LiveDetailPage.xaml.cs">
<DependentUpon>LiveDetailPage.xaml</DependentUpon>
</Compile>
Expand Down Expand Up @@ -958,6 +976,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Controls\PlayerToast.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Controls\UserFollowingTagsFlyout.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
Expand All @@ -966,6 +988,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Pages\Home\UserDynamicPage.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Pages\User\DynamicSpacePage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
Expand Down Expand Up @@ -1118,10 +1144,6 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Pages\Home\UserDynamicPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Pages\LiveDetailPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
Expand Down Expand Up @@ -1322,9 +1344,15 @@
<PackageReference Include="RestSharp">
<Version>107.3.0</Version>
</PackageReference>
<PackageReference Include="Simple.AES">
<Version>2.0.2</Version>
</PackageReference>
<PackageReference Include="SYEngine.uwp">
<Version>1.0.7</Version>
</PackageReference>
<PackageReference Include="Tomlyn">
<Version>0.17.0</Version>
</PackageReference>
<PackageReference Include="ZXing.Net">
<Version>0.16.8</Version>
</PackageReference>
Expand Down
15 changes: 15 additions & 0 deletions src/BiliLite.UWP/Controls/DataTemplateSelectors/UserDynamicItemV2DataTemplateSelector.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ DataTemplate SelectRowTemplate(UserDynamicItemDataTemplateSelector selector,
{ Constants.DynamicTypes.MUSIC, (selector, model) => selector.MusicTemplate },
{ Constants.DynamicTypes.COMMON_SQUARE, (selector, model) => selector.CommonSquareTemplate },
{ Constants.DynamicTypes.LIVE_RCMD, (selector, model) => selector.LiveRcmdTemplate },
{ Constants.DynamicTypes.LIVE, (selector, model) => selector.LiveTemplate },
{ Constants.DynamicTypes.CUSTOM_SEASON, (selector, model) => selector.CustomSeasonTemplate },
{ Constants.DynamicTypes.CUSTOM_ARTICLE, (selector, model) => selector.CustomArticleTemplate },
{ Constants.DynamicTypes.UGC_SEASON, (selector, model) => selector.UgcSeasonTemplate },
{ Constants.DynamicTypes.FOLD, (selector, model) => selector.FoldTemplate },
};
}

Expand All @@ -63,6 +68,16 @@ DataTemplate SelectRowTemplate(UserDynamicItemDataTemplateSelector selector,

public DataTemplate LiveRcmdTemplate { get; set; }

public DataTemplate LiveTemplate { get; set; }

public DataTemplate UgcSeasonTemplate { get; set; }

public DataTemplate FoldTemplate { get; set; }

public DataTemplate CustomSeasonTemplate { get; set; }

public DataTemplate CustomArticleTemplate { get; set; }

public DataTemplate OtherTemplate { get; set; }

protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
Expand Down
83 changes: 47 additions & 36 deletions src/BiliLite.UWP/Controls/Dynamic/DynamicItemV2Control.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@
</StackPanel>
</Grid>
</HyperlinkButton>
<Grid Grid.Column="1" HorizontalAlignment="Right" Visibility="{x:Bind Path=ViewModel.Author.DecorateCard,Mode=OneWay,Converter={StaticResource display}}" VerticalAlignment="Center">
<Image Height="44" Source="{x:Bind Path=ViewModel.Author.DecorateCard.CardUrl,Mode=OneWay,Converter={StaticResource imageConvert2},ConverterParameter='64h.png'}"></Image>
<TextBlock FontSize="12" Visibility="{x:Bind Path=ViewModel.Author.DecorateCard.Fan,Mode=OneWay,Converter={StaticResource display}}" FontFamily="{StaticResource FansNum}" VerticalAlignment="Center" Margin="0 0 40 0" HorizontalAlignment="Right" Foreground="{x:Bind Path=ViewModel.Author.DecorateCard.Fan.Color,Mode=OneWay,Converter={StaticResource colorConvert}}" Text="{x:Bind Path=ViewModel.Author.DecorateCard.Fan.NumberStr,Mode=OneWay}"></TextBlock>
</Grid>
<AppBarButton
Background="Transparent"
Visibility="{x:Bind ViewModel.IsRepost,Converter={StaticResource display},Mode=OneWay}"
Expand Down Expand Up @@ -93,6 +97,8 @@
<HyperlinkButton HorizontalContentAlignment="Stretch"
HorizontalAlignment="Stretch"
Grid.ColumnSpan="2"
Command="{x:Bind Path=ViewModel.Parent.UserCommand,Mode=OneWay}"
CommandParameter="{x:Bind Path=ViewModel.AuthorForward.Uid,Mode=OneWay}"
Visibility="{x:Bind Path=ViewModel.IsRepost,Mode=OneWay}"
Padding="0" >
<Grid >
Expand All @@ -108,6 +114,8 @@
</TextBlock>
</StackPanel>
<Button HorizontalAlignment="Right"
Command="{x:Bind Path=ViewModel.Parent.DetailCommand,Mode=OneWay}"
CommandParameter="{x:Bind Path=ViewModel.Extend.DynIdStr,Mode=OneWay}"
Foreground="Gray"
Background="Transparent">
<FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE17C;" />
Expand All @@ -120,58 +128,61 @@
Content="{x:Bind Path=ViewModel.Content,Mode=OneWay}"></ContentPresenter>

<ContentPresenter Content="{x:Bind Path=CardContent,Mode=OneWay}" Padding="0 4 0 0"></ContentPresenter>

<StackPanel
Visibility="{x:Bind ViewModel.Stat,Converter={StaticResource display}}">
<StackPanel
Margin="0 4 0 0"
Orientation="Horizontal"
Visibility="{x:Bind ViewModel.IsRepost,Mode=OneWay,Converter={StaticResource display}}">
<StackPanel.Resources>
<Style TargetType="Button">
<Setter Property="Margin" Value="0,8,12,0"/>
<Setter Property="Height" Value="32"/>
<Setter Property="Width" Value="96"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="Foreground" Value="Gray"/>
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="CornerRadius" Value="4"/>
</Style>
</StackPanel.Resources>
<Button
<StackPanel.Resources>
<Style TargetType="Button">
<Setter Property="Margin" Value="0,8,12,0"/>
<Setter Property="Height" Value="32"/>
<Setter Property="Width" Value="96"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="Foreground" Value="Gray"/>
<Setter Property="BorderThickness" Value="0"/>
<Setter Property="CornerRadius" Value="4"/>
</Style>
</StackPanel.Resources>
<Button
Command="{x:Bind Path=ViewModel.Parent.RepostCommand,Mode=OneWay}"
CommandParameter="{x:Bind Path=ViewModel,Mode=OneWay}">
<StackPanel Orientation="Horizontal">
<fontAwesome5:FontAwesome Icon="Solid_Share" Margin="0 2 0 0" FontSize="14"></fontAwesome5:FontAwesome>
<TextBlock Margin="8 0" Text="{x:Bind Path=ViewModel.Stat.Repost,Mode=OneWay,Converter={StaticResource countConvert},ConverterParameter='转发'}"></TextBlock>
</StackPanel>
</Button>
<Button
<StackPanel Orientation="Horizontal">
<fontAwesome5:FontAwesome Icon="Solid_Share" Margin="0 2 0 0" FontSize="14"></fontAwesome5:FontAwesome>
<TextBlock Margin="8 0" Text="{x:Bind Path=ViewModel.Stat.Repost,Mode=OneWay,Converter={StaticResource countConvert},ConverterParameter='转发'}"></TextBlock>
</StackPanel>
</Button>
<Button
Command="{x:Bind Path=ViewModel.Parent.CommentCommand,Mode=OneWay}"
CommandParameter="{x:Bind Path=ViewModel,Mode=OneWay}">
<StackPanel Orientation="Horizontal">
<fontAwesome5:FontAwesome Icon="Regular_Comment" Margin="0 2 0 0" FontSize="14"></fontAwesome5:FontAwesome>
<TextBlock Margin="8 0" Text="{x:Bind Path=ViewModel.Stat.Reply,Mode=OneWay,Converter={StaticResource countConvert},ConverterParameter='评论'}"></TextBlock>
</StackPanel>
</Button>
<Button
<StackPanel Orientation="Horizontal">
<fontAwesome5:FontAwesome Icon="Regular_Comment" Margin="0 2 0 0" FontSize="14"></fontAwesome5:FontAwesome>
<TextBlock Margin="8 0" Text="{x:Bind Path=ViewModel.Stat.Reply,Mode=OneWay,Converter={StaticResource countConvert},ConverterParameter='评论'}"></TextBlock>
</StackPanel>
</Button>
<Button
Command="{x:Bind Path=ViewModel.Parent.LikeCommand,Mode=OneWay}"
CommandParameter="{x:Bind Path=ViewModel,Mode=OneWay}"
Visibility="{x:Bind Path=ViewModel.Liked,Mode=OneWay,Converter={StaticResource display}}" >
<StackPanel Orientation="Horizontal">
<fontAwesome5:FontAwesome Icon="Regular_ThumbsUp" Margin="0 2 0 0" FontSize="14"></fontAwesome5:FontAwesome>
<TextBlock Margin="8 0"
<StackPanel Orientation="Horizontal">
<fontAwesome5:FontAwesome Icon="Regular_ThumbsUp" Margin="0 2 0 0" FontSize="14"></fontAwesome5:FontAwesome>
<TextBlock Margin="8 0"
Text="{x:Bind Path=ViewModel.LikeCount,Mode=OneWay,Converter={StaticResource countConvert},ConverterParameter='点赞'}"></TextBlock>
</StackPanel>
</Button>
<Button
</StackPanel>
</Button>
<Button
Command="{x:Bind Path=ViewModel.Parent.LikeCommand,Mode=OneWay}"
CommandParameter="{x:Bind Path=ViewModel,Mode=OneWay}"
Visibility="{x:Bind Path=ViewModel.Liked,Mode=OneWay}" Foreground="{ThemeResource HighLightColor}">
<StackPanel Orientation="Horizontal">
<fontAwesome5:FontAwesome Icon="Regular_ThumbsUp" Margin="0 2 0 0" FontSize="14"></fontAwesome5:FontAwesome>
<TextBlock Margin="8 0"
<StackPanel Orientation="Horizontal">
<fontAwesome5:FontAwesome Icon="Regular_ThumbsUp" Margin="0 2 0 0" FontSize="14"></fontAwesome5:FontAwesome>
<TextBlock Margin="8 0"
Text="{x:Bind Path=ViewModel.LikeCount,Mode=OneWay,Converter={StaticResource countConvert},ConverterParameter='点赞'}"></TextBlock>
</StackPanel>
</Button>
</StackPanel>
</Button>
</StackPanel>
</StackPanel>
</StackPanel>
</UserControl>
Loading

0 comments on commit 3ab13e3

Please sign in to comment.