diff --git a/TransactionMobile.Maui.BusinessLogic/UIServices/IApplicationInfoService.cs b/TransactionMobile.Maui.BusinessLogic/UIServices/IApplicationInfoService.cs new file mode 100644 index 00000000..03a4e00b --- /dev/null +++ b/TransactionMobile.Maui.BusinessLogic/UIServices/IApplicationInfoService.cs @@ -0,0 +1,16 @@ +namespace TransactionMobile.Maui.BusinessLogic.UIServices; + +public interface IApplicationInfoService +{ + String BuildString { get; } + + String ApplicationName { get; } + + String PackageName { get; } + + String Theme { get; } + + Version Version { get; } + + String VersionString { get; } +} \ No newline at end of file diff --git a/TransactionMobile.Maui.BusinessLogic/ViewModels/Support/SupportPageViewModel.cs b/TransactionMobile.Maui.BusinessLogic/ViewModels/Support/SupportPageViewModel.cs index 469b95d9..82eedc17 100644 --- a/TransactionMobile.Maui.BusinessLogic/ViewModels/Support/SupportPageViewModel.cs +++ b/TransactionMobile.Maui.BusinessLogic/ViewModels/Support/SupportPageViewModel.cs @@ -13,11 +13,16 @@ public class SupportPageViewModel : BaseViewModel { private readonly IDeviceService DeviceService; - public SupportPageViewModel(IDeviceService deviceService) + private readonly IApplicationInfoService ApplicationInfoService; + + public SupportPageViewModel(IDeviceService deviceService,IApplicationInfoService applicationInfoService) { this.DeviceService = deviceService; + this.ApplicationInfoService = applicationInfoService; } - public string AppVersion => $"Version: {AppInfo.VersionString}{Environment.NewLine}Copyright © 2022 Stuart Ferguson"; + + public String ApplicationName => $"{this.ApplicationInfoService.ApplicationName} v{this.ApplicationInfoService.VersionString}"; + //public string AppVersion => $"Version: {this.ApplicationInfoService.VersionString}{Environment.NewLine}Copyright © 2022 Stuart Ferguson"; //public string Description => "A playground for experiments with .Net MAUI. All code is available on GitHub and development is documented on my blog 'Sailing the Sharp Sea'."; diff --git a/TransactionMobile.Maui/Extensions/MauiAppBuilderExtensions.cs b/TransactionMobile.Maui/Extensions/MauiAppBuilderExtensions.cs index d1c1de39..dcc53251 100644 --- a/TransactionMobile.Maui/Extensions/MauiAppBuilderExtensions.cs +++ b/TransactionMobile.Maui/Extensions/MauiAppBuilderExtensions.cs @@ -5,6 +5,7 @@ using BusinessLogic.Requests; using BusinessLogic.Services; using BusinessLogic.Services.DummyServices; + using BusinessLogic.UIServices; using BusinessLogic.ViewModels; using BusinessLogic.ViewModels.Support; using BusinessLogic.ViewModels.Transactions; @@ -29,6 +30,7 @@ public static MauiAppBuilder ConfigureUIServices(this MauiAppBuilder builder) { // builder.Services.AddSingleton(); builder.Services.AddSingleton(); + builder.Services.AddSingleton(); return builder; } diff --git a/TransactionMobile.Maui/Pages/Support/SupportPage.xaml b/TransactionMobile.Maui/Pages/Support/SupportPage.xaml index 80318af4..a56d4532 100644 --- a/TransactionMobile.Maui/Pages/Support/SupportPage.xaml +++ b/TransactionMobile.Maui/Pages/Support/SupportPage.xaml @@ -2,52 +2,27 @@ - - + + \ No newline at end of file diff --git a/TransactionMobile.Maui/Resources/Images/techsupport.jpg b/TransactionMobile.Maui/Resources/Images/techsupport.jpg new file mode 100644 index 00000000..39300beb Binary files /dev/null and b/TransactionMobile.Maui/Resources/Images/techsupport.jpg differ diff --git a/TransactionMobile.Maui/UIServices/ApplicationInfoService.cs b/TransactionMobile.Maui/UIServices/ApplicationInfoService.cs new file mode 100644 index 00000000..828608d7 --- /dev/null +++ b/TransactionMobile.Maui/UIServices/ApplicationInfoService.cs @@ -0,0 +1,18 @@ +namespace TransactionMobile.Maui.UIServices; + +using BusinessLogic.UIServices; + +public class ApplicationInfoService : IApplicationInfoService +{ + public String BuildString => AppInfo.BuildString; + + public String ApplicationName => AppInfo.Name; + + public String PackageName => AppInfo.PackageName; + + public String Theme => AppInfo.RequestedTheme.ToString(); + + public Version Version => AppInfo.Version; + + public String VersionString => AppInfo.VersionString; +} \ No newline at end of file