Fixes for darkmode and episode list

Author: ajtn123

BangumiNet/App.axaml

@@ -16,7 +16,7 @@
     <Application.Styles>
 		<sty:FluentAvaloniaTheme PreferSystemTheme="True" PreferUserAccentColor="True"/>
 		<Style Selector="Border.Card">
-            <Setter Property="BorderBrush" Value="#7f000000"/>
+            <Setter Property="BorderBrush" Value="#7f7f7f7f"/>
             <Setter Property="BorderThickness" Value="1"/>
             <Setter Property="CornerRadius" Value="10"/>
 			<Setter Property="BoxShadow" Value="0 0 10 0 LightGray"/>

BangumiNet/BangumiNet.csproj

@@ -26,8 +26,7 @@
     <PackageReference Include="Avalonia.Desktop" Version="11.3.6" />
     <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.6" />
     <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.6" />
-    <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.6" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="11.3.6" Condition="'$(Configuration)' == 'Debug'" />
     <PackageReference Include="Avalonia.ReactiveUI" Version="11.3.6" />
     <PackageReference Include="FluentAvaloniaUI" Version="2.4.0" />
     <PackageReference Include="FluentIcons.Avalonia" Version="1.1.310" />
@@ -42,10 +41,4 @@
     <ProjectReference Include="..\BangumiNet.Api\BangumiNet.Api.csproj" />
     <ProjectReference Include="..\BangumiNet.Shared\BangumiNet.Shared.csproj" />
   </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Views\SubjectListView.axaml.cs">
-      <DependentUpon>SubjectListView.axaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
 </Project>

BangumiNet/Views/AiringView.axaml

@@ -9,13 +9,13 @@
              x:DataType="vm:AiringViewModel"
              x:Class="BangumiNet.Views.AiringView">
     <ScrollViewer>
-        <StackPanel Margin="5" Spacing="5">
-            <Border Classes="Card" Padding="5">
+        <StackPanel>
+            <Border Classes="Card" Padding="5" Margin="5,5,5,0">
                 <TextBlock FontSize="30"><ic:FluentIcon Icon="Live" FontSize="30" Margin="0,0,0,-4"/> 每日放送</TextBlock>
             </Border>
             <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Disabled"
-						  MaxWidth="1640" HorizontalAlignment="Center">
-                <ItemsControl ItemsSource="{Binding Calendars}">
+						  MaxWidth="1650" HorizontalAlignment="Center">
+                <ItemsControl ItemsSource="{Binding Calendars}" Margin="5" ClipToBounds="False">
                     <ItemsControl.DataTemplates>
                         <DataTemplate DataType="vm:CalendarViewModel">
                             <v:CalendarView DataContext="{Binding .}" Width="230"/>

BangumiNet/Views/SearchView.axaml

@@ -147,7 +147,7 @@
                     <ItemsControl ItemsSource="{Binding Tag}">
                         <ItemsControl.ItemTemplate>
                             <DataTemplate>
-								<Border Classes="Card" Margin="0,0,3,3" BoxShadow="0 0 0 transparent" BorderBrush="#3f000000">
+								<Border Classes="Card" Margin="0,0,3,3" BoxShadow="0 0 0 transparent" BorderBrush="#3f7f7f7f">
 									<Grid ColumnDefinitions="Auto,Auto">
 										<TextBlock Text="{Binding}" VerticalAlignment="Center" />
 										<Button Content="{ice:FluentIcon Icon=Dismiss}" Grid.Column="1" CommandParameter="{Binding}" Padding="0"
@@ -172,7 +172,7 @@
 					<ItemsControl ItemsSource="{Binding MetaTag}">
 						<ItemsControl.ItemTemplate>
 							<DataTemplate>
-								<Border Classes="Card" Margin="0,0,3,3" BoxShadow="0 0 0 transparent" BorderBrush="#3f000000">
+								<Border Classes="Card" Margin="0,0,3,3" BoxShadow="0 0 0 transparent" BorderBrush="#3f7f7f7f">
 									<Grid ColumnDefinitions="Auto,Auto">
 										<TextBlock Text="{Binding}" VerticalAlignment="Center" />
 										<Button Content="{ice:FluentIcon Icon=Dismiss}" Grid.Column="1" CommandParameter="{Binding}" Padding="0"

BangumiNet/Views/SubjectView.axaml.cs

@@ -13,14 +13,16 @@ public SubjectView()
         {
             if (dataContextChanges > 10) return;
             if (DataContext is not SubjectViewModel viewModel) return;
-            if (viewModel.Source?.GetType() == typeof(Api.V0.Models.Subject)) return;
-            if (viewModel.Id is not int id) return;
-            var fullSubject = await ApiC.V0.Subjects[id].GetAsync();
-            if (fullSubject == null) return;
-            dataContextChanges += 1;
-            var vm = new SubjectViewModel(fullSubject);
-            _ = vm.EpisodeListViewModel?.LoadEpisodes();
-            DataContext = vm;
+            if (viewModel.Source?.GetType() != typeof(Api.V0.Models.Subject))
+            {
+                if (viewModel.Id is not int id) return;
+                var fullSubject = await ApiC.V0.Subjects[id].GetAsync();
+                if (fullSubject == null) return;
+                dataContextChanges += 1;
+                var vm = new SubjectViewModel(fullSubject);
+                DataContext = vm;
+            }
+            _ = ViewModel?.EpisodeListViewModel?.LoadEpisodes();
         };
     }