Krzysztof Krysiński 2 years ago
parent
commit
7b987e1746

+ 18 - 0
src/PixiEditor/Models/Services/NewsFeed/News.cs

@@ -0,0 +1,18 @@
+namespace PixiEditor.Models.Services.NewsFeed;
+
+internal enum NewsType
+{
+    NewVersion,
+    YtVideo,
+    BlogPost,
+    OfficialAnnouncement,
+    Misc
+}
+
+internal record News
+{
+    public string Title { get; set; }
+    public string ShortDescription { get; set; }
+    public NewsType Type { get; set; }
+    public string Url { get; set; }
+}

+ 11 - 0
src/PixiEditor/Models/Services/NewsFeed/NewsProvider.cs

@@ -0,0 +1,11 @@
+namespace PixiEditor.Models.Services.NewsFeed;
+
+internal class NewsProvider
+{
+    private const int ProtocolVersion = 1;
+    private const string FeedUrl = "";
+    public async Task<News> FetchNews()
+    {
+
+    }
+}

+ 18 - 3
src/PixiEditor/Views/Dialogs/HelloTherePopup.xaml

@@ -14,7 +14,7 @@
         xmlns:helpers="clr-namespace:PixiEditor.Helpers"
         xmlns:helpers="clr-namespace:PixiEditor.Helpers"
         xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
         xmlns:ui="clr-namespace:PixiEditor.Extensions.UI;assembly=PixiEditor.Extensions"
         mc:Ignorable="d" ShowInTaskbar="False"
         mc:Ignorable="d" ShowInTaskbar="False"
-        Title="Hello there!" Height="662" Width="632" MinHeight="500" MinWidth="500"
+        Title="Hello there!" Height="662" Width="832" MinHeight="500" MinWidth="500"
         d:DataContext="{d:DesignInstance local:HelloTherePopup}"
         d:DataContext="{d:DesignInstance local:HelloTherePopup}"
         WindowStyle="None" WindowStartupLocation="CenterScreen"
         WindowStyle="None" WindowStartupLocation="CenterScreen"
         FlowDirection="{helpers:Localization FlowDirection}">
         FlowDirection="{helpers:Localization FlowDirection}">
@@ -41,14 +41,18 @@
             <RowDefinition Height="35" />
             <RowDefinition Height="35" />
             <RowDefinition Height="*"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
         </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="200"/>
+        </Grid.ColumnDefinitions>
 
 
-        <DockPanel Grid.Row="0" Background="{StaticResource MainColor}">
+        <DockPanel Grid.Row="0" Grid.ColumnSpan="2" Background="{StaticResource MainColor}">
             <Button DockPanel.Dock="Right" HorizontalAlignment="Right" Style="{StaticResource CloseButtonStyle}"
             <Button DockPanel.Dock="Right" HorizontalAlignment="Right" Style="{StaticResource CloseButtonStyle}"
                     WindowChrome.IsHitTestVisibleInChrome="True" ToolTip="Close"
                     WindowChrome.IsHitTestVisibleInChrome="True" ToolTip="Close"
                     Command="{x:Static SystemCommands.CloseWindowCommand}" />
                     Command="{x:Static SystemCommands.CloseWindowCommand}" />
         </DockPanel>
         </DockPanel>
 
 
-        <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto" Margin="3,0">
+        <ScrollViewer Grid.Column="0" Grid.Row="1" VerticalScrollBarVisibility="Auto" Margin="3,0">
             <Grid Grid.Row="1" Margin="0,30,0,0">
             <Grid Grid.Row="1" Margin="0,30,0,0">
                 <Grid.RowDefinitions>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="90"/>
                     <RowDefinition Height="90"/>
@@ -272,5 +276,16 @@
                 </uc:AlignableWrapPanel>
                 </uc:AlignableWrapPanel>
             </Grid>
             </Grid>
         </ScrollViewer>
         </ScrollViewer>
+
+        <ScrollViewer Grid.Row="1" Grid.Column="1">
+            <Border Padding="5" BorderThickness="3 0 0 0" BorderBrush="{StaticResource MainColor}">
+                <StackPanel Orientation="Vertical">
+                    <TextBlock HorizontalAlignment="Center" Text="News" FontSize="18"/>
+                    <ItemsControl>
+
+                    </ItemsControl>
+                </StackPanel>
+            </Border>
+        </ScrollViewer>
     </Grid>
     </Grid>
 </Window>
 </Window>

+ 3 - 3
src/PixiEditor/Views/Dialogs/HelloTherePopup.xaml.cs

@@ -66,17 +66,17 @@ internal partial class HelloTherePopup : Window
 
 
         if (RecentlyOpenedEmpty)
         if (RecentlyOpenedEmpty)
         {
         {
-            Width = 400;
+            Width = 600;
             Height = 500;
             Height = 500;
         }
         }
         else if (RecentlyOpened.Count < 4)
         else if (RecentlyOpened.Count < 4)
         {
         {
-            Width = 445;
+            Width = 645;
             Height = 500;
             Height = 500;
         }
         }
         else if (RecentlyOpened.Count < 7)
         else if (RecentlyOpened.Count < 7)
         {
         {
-            Width = 475;
+            Width = 675;
             Height = 670;
             Height = 670;
         }
         }
     }
     }