Bläddra i källkod

News look wip

Krzysztof Krysiński 2 år sedan
förälder
incheckning
aa34337c6c

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

@@ -16,4 +16,5 @@ internal record News
     public NewsType NewsType { get; set; }
     public string Url { get; set; }
     public DateTime Date { get; set; }
+    public string CustomIconUrl { get; set; }
 }

+ 8 - 1
src/PixiEditor/Models/Services/NewsFeed/NewsProvider.cs

@@ -17,7 +17,14 @@ internal class NewsProvider
         if (response.StatusCode == HttpStatusCode.OK)
         {
             string content = await response.Content.ReadAsStringAsync();
-            return JsonConvert.DeserializeObject<List<News>>(content);
+            var list = JsonConvert.DeserializeObject<List<News>>(content);
+            list.Add(new News(){ Title = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam euismod, " +
+                                         "nisl eget ultricies ultrices, nisl nisl ultricies nisl, nec", Date = DateTime.Now,
+                ShortDescription = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam euismod, nisl eget ultricies ultrices, nisl nisl ultricies nisl, nec" ,
+                CustomIconUrl = "https://raw.githubusercontent.com/PixiEditor/PixiEditor/master/src/PixiEditor/Images/SocialMedia/WebsiteIcon.png"
+            });
+
+            return list;
         }
 
         return null;

+ 1 - 1
src/PixiEditor/Views/Dialogs/HelloTherePopup.xaml

@@ -285,7 +285,7 @@
                     <ItemsControl ItemsSource="{Binding Path=News}">
                         <ItemsControl.ItemTemplate>
                             <DataTemplate>
-                                <newsFeed:NewsItem News="{Binding Path=.}"/>
+                                <newsFeed:NewsItem Margin="5" News="{Binding Path=.}"/>
                             </DataTemplate>
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>

+ 18 - 4
src/PixiEditor/Views/UserControls/NewsFeed/NewsItem.xaml

@@ -5,10 +5,24 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="clr-namespace:PixiEditor.Views.UserControls.NewsFeed"
+             xmlns:xaml="clr-namespace:PixiEditor.Models.Commands.XAML"
              mc:Ignorable="d" Name="newsItem"
              d:DesignHeight="300" d:DesignWidth="300">
-    <StackPanel Orientation="Vertical">
-        <TextBlock Foreground="White" FontSize="14" Text="{Binding ElementName=newsItem, Path=News.Title}"/>
-        <TextBlock Foreground="White" FontSize="12" Text="{Binding ElementName=newsItem, Path=News.ShortDescription}"/>
-    </StackPanel>
+    <Border Background="{StaticResource MainColor}" Padding="5" CornerRadius="5">
+        <StackPanel Orientation="Vertical">
+            <StackPanel Orientation="Horizontal">
+                <Image Margin="0 0 5 0" Width="25" Source="{Binding ElementName=newsItem, Path=News.CustomIconUrl}"/>
+                <Label VerticalAlignment="Center" Foreground="White" FontSize="14" HorizontalAlignment="Center">
+                    <Hyperlink
+                               Command="{xaml:Command PixiEditor.Links.OpenHyperlink, UseProvided=True}"
+                               CommandParameter="{Binding ElementName=newsItem, Path=News.Url}"
+                               Style="{StaticResource SettingsLink}">
+                        <Run Text="{Binding ElementName=newsItem, Path=News.Title}"/>
+                        <Run Text="" FontFamily="{StaticResource Feather}"/>
+                    </Hyperlink>
+                </Label>
+            </StackPanel>
+            <TextBlock HorizontalAlignment="Center" TextWrapping="Wrap" Foreground="White" FontSize="12" Text="{Binding ElementName=newsItem, Path=News.ShortDescription}"/>
+        </StackPanel>
+    </Border>
 </UserControl>