Added more UWPC project props

Author: yoshiask

FluentStore.SDK/Handlers/UwpCommunityHandler.cs

@@ -87,6 +87,10 @@ public async Task<PackageBase> GetPackage(string projectIdStr)
                 .SetQueryParam("projectId", projectIdStr).GetJsonAsync<List<dynamic>>();
             package.UpdateWithCollaborators(collaborators);
 
+            var features = await BASE_URL.AppendPathSegments("projects", "features")
+                .SetQueryParam("projectId", projectIdStr).GetJsonAsync<List<string>>();
+            package.UpdateWithFeatures(features);
+
             package.Status = PackageStatus.DownloadReady;
             return package;
         }
@@ -197,6 +201,8 @@ public override async Task<PackageBase> GetPackageFromUrl(Url url)
 
         public override Url GetUrlFromPackage(PackageBase package)
         {
+            if (package is UwpCommunityPackage uwpcPackage && uwpcPackage.HasWebsite)
+                return uwpcPackage.Website;
             return "fluentstore://package/" + package.Urn.ToString();
         }
     }

FluentStore.SDK/Models/Link.cs

@@ -75,5 +75,8 @@ public static Link Create(string url, string textContent = null)
                 return null;
             }
         }
+
+        public static implicit operator Flurl.Url(Link link) => link.Uri;
+        public static implicit operator Uri(Link link) => link.Uri;
     }
 }

FluentStore.SDK/PackageTypes/UwpCommunityPackage.cs

@@ -1,34 +1,35 @@
 using FluentStore.SDK.Images;
 using FluentStore.Services;
-using Flurl;
 using Garfoot.Utilities.FluentUrn;
 using CommunityToolkit.Diagnostics;
-using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Windows.Storage;
 using System.IO;
 using CommunityToolkit.Mvvm.Messaging;
 using FluentStore.SDK.Messages;
+using FluentStore.SDK.Models;
+using FluentStore.SDK.Attributes;
 
 namespace FluentStore.SDK.Packages
 {
     public class UwpCommunityPackage : PackageBase<dynamic>
     {
-        INavigationService NavigationService = Ioc.Default.GetRequiredService<INavigationService>();
-        PackageService PackageService = Ioc.Default.GetRequiredService<PackageService>();
+        readonly INavigationService NavigationService = Ioc.Default.GetRequiredService<INavigationService>();
+        readonly PackageService PackageService = Ioc.Default.GetRequiredService<PackageService>();
 
-        public UwpCommunityPackage(dynamic project = null, IEnumerable<string> images = null, IEnumerable<dynamic> collaborators = null)
+        public UwpCommunityPackage(dynamic project = null, IEnumerable<string> images = null, IEnumerable<dynamic> collaborators = null, IEnumerable<string> features = null)
         {
             if (project != null)
                 UpdateWithProject(project);
             if (images != null)
                 UpdateWithImages(images);
             if (collaborators != null)
                 UpdateWithCollaborators(collaborators);
+            if (features != null)
+                UpdateWithFeatures(features);
         }
 
         public void UpdateWithProject(dynamic project)
@@ -40,6 +41,8 @@ public void UpdateWithProject(dynamic project)
             Title = project.appName;
             Description = project.description;
             ReleaseDate = project.createdAt;
+            if (project.externalLink != null)
+                Website = Link.Create(project.externalLink, ShortTitle + " website");
 
             if (project.heroImage != null)
                 Images.Add(new FileImage
@@ -55,13 +58,16 @@ public void UpdateWithProject(dynamic project)
                     ImageType = ImageType.Logo,
                     BackgroundColor = project.accentColor,
                 });
-            else
-                Images.Add(TextImage.CreateFromName(Title));
 
             // Set UWPC properties
             ProjectId = (int)project.id;
             if (project.downloadLink != null)
                 PackageUri = new(project.downloadLink);
+            if (project.githubLink != null)
+                GithubLink = Link.Create(project.githubLink, ShortTitle + " on GitHub");
+            if (project.tags != null)
+                foreach (dynamic tag in project.tags)
+                    Tags.Add(tag.name);
         }
 
         public void UpdateWithImages(IEnumerable<string> images)
@@ -87,6 +93,13 @@ public void UpdateWithCollaborators(IEnumerable<dynamic> collaborators)
                 DeveloperName = owner.name;
         }
 
+        public void UpdateWithFeatures(IEnumerable<string> features)
+        {
+            Guard.IsNotNull(features, nameof(features));
+
+            Features.AddRange(features);
+        }
+
         private Urn _Urn;
         public override Urn Urn
         {
@@ -187,5 +200,29 @@ public PackageBase LinkedPackage
             get => _LinkedPackage;
             set => SetProperty(ref _LinkedPackage, value);
         }
+
+        private Link _GithubLink;
+        [DisplayAdditionalInformation("Source code", "\uE943")]
+        public Link GithubLink
+        {
+            get => _GithubLink;
+            set => SetProperty(ref _GithubLink, value);
+        }
+
+        private List<string> _Tags = new();
+        [DisplayAdditionalInformation(Icon = "\uE1CB")]
+        public List<string> Tags
+        {
+            get => _Tags;
+            set => SetProperty(ref _Tags, value);
+        }
+
+        private List<string> _Features = new();
+        [Display(Rank = 2)]
+        public List<string> Features
+        {
+            get => _Features;
+            set => SetProperty(ref _Features, value);
+        }
     }
 }

Installer/Installer.csproj

@@ -1,4 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk"
+		 InitialTargets="CopyInstallerPackage">
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
@@ -21,6 +22,12 @@
         <None Remove="Resources\Background.png" />
         <None Remove="Resources\Square71x71Logo.png" />
     </ItemGroup>
+	
+	<Target Name="CopyInstallerPackage" BeforeTargets="Resources">
+		<Message Text="Copied installer package" />
+		<Copy SourceFiles="Resources\Packages\FluentStore_Beta_$(Platform).zip"
+			  DestinationFiles="Resources\FluentStore_Beta.zip" />
+	</Target>
 
     <ItemGroup>
         <PackageReference Include="PostSharp.Community.Packer" Version="1.2.0" />