Feed improvements

FireCubeStudios · Nov 24, 2024 · 71d511c · 71d511c
1 parent dd464fa
commit 71d511c
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 4 deletions.
diff --git a/DarkSky/DarkSky.csproj b/DarkSky/DarkSky.csproj
@@ -174,6 +174,9 @@
     <Compile Include="Views\ProfilePage.xaml.cs">
       <DependentUpon>ProfilePage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\SearchPage.xaml.cs">
+      <DependentUpon>SearchPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\SettingsPage.xaml.cs">
       <DependentUpon>SettingsPage.xaml</DependentUpon>
     </Compile>
@@ -306,6 +309,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\SearchPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\SettingsPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

diff --git a/DarkSky/MainPage.xaml b/DarkSky/MainPage.xaml
@@ -149,7 +149,7 @@
                     <Grid Background="{ThemeResource MicaBlurBrush}">
                         <Grid x:Name="DualPane" Visibility="Visible">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="400" MinWidth="300"/>
+                                <ColumnDefinition Width="500" MinWidth="400"/>
                                 <ColumnDefinition Width="*" MinWidth="200" />
                             </Grid.ColumnDefinitions>
                             <Frame

diff --git a/DarkSky/UserControls/FeedViewPostControl.xaml.cs b/DarkSky/UserControls/FeedViewPostControl.xaml.cs
@@ -50,8 +50,10 @@ private void SetFeedPost(FeedViewPost post)
 				}
 
 				if (post.Reason is not null) {  // if a reply was retweeted then do not show parent or root posts
-					UnloadObject(ReplyParent);
+					if (ReplyRoot is not null) ReplyRoot.Visibility = Visibility.Collapsed;
+					if (ReplyParent is not null) ReplyParent.Visibility = Visibility.Collapsed;
 					UnloadObject(ReplyRoot);
+					UnloadObject(ReplyParent);
 				}
 			}
 		}

diff --git a/DarkSky/UserControls/PostControl.xaml b/DarkSky/UserControls/PostControl.xaml
@@ -33,11 +33,11 @@
             <toolkit:DropShadowPanel
                 x:Name="ReplyBar"
                 x:Load="{x:Bind ShowReplyBar, Mode=OneWay}"
-                Grid.Row="1"
+                Grid.Row="0"
                 Grid.RowSpan="3"
                 Grid.Column="0"
                 HorizontalAlignment="Center"
-                Margin="0, 4, 0, 4"
+                Margin="0, 48, 12, 12"
                  BlurRadius="16"
                  Canvas.ZIndex="2"
                  ShadowOpacity="0.23"

diff --git a/DarkSky/Views/SearchPage.xaml b/DarkSky/Views/SearchPage.xaml
@@ -0,0 +1,14 @@
+<Page
+    x:Class="DarkSky.Views.SearchPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:DarkSky.Views"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+    <Grid>
+
+    </Grid>
+</Page>
diff --git a/DarkSky/Views/SearchPage.xaml.cs b/DarkSky/Views/SearchPage.xaml.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace DarkSky.Views
+{
+	/// <summary>
+	/// An empty page that can be used on its own or navigated to within a Frame.
+	/// </summary>
+	public sealed partial class SearchPage : Page
+	{
+		public SearchPage()
+		{
+			this.InitializeComponent();
+		}
+	}
+}