diff --git a/Borepin/Borepin/App.xaml.cs b/Borepin/Borepin/App.xaml.cs index 3eec22d..238f247 100644 --- a/Borepin/Borepin/App.xaml.cs +++ b/Borepin/Borepin/App.xaml.cs @@ -39,6 +39,7 @@ namespace Borepin result = await NavigationService.NavigateAsync("/MainPage/NavigationPage/ServerListPage"); } + //result = await NavigationService.NavigateAsync("/NavigationPage/TestPage"); if (!result.Success) { System.Diagnostics.Debugger.Break(); @@ -59,6 +60,7 @@ namespace Borepin containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); containerRegistry.RegisterForNavigation(); + containerRegistry.RegisterForNavigation(); // Register Dialog containerRegistry.RegisterDialog(); diff --git a/Borepin/Borepin/Base/PageModelBase.cs b/Borepin/Borepin/Base/PageModelBase.cs new file mode 100644 index 0000000..4d37cb6 --- /dev/null +++ b/Borepin/Borepin/Base/PageModelBase.cs @@ -0,0 +1,48 @@ +using Prism.Mvvm; +using Prism.Navigation; +using System.Threading.Tasks; + +namespace Borepin.Base +{ + /// + /// Base for all BFFH Based PageModels + /// + public abstract class PageModelBase : BindableBase, INavigationAware + { + #region Private Properties + protected readonly INavigationService _NavigationService; + #endregion + + #region Contructors + public PageModelBase(INavigationService navigationService) + { + _NavigationService = navigationService; + } + #endregion + + #region Properties + /// + /// PageModel is Busy + /// + private bool _IsBusy = true; + public bool IsBusy + { + get => _IsBusy; + set => SetProperty(ref _IsBusy, value); + } + #endregion + + #region Data + /// + /// Load Data async + /// + /// + public abstract Task LoadData(); + #endregion + + #region INavigationAware + public abstract void OnNavigatedFrom(INavigationParameters parameters); + public abstract void OnNavigatedTo(INavigationParameters parameters); + #endregion + } +} \ No newline at end of file diff --git a/Borepin/Borepin/Borepin.csproj b/Borepin/Borepin/Borepin.csproj index 7ec38ab..5628c8e 100644 --- a/Borepin/Borepin/Borepin.csproj +++ b/Borepin/Borepin/Borepin.csproj @@ -82,6 +82,9 @@ MSBuild:UpdateDesignTimeXaml + + MSBuild:UpdateDesignTimeXaml + ResXFileCodeGenerator Resources.Designer.cs @@ -93,6 +96,9 @@ MSBuild:UpdateDesignTimeXaml + + MSBuild:UpdateDesignTimeXaml + MSBuild:UpdateDesignTimeXaml @@ -101,7 +107,6 @@ - diff --git a/Borepin/Borepin/Page/MachineListPage.xaml b/Borepin/Borepin/Page/MachineListPage.xaml index 0f10107..bd0e5a4 100644 --- a/Borepin/Borepin/Page/MachineListPage.xaml +++ b/Borepin/Borepin/Page/MachineListPage.xaml @@ -2,21 +2,32 @@ + x:Class="Borepin.Page.MachineListPage" + xmlns:converters="clr-namespace:Borepin.Converter"> + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Borepin/Borepin/Page/MachinePage.xaml b/Borepin/Borepin/Page/MachinePage.xaml index 347475f..3e65181 100644 --- a/Borepin/Borepin/Page/MachinePage.xaml +++ b/Borepin/Borepin/Page/MachinePage.xaml @@ -10,14 +10,20 @@ + -