Define DataType for each view to solve the trimming issue when publishing

Author: Coding-Enthusiast

Src/FinderOuter/App.xaml

@@ -1,24 +1,35 @@
 <Application xmlns="https://github.com/avaloniaui"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:FinderOuter"
+             xmlns:vm="clr-namespace:FinderOuter.ViewModels"
+             xmlns:views="clr-namespace:FinderOuter.Views"
              x:Class="FinderOuter.App"
              RequestedThemeVariant="Default">
-  <Application.DataTemplates>
-    <local:ViewLocator/>
-  </Application.DataTemplates>
 
   <Application.Styles>
     <SimpleTheme/>
   </Application.Styles>
 
+  <Application.DataTemplates>
+    <DataTemplate DataType="{x:Type vm:AboutViewModel}">
+      <views:AboutView/>
+    </DataTemplate>
+    <DataTemplate DataType="{x:Type vm:MessageBoxViewModel}">
+      <views:MessageBoxView/>
+    </DataTemplate>
+    <DataTemplate DataType="{x:Type vm:KnowledgeBaseViewModel}">
+      <views:KnowledgeBaseView/>
+    </DataTemplate>
+  </Application.DataTemplates>
+
   <Application.Styles>
     <Style Selector="Button">
       <Setter Property="CornerRadius" Value="5"/>
     </Style>
 
     <!--Use Classes="Help" in any Button to change it into a round help button with "?" in it-->
     <Style Selector="Button.Help">
-      <Setter Property="Command" Value="{Binding OpenKBCommand}"/>
+      <Setter Property="Command" Value="{Binding OpenKBCommand}" x:DataType="vm:ViewModelBase"/>
       <Setter Property="CommandParameter" Value="Bitcoin"/>
       <Setter Property="CornerRadius" Value="20"/>
       <Setter Property="Margin" Value="6,6,5,5"/>

Src/FinderOuter/ViewModels/AboutViewModel.cs

@@ -51,7 +51,7 @@ public async void Copy(int i)
 
         // Taken from avalonia source code
         // https://github.com/AvaloniaUI/Avalonia/blob/4340831f29c2dda00cfc3993303921272fedfc61/src/Avalonia.Dialogs/AboutAvaloniaDialog.xaml
-        public static void OpenBrowser(string url)
+        public void OpenBrowser(string url)
         {
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
             {

Src/FinderOuter/ViewModels/MainWindowViewModel.cs

@@ -63,7 +63,7 @@ public MainWindowViewModel()
         public OptionVmBase SelectedOption
         {
             get => _selOpt;
-            private set
+            set
             {
                 if (value is not null)
                 {

Src/FinderOuter/ViewModels/MissingBase16ViewModel.cs

@@ -18,6 +18,11 @@ namespace FinderOuter.ViewModels
 {
     public class MissingBase16ViewModel : OptionVmBase
     {
+        // Makes designer happy!
+        public MissingBase16ViewModel() : this(new Settings())
+        {
+        }
+
         public MissingBase16ViewModel(Settings settings)
         {
             Result.Settings = settings;

Src/FinderOuter/ViewModels/MissingBase58ViewModel.cs

@@ -18,6 +18,11 @@ namespace FinderOuter.ViewModels
 {
     public class MissingBase58ViewModel : OptionVmBase
     {
+        // Makes designer happy!
+        public MissingBase58ViewModel() : this(new Settings())
+        {
+        }
+
         public MissingBase58ViewModel(Settings settings)
         {
             Result.Settings = settings;

Src/FinderOuter/ViewModels/MissingBip32PathViewModel.cs

@@ -20,7 +20,7 @@ public MissingBip32PathViewModel()
         {
             InputTypeList = ListHelper.GetEnumDescItems<Bip32PathService.SeedType>().ToArray();
             WordListsList = Enum.GetValues(typeof(BIP0039.WordLists)).Cast<BIP0039.WordLists>();
-            CompareInputTypeList = ListHelper.GetEnumDescItems<CompareInputType>(CompareInputType.PrivateKey).ToArray();
+            CompareInputTypeList = ListHelper.GetEnumDescItems(CompareInputType.PrivateKey).ToArray();
 
             SelectedInputType = InputTypeList.First();
             SelectedCompareInputType = CompareInputTypeList.First();
@@ -77,7 +77,7 @@ public bool IsMnemonic
             set => this.RaiseAndSetIfChanged(ref _isMn, value);
         }
 
-        private string _xk;
+        private string _xk = string.Empty;
         public string XKey
         {
             get => _xk;
@@ -111,7 +111,7 @@ public string XKey
             }
         }
 
-        private string _pass;
+        private string _pass = string.Empty;
         public string PassPhrase
         {
             get => _pass;

Src/FinderOuter/ViewModels/MissingBip38PassViewModel.cs

@@ -18,6 +18,11 @@ namespace FinderOuter.ViewModels
 {
     public class MissingBip38PassViewModel : OptionVmBase
     {
+        // Makes designer happy!
+        public MissingBip38PassViewModel() : this(new Settings())
+        {
+        }
+
         public MissingBip38PassViewModel(Settings settings)
         {
             Result.Settings = settings;

Src/FinderOuter/ViewModels/MissingMiniPrivateKeyViewModel.cs

@@ -18,6 +18,11 @@ namespace FinderOuter.ViewModels
 {
     public class MissingMiniPrivateKeyViewModel : OptionVmBase
     {
+        // Makes designer happy!
+        public MissingMiniPrivateKeyViewModel() : this(new Settings())
+        {
+        }
+
         public MissingMiniPrivateKeyViewModel(Settings settings)
         {
             Result.Settings = settings;

Src/FinderOuter/ViewModels/MissingMnemonicPassViewModel.cs

@@ -17,6 +17,11 @@ namespace FinderOuter.ViewModels
 {
     public class MissingMnemonicPassViewModel : OptionVmBase
     {
+        // Makes designer happy!
+        public MissingMnemonicPassViewModel() : this(new Settings())
+        {
+        }
+
         public MissingMnemonicPassViewModel(Settings settings)
         {
             Result.Settings = settings;

Src/FinderOuter/Views/AboutView.axaml

@@ -3,7 +3,10 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:vm="clr-namespace:FinderOuter.ViewModels;assembly=FinderOuter"
+             xmlns:views="clr-namespace:FinderOuter.Views"
              mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="400"
+             x:CompileBindings="True"
+             x:DataType="vm:AboutViewModel"
              x:Class="FinderOuter.Views.AboutView"
              FontFamily="Comic Sans MS" FontSize="16">