diff --git a/readme.md b/readme.md index 0e64cc6..9e4c1ca 100644 --- a/readme.md +++ b/readme.md @@ -11,6 +11,10 @@ The screenshot below shows usage of the Prism's Region Manager, Modules, Dialogs ![Screen Shot](Sample-Outlookish-Annotated.png) +## Contributing + +We'd love to see this grow. Check out the [Outlook'ish Wiki](https://github.com/DamianSuess/Learn.PrismAvaloniaOutlookish/wiki) for more info + ## Tech Stack This project uses the following technologies: diff --git a/source/SampleApp.Main/Core/RegionAdapters/GridRegionAdapter.cs b/source/SampleApp.Main/Core/RegionAdapters/GridRegionAdapter.cs index 4c80819..6e75087 100644 --- a/source/SampleApp.Main/Core/RegionAdapters/GridRegionAdapter.cs +++ b/source/SampleApp.Main/Core/RegionAdapters/GridRegionAdapter.cs @@ -21,6 +21,7 @@ protected override void Adapt(IRegion region, Grid regionTarget) regionTarget.Children.Add(item); } } + if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove) { foreach (IControl item in e.OldItems) diff --git a/source/SampleApp.Main/Views/MainWindow.axaml b/source/SampleApp.Main/Views/MainWindow.axaml index a34cd94..ed8cb4b 100644 --- a/source/SampleApp.Main/Views/MainWindow.axaml +++ b/source/SampleApp.Main/Views/MainWindow.axaml @@ -7,6 +7,8 @@ xmlns:vm="using:SampleApp.ViewModels" mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="200" x:Class="SampleApp.Views.MainWindow" + x:CompileBindings="True" + x:DataType="vm:MainWindowViewModel" x:Name="MainShellWindow" Icon="/Assets/avalonia-logo.ico" Title="SampleApp"> diff --git a/source/SampleApp.Modules.Mail/SampleApp.Modules.Mail.csproj b/source/SampleApp.Modules.Mail/SampleApp.Modules.Mail.csproj index b841a4d..1ba6064 100644 --- a/source/SampleApp.Modules.Mail/SampleApp.Modules.Mail.csproj +++ b/source/SampleApp.Modules.Mail/SampleApp.Modules.Mail.csproj @@ -13,6 +13,7 @@ + diff --git a/source/SampleApp.Modules.Mail/ViewModels/MailFocusedViewModel.cs b/source/SampleApp.Modules.Mail/ViewModels/MailFocusedViewModel.cs index 8dab6df..07a7ea8 100644 --- a/source/SampleApp.Modules.Mail/ViewModels/MailFocusedViewModel.cs +++ b/source/SampleApp.Modules.Mail/ViewModels/MailFocusedViewModel.cs @@ -1,6 +1,7 @@ using System; using System.Collections.ObjectModel; using Prism; +using Prism.Commands; using SampleApp.Common; using SampleApp.Common.Models; using SampleApp.Services; @@ -23,6 +24,11 @@ public MailFocusedViewModel(IMailService mailService) /// Xamarin.Forms only, this never gets hit. public bool IsActive { get => _isActive; set => SetProperty(ref _isActive, value, RaiseIsActiveChanged);} + public DelegateCommand CmdTabClicked => new(() => + { + System.Diagnostics.Debug.WriteLine("Tab clicked?"); + }); + public ObservableCollection MailMessages { get; private set; } protected virtual void RaiseIsActiveChanged() diff --git a/source/SampleApp.Modules.Mail/Views/MailFocusedView.axaml b/source/SampleApp.Modules.Mail/Views/MailFocusedView.axaml index e1569a8..fe6f1d2 100644 --- a/source/SampleApp.Modules.Mail/Views/MailFocusedView.axaml +++ b/source/SampleApp.Modules.Mail/Views/MailFocusedView.axaml @@ -1,27 +1,47 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/source/SampleApp.Modules.Mail/Views/MailOtherView.axaml b/source/SampleApp.Modules.Mail/Views/MailOtherView.axaml index a659aa1..e8932d0 100644 --- a/source/SampleApp.Modules.Mail/Views/MailOtherView.axaml +++ b/source/SampleApp.Modules.Mail/Views/MailOtherView.axaml @@ -4,6 +4,8 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="using:SampleApp.Modules.Mail.ViewModels" x:Class="SampleApp.Modules.Mail.Views.MailOtherView" + x:CompileBindings="True" + x:DataType="vm:MailOtherViewModel" Tag="Other Items" d:DesignHeight="200" d:DesignWidth="400" diff --git a/source/SampleApp.Modules.Mail/Views/MailView.axaml b/source/SampleApp.Modules.Mail/Views/MailView.axaml index 9ae581d..7cf7583 100644 --- a/source/SampleApp.Modules.Mail/Views/MailView.axaml +++ b/source/SampleApp.Modules.Mail/Views/MailView.axaml @@ -6,6 +6,8 @@ xmlns:prism="http://prismlibrary.com/" xmlns:vm="using:SampleApp.Modules.Mail.ViewModels" x:Class="SampleApp.Modules.Mail.Views.MailView" + x:CompileBindings="True" + x:DataType="vm:MailViewModel" prism:ViewModelLocator.AutoWireViewModel="True">