Updated code to latest MAUI changes

Fixed up nullable calls

Author: MetalKid

sample/MauiSample/App.xaml.cs

@@ -1,5 +1,5 @@
 using CoreBTS.Maui.ShieldMVVM.Navigation;
-using MauiSample.Features.Main;
+using MauiSample.Features.Splash;
 
 namespace MauiSample;
 
@@ -12,15 +12,17 @@ public App(INavigationService navigation)
         _navigationService = navigation;
 
         InitializeComponent();
+    }
 
-        MainPage = new AppShell();
+    protected override Window CreateWindow(IActivationState? activationState)
+    {
+        return new Window(new AppShell());
     }
 
     protected override async void OnStart()
     {
         base.OnStart();
 
-        await _navigationService.NavigateToAsync<MainPageViewModel, MainPageArgs>(
-            new MainPageArgs(new Random().Next(1, 10)), mustClearNavigationStack: true);
+        await _navigationService.NavigateToAsync<SplashPageViewModel>(mustClearNavigationStack: true);
     }
 }

sample/MauiSample/AppShell.xaml

@@ -4,10 +4,17 @@
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:local="clr-namespace:MauiSample"
-    Shell.FlyoutBehavior="Disabled">
+    Shell.FlyoutBehavior="Disabled"
+    NavigationPage.HasNavigationBar="False"
+    NavigationPage.HasBackButton="False"
+    >
 
     <ShellContent>
 
+        <Shell.BackButtonBehavior>
+            <BackButtonBehavior IsVisible="False" IsEnabled="False" />
+        </Shell.BackButtonBehavior>
+
         <ContentPage>
         </ContentPage>
 

sample/MauiSample/Features/About/AboutPage.xaml.cs

@@ -3,12 +3,8 @@
 
 namespace MauiSample.Features.About;
 
-public partial class AboutPage : ContentPageBase<AboutPageViewModel>
+public partial class AboutPage(AboutPageViewModel viewModel) : ContentPageBase<AboutPageViewModel>(viewModel)
 {
-    public AboutPage(AboutPageViewModel viewModel) : base(viewModel)
-    {
-    }
-
     protected override void SetupBindings()
     {
         Binder.WithControl(Counter)
@@ -25,7 +21,7 @@ protected override void SetupBindings()
             .For(c => c.BindCommand(), vm => vm.AddCommand);
 
         Binder.WithControl(List)
-            .ForTemplate(vm => vm.AboutItems, AboutCell.ItemTemplate)
+            .ForTemplate(vm => vm.AboutItems!, AboutCell.ItemTemplate)
             .ForSingleSelection(vm => vm.SelectedCommand);
     }
 }

sample/MauiSample/Features/About/AboutPageViewModel.cs

@@ -18,8 +18,12 @@ public AboutPageViewModel(INavigationService navigationService) : base(navigatio
 
     public int Counter { get; protected set; }
 
-    [ObservableProperty]
-    private ObservableCollection<AboutItem> _aboutItems;
+    private ObservableCollection<AboutItem>? _aboutItems;
+    public ObservableCollection<AboutItem>? AboutItems
+    {
+        get => _aboutItems;
+        set => SetProperty(ref _aboutItems, value);
+    }
 
     public override void Prepare(AboutPageArgs parameters)
     {
@@ -28,13 +32,13 @@ public override void Prepare(AboutPageArgs parameters)
 
     public override Task InitializeAsync(CancellationToken token = default)
     {
-        AboutItems = new ObservableCollection<AboutItem>
-        {
+        AboutItems =
+        [
             new() { Name = "Test1", Description = "Desc 1" },
             new() { Name = "Test2", Description = "Desc 2" },
             new() { Name = "Test3", Description = "Desc 3" },
             new() { Name = "Test4", Description = "Desc 4" },
-        };
+        ];
 
         return Task.CompletedTask;
     }
@@ -44,9 +48,9 @@ private async Task DoDoneCommand() =>
 
     [RelayCommand]
     private void Add() =>
-        AboutItems.Add(new() { Name = Guid.NewGuid().ToString(), Description = "Test" });
+        AboutItems?.Add(new() { Name = Guid.NewGuid().ToString(), Description = "Test" });
 
     [RelayCommand]
     private void Selected(AboutItem item) =>
-       AboutItems.Add(item);
+       AboutItems?.Add(item);
 }

sample/MauiSample/Features/About/Cells/AboutCell.xaml.cs

@@ -7,9 +7,9 @@ public partial class AboutCell : ViewCellBase<AboutItem, AboutCell>
     protected override void SetupBindings()
     {
         Binder.WithControls(Name)
-            .For(c => c.BindText(), vm => vm.Name);
+            .For(c => c.BindText(), vm => vm.Name, vm => vm.ConvertToNonNullString());
 
         Binder.WithControls(Description)
-            .For(c => c.BindText(), vm => vm.Description);
+            .For(c => c.BindText(), vm => vm.Description, vm => vm.ConvertToNonNullString());
     }
 }

sample/MauiSample/Features/About/Cells/AboutItem.cs

@@ -2,6 +2,6 @@
 
 public class AboutItem
 {
-    public string Name { get; set; }
-    public string Description { get; set; }
+    public string? Name { get; set; }
+    public string? Description { get; set; }
 }

sample/MauiSample/Features/Main/Dialog/DialogPage.xaml.cs

@@ -1,12 +1,8 @@
 namespace MauiSample.Features.Main.Dialog;
 
 [XamlCompilation(XamlCompilationOptions.Compile)]
-public partial class DialogPage : DialogPageBase<DialogPageViewModel>
+public partial class DialogPage(DialogPageViewModel viewModel) : DialogPageBase<DialogPageViewModel>(viewModel)
 {
-    public DialogPage(DialogPageViewModel viewModel) : base(viewModel)
-    {
-    }
-
     protected override void SetupBindings()
     {
         Binder.WithControl(MyLabel)

sample/MauiSample/Features/Main/Dialog/DialogPromptPageViewModel.cs

@@ -1,18 +1,17 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using CoreBTS.Maui.ShieldMVVM.Navigation;
+using CoreBTS.Maui.ShieldMVVM.Navigation;
 using CoreBTS.Maui.ShieldMVVM.ViewModel;
 
 namespace MauiSample.Features.Main.Dialog;
 
-public partial class DialogPromptPageViewModel : DialogViewModelBase<DialogPromptPageArg, DialogPromptPageResult>
+public partial class DialogPromptPageViewModel(INavigationService navigationService) : DialogViewModelBase<DialogPromptPageArg, DialogPromptPageResult>(navigationService)
 {
-    public DialogPromptPageViewModel(INavigationService navigationService) : base(navigationService)
+    private int _counter;
+    public int Counter
     {
+        get => _counter;
+        set => SetProperty(ref _counter, value);
     }
 
-    [ObservableProperty]
-    private int _counter;
-
     public virtual string MyLabel => "Counter Value";
 
     public override Task SetResultAsync(CancellationToken token = default)

sample/MauiSample/Features/Main/MainPage.xaml

@@ -8,8 +8,8 @@
     x:DataType="vm:MainPageViewModel"
     >
 
-    <ScrollView>
-        
+    <ScrollView VerticalOptions="Fill">
+
         <VerticalStackLayout
             Spacing="25"
             Padding="30,0"
@@ -55,7 +55,7 @@
                  x:Name="SecondaryLabel"
                 />
 
-            <HorizontalStackLayout>
+            <HorizontalStackLayout >
 
                 <Button
                     x:Name="AboutPageButton"
@@ -64,7 +64,7 @@
 
                 <Button
                      x:Name="AboutAlternatePageButton"
-                     Text="About Alternate"
+                     Text="About Alt"
                      />
 
                 <Button

sample/MauiSample/Features/Main/MainPage.xaml.cs

@@ -4,6 +4,8 @@ public partial class MainPage : ContentPageBase<MainPageViewModel>
 {
     public MainPage(MainPageViewModel viewModel) : base(viewModel)
     {
+        NavigationPage.SetHasBackButton(this, false);
+        NavigationPage.SetHasNavigationBar(this, false);
     }
 
     protected override void SetupBindings()
@@ -16,7 +18,7 @@ protected override void SetupBindings()
             .For(c => c.BindText(), vm => vm.Counter, c => c.ConvertToString());
 
         Binder.WithControl(SecondaryLabel)
-            .For(c => c.BindText(), vm => vm.Secondary.MyLabel);
+            .For(c => c.BindText(), vm => vm.Secondary.MyLabel, vm => vm.ConvertToNonNullString());
 
         Binder.WithControl(AboutPageButton)
             .Once(c => c.BindClick(), vm => vm.AboutPageCommand);