diff --git a/src/SamplesApp/UnoIslands.Shared/MainPage.xaml b/src/SamplesApp/UnoIslands.Shared/MainPage.xaml
index 44b7b87f26b7..38617d3aeef5 100644
--- a/src/SamplesApp/UnoIslands.Shared/MainPage.xaml
+++ b/src/SamplesApp/UnoIslands.Shared/MainPage.xaml
@@ -8,8 +8,21 @@
mc:Ignorable="d"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
diff --git a/src/SamplesApp/UnoIslands.Shared/UnoIslands.Shared.projitems b/src/SamplesApp/UnoIslands.Shared/UnoIslands.Shared.projitems
index 24746c55ee63..11665002fa7d 100644
--- a/src/SamplesApp/UnoIslands.Shared/UnoIslands.Shared.projitems
+++ b/src/SamplesApp/UnoIslands.Shared/UnoIslands.Shared.projitems
@@ -62,4 +62,7 @@
<_Globbed_Content Include="$(MSBuildThisFileDirectory)Assets/**/*.*" Exclude="@(Content)" />
+
+
+
\ No newline at end of file
diff --git a/src/SamplesApp/UnoIslands.WPF/MainWindowViewModel.cs b/src/SamplesApp/UnoIslands.WPF/MainWindowViewModel.cs
index 5fd2300398db..d51be84d9c81 100644
--- a/src/SamplesApp/UnoIslands.WPF/MainWindowViewModel.cs
+++ b/src/SamplesApp/UnoIslands.WPF/MainWindowViewModel.cs
@@ -7,18 +7,18 @@ namespace UnoIslands.Skia.Wpf
{
public class MainWindowViewModel : INotifyPropertyChanged
{
- private DataItem _selectedItem = null;
+ private PersonViewModel _selectedItem = null;
public MainWindowViewModel()
{
using var stream = typeof(MainWindowViewModel).Assembly.GetManifestResourceStream("UnoIslands.Skia.Wpf.TestData.json");
using var textStream = new StreamReader(stream);
- Data = JsonConvert.DeserializeObject(textStream.ReadToEnd());
+ Data = JsonConvert.DeserializeObject(textStream.ReadToEnd());
}
- public DataItem[] Data { get; }
+ public PersonViewModel[] Data { get; }
- public DataItem SelectedItem
+ public PersonViewModel SelectedItem
{
get => _selectedItem;
set
diff --git a/src/SamplesApp/UnoIslands.WPF/DataItem.cs b/src/SamplesApp/UnoIslands.WPF/PersonViewModel.cs
similarity index 69%
rename from src/SamplesApp/UnoIslands.WPF/DataItem.cs
rename to src/SamplesApp/UnoIslands.WPF/PersonViewModel.cs
index 1e56f6827dc9..66cbb3e79274 100644
--- a/src/SamplesApp/UnoIslands.WPF/DataItem.cs
+++ b/src/SamplesApp/UnoIslands.WPF/PersonViewModel.cs
@@ -6,7 +6,7 @@
namespace UnoIslands.Skia.Wpf
{
- public class DataItem
+ public class PersonViewModel
{
public string Name { get; set; }
@@ -21,5 +21,9 @@ public class DataItem
public string Region { get; set; }
public string Country { get; set; }
+
+ public string EmailUrl => "mailto:" + Email;
+
+ public string ImageUrl => $"https://www.gravatar.com/avatar/{Name.GetHashCode()}?s=128&d=identicon&r=PG";
}
}
diff --git a/src/SamplesApp/UnoIslands.WPF/TestData.json b/src/SamplesApp/UnoIslands.WPF/TestData.json
index feb633ef2d3c..bdde0b99c452 100644
--- a/src/SamplesApp/UnoIslands.WPF/TestData.json
+++ b/src/SamplesApp/UnoIslands.WPF/TestData.json
@@ -449,4 +449,4 @@
"region": "Møre og Romsdal",
"country": "Turkey"
}
-]
\ No newline at end of file
+]
diff --git a/src/Uno.UI.Runtime.Skia.Wpf/Islands/WpfIslandsHost.cs b/src/Uno.UI.Runtime.Skia.Wpf/Islands/WpfIslandsHost.cs
index d859ca4dd968..64c1a4c89a00 100644
--- a/src/Uno.UI.Runtime.Skia.Wpf/Islands/WpfIslandsHost.cs
+++ b/src/Uno.UI.Runtime.Skia.Wpf/Islands/WpfIslandsHost.cs
@@ -89,7 +89,7 @@ void CreateApp(WinUI.ApplicationInitializationCallbackParams _)
Windows.UI.Core.CoreDispatcher.DispatchOverride = d => dispatcher.BeginInvoke(d);
Windows.UI.Core.CoreDispatcher.HasThreadAccessOverride = dispatcher.CheckAccess;
- WinUI.Application.Start(CreateApp, args);
+ WinUI.Application.Start(CreateApp);
WpfApplication.Current.Activated += Current_Activated;
WpfApplication.Current.Deactivated += Current_Deactivated;