Merge branch 'master' into practice-state

Author: daniel-lerch

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <AvaloniaVersion>11.3.2</AvaloniaVersion>
+    <AvaloniaVersion>11.3.3</AvaloniaVersion>
   </PropertyGroup>
 </Project>

src/Vocup/Lang/Resources.Designer.cs

@@ -138,4 +138,7 @@
   <data name="AboutView.VocupOnGithub" xml:space="preserve">
     <value>Vocup auf GitHub</value>
   </data>
+  <data name="VhfFileType" xml:space="preserve">
+    <value>Vocup Vokabelheft</value>
+  </data>
 </root>

src/Vocup/Lang/Resources.de.resx

@@ -138,4 +138,7 @@
   <data name="AboutView.VocupOnGithub" xml:space="preserve">
     <value>Vocup op GitHub</value>
   </data>
+  <data name="VhfFileType" xml:space="preserve">
+    <value>Vocup Woordenboek</value>
+  </data>
 </root>

src/Vocup/Lang/Resources.nl.resx

@@ -138,4 +138,7 @@
   <data name="AboutView.VocupOnGithub" xml:space="preserve">
     <value>Vocup on GitHub</value>
   </data>
+  <data name="VhfFileType" xml:space="preserve">
+    <value>Vocup vocabulary book</value>
+  </data>
 </root>

src/Vocup/Lang/Resources.resx

@@ -13,21 +13,26 @@ public MainView()
 
         TopLevel.SetAutoSafeAreaPadding(this, true);
 
-        this.WhenActivated(d => d(ViewModel.PickFileInteraction.RegisterHandler(async interaction =>
+        // ViewModel must be set before control activation
+        this.WhenActivated(d => d(ViewModel!.PickFileInteraction.RegisterHandler(async interaction =>
         {
-            var files = await TopLevel.GetTopLevel(this).StorageProvider.OpenFilePickerAsync(new()
+            // This control must be assinged to a TopLevel when it is activated
+            var files = await TopLevel.GetTopLevel(this)!.StorageProvider.OpenFilePickerAsync(new()
             {
                 AllowMultiple = false,
+                FileTypeFilter = [new(Lang.Resources.VhfFileType) { Patterns = ["*.vhf"] }]
             });
             if (files.Count > 0)
                 interaction.SetOutput(files[0]);
             else
                 interaction.SetOutput(null);
         })));
 
-        this.WhenActivated(d => d(ViewModel.FileFromUriInteraction.RegisterHandler(async interaction =>
+        // ViewModel must be set before control activation
+        this.WhenActivated(d => d(ViewModel!.FileFromUriInteraction.RegisterHandler(async interaction =>
         {
-            var file = await TopLevel.GetTopLevel(this).StorageProvider.TryGetFileFromPathAsync(interaction.Input);
+            // This control must be assinged to a TopLevel when it is activated
+            var file = await TopLevel.GetTopLevel(this)!.StorageProvider.TryGetFileFromPathAsync(interaction.Input);
             interaction.SetOutput(file);
         })));
     }

src/Vocup/Views/MainView.axaml.cs

@@ -6,7 +6,11 @@
         xmlns:views="clr-namespace:Vocup.Views"
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="Vocup.Views.MainWindow"
+        x:DataType="vm:MainViewModel"
         Icon="/Assets/square-logo.ico"
         Title="Vocup">
-        <views:MainView />
+  <Design.DataContext>
+    <vm:MainViewModel />
+  </Design.DataContext>
+  <views:MainView DataContext="{Binding}" />
 </Window>