diff --git a/Borepin/Borepin.Android/Borepin.Android.csproj b/Borepin/Borepin.Android/Borepin.Android.csproj index 6f628be..06f1b43 100644 --- a/Borepin/Borepin.Android/Borepin.Android.csproj +++ b/Borepin/Borepin.Android/Borepin.Android.csproj @@ -81,6 +81,7 @@ + diff --git a/Borepin/Borepin.Android/PlatformInitializer.cs b/Borepin/Borepin.Android/PlatformInitializer.cs index ac5fbc0..540b18b 100644 --- a/Borepin/Borepin.Android/PlatformInitializer.cs +++ b/Borepin/Borepin.Android/PlatformInitializer.cs @@ -1,5 +1,6 @@ using Borepin.Droid.Services; using Borepin.Service; +using Borepin.Service.Browser; using Borepin.Service.Storage; using Borepin.Service.Versioning; using Prism; @@ -14,6 +15,7 @@ namespace Borepin.Droid containerRegistry.Register(); containerRegistry.Register(); containerRegistry.Register(); + containerRegistry.Register(); containerRegistry.RegisterSingleton(); } diff --git a/Borepin/Borepin.Android/Services/BrowserService.cs b/Borepin/Borepin.Android/Services/BrowserService.cs new file mode 100644 index 0000000..7345dd6 --- /dev/null +++ b/Borepin/Borepin.Android/Services/BrowserService.cs @@ -0,0 +1,51 @@ +using Borepin.Service.Browser; +using System; +using System.Threading.Tasks; +using Xamarin.Essentials; + +namespace Borepin.Droid.Services +{ + public class BrowserService : IBrowserService + { + private Xamarin.Essentials.BrowserLaunchOptions ConvertBrowserLaunchOptions(Service.Browser.BrowserLaunchOptions browserLaunchOptions) + { + return new Xamarin.Essentials.BrowserLaunchOptions() + { + Flags = (Xamarin.Essentials.BrowserLaunchFlags)browserLaunchOptions.Flags, + LaunchMode = (Xamarin.Essentials.BrowserLaunchMode)browserLaunchOptions.LaunchMode, + PreferredControlColor = browserLaunchOptions.PreferredControlColor, + PreferredToolbarColor = browserLaunchOptions.PreferredToolbarColor, + TitleMode = (Xamarin.Essentials.BrowserTitleMode)browserLaunchOptions.TitleMode + }; + } + public async Task OpenAsync(string uri) + { + await Browser.OpenAsync(uri).ConfigureAwait(false); + } + + public async Task OpenAsync(string uri, Service.Browser.BrowserLaunchMode browserLaunchMode) + { + await Browser.OpenAsync(uri, (Xamarin.Essentials.BrowserLaunchMode)browserLaunchMode).ConfigureAwait(false); + } + + public async Task OpenAsync(string uri, Service.Browser.BrowserLaunchOptions browserLaunchOptions) + { + await Browser.OpenAsync(uri, ConvertBrowserLaunchOptions(browserLaunchOptions)); + } + + public async Task OpenAsync(Uri uri) + { + await Browser.OpenAsync(uri).ConfigureAwait(false); + } + + public async Task OpenAsync(Uri uri, Service.Browser.BrowserLaunchMode browserLaunchMode) + { + await Browser.OpenAsync(uri, (Xamarin.Essentials.BrowserLaunchMode)browserLaunchMode).ConfigureAwait(false); + } + + public async Task OpenAsync(Uri uri, Service.Browser.BrowserLaunchOptions browserLaunchOptions) + { + await Browser.OpenAsync(uri, ConvertBrowserLaunchOptions(browserLaunchOptions)); + } + } +} \ No newline at end of file diff --git a/Borepin/Borepin.UWP/Borepin.UWP.csproj b/Borepin/Borepin.UWP/Borepin.UWP.csproj index 620bb6d..c3ae35d 100644 --- a/Borepin/Borepin.UWP/Borepin.UWP.csproj +++ b/Borepin/Borepin.UWP/Borepin.UWP.csproj @@ -99,6 +99,7 @@ + diff --git a/Borepin/Borepin.UWP/PlatformInitializer.cs b/Borepin/Borepin.UWP/PlatformInitializer.cs index 9eacb3c..0818906 100644 --- a/Borepin/Borepin.UWP/PlatformInitializer.cs +++ b/Borepin/Borepin.UWP/PlatformInitializer.cs @@ -4,6 +4,7 @@ using Prism.Ioc; using Borepin.Service.Storage; using Borepin.Service.Versioning; using Borepin.Service; +using Borepin.Service.Browser; namespace Borepin.UWP { @@ -14,6 +15,7 @@ namespace Borepin.UWP containerRegistry.Register(); containerRegistry.Register(); containerRegistry.Register(); + containerRegistry.Register(); containerRegistry.RegisterSingleton(); } diff --git a/Borepin/Borepin.UWP/Services/BrowserService.cs b/Borepin/Borepin.UWP/Services/BrowserService.cs new file mode 100644 index 0000000..3669447 --- /dev/null +++ b/Borepin/Borepin.UWP/Services/BrowserService.cs @@ -0,0 +1,51 @@ +using Borepin.Service.Browser; +using System; +using System.Threading.Tasks; +using Xamarin.Essentials; + +namespace Borepin.UWP.Services +{ + public class BrowserService : IBrowserService + { + private Xamarin.Essentials.BrowserLaunchOptions ConvertBrowserLaunchOptions(Service.Browser.BrowserLaunchOptions browserLaunchOptions) + { + return new Xamarin.Essentials.BrowserLaunchOptions() + { + Flags = (Xamarin.Essentials.BrowserLaunchFlags)browserLaunchOptions.Flags, + LaunchMode = (Xamarin.Essentials.BrowserLaunchMode)browserLaunchOptions.LaunchMode, + PreferredControlColor = browserLaunchOptions.PreferredControlColor, + PreferredToolbarColor = browserLaunchOptions.PreferredToolbarColor, + TitleMode = (Xamarin.Essentials.BrowserTitleMode)browserLaunchOptions.TitleMode + }; + } + public async Task OpenAsync(string uri) + { + await Browser.OpenAsync(uri).ConfigureAwait(false); + } + + public async Task OpenAsync(string uri, Service.Browser.BrowserLaunchMode browserLaunchMode) + { + await Browser.OpenAsync(uri, (Xamarin.Essentials.BrowserLaunchMode)browserLaunchMode).ConfigureAwait(false); + } + + public async Task OpenAsync(string uri, Service.Browser.BrowserLaunchOptions browserLaunchOptions) + { + await Browser.OpenAsync(uri, ConvertBrowserLaunchOptions(browserLaunchOptions)); + } + + public async Task OpenAsync(Uri uri) + { + await Browser.OpenAsync(uri).ConfigureAwait(false); + } + + public async Task OpenAsync(Uri uri, Service.Browser.BrowserLaunchMode browserLaunchMode) + { + await Browser.OpenAsync(uri, (Xamarin.Essentials.BrowserLaunchMode)browserLaunchMode).ConfigureAwait(false); + } + + public async Task OpenAsync(Uri uri, Service.Browser.BrowserLaunchOptions browserLaunchOptions) + { + await Browser.OpenAsync(uri, ConvertBrowserLaunchOptions(browserLaunchOptions)); + } + } +} diff --git a/Borepin/Borepin.iOS/Borepin.iOS.csproj b/Borepin/Borepin.iOS/Borepin.iOS.csproj index 5a52689..d1110a9 100644 --- a/Borepin/Borepin.iOS/Borepin.iOS.csproj +++ b/Borepin/Borepin.iOS/Borepin.iOS.csproj @@ -82,6 +82,7 @@ + diff --git a/Borepin/Borepin.iOS/PlatformInitializer.cs b/Borepin/Borepin.iOS/PlatformInitializer.cs index 26a09b8..ade1f95 100644 --- a/Borepin/Borepin.iOS/PlatformInitializer.cs +++ b/Borepin/Borepin.iOS/PlatformInitializer.cs @@ -1,5 +1,6 @@ using Borepin.iOS.Services; using Borepin.Service; +using Borepin.Service.Browser; using Borepin.Service.Storage; using Borepin.Service.Versioning; using Prism; @@ -14,6 +15,7 @@ namespace Borepin.iOS containerRegistry.Register(); containerRegistry.Register(); containerRegistry.Register(); + containerRegistry.Register(); containerRegistry.RegisterSingleton(); } diff --git a/Borepin/Borepin.iOS/Services/BrowserService.cs b/Borepin/Borepin.iOS/Services/BrowserService.cs new file mode 100644 index 0000000..286116a --- /dev/null +++ b/Borepin/Borepin.iOS/Services/BrowserService.cs @@ -0,0 +1,51 @@ +using Borepin.Service.Browser; +using System; +using System.Threading.Tasks; +using Xamarin.Essentials; + +namespace Borepin.iOS.Services +{ + public class BrowserService : IBrowserService + { + private Xamarin.Essentials.BrowserLaunchOptions ConvertBrowserLaunchOptions(Service.Browser.BrowserLaunchOptions browserLaunchOptions) + { + return new Xamarin.Essentials.BrowserLaunchOptions() + { + Flags = (Xamarin.Essentials.BrowserLaunchFlags)browserLaunchOptions.Flags, + LaunchMode = (Xamarin.Essentials.BrowserLaunchMode)browserLaunchOptions.LaunchMode, + PreferredControlColor = browserLaunchOptions.PreferredControlColor, + PreferredToolbarColor = browserLaunchOptions.PreferredToolbarColor, + TitleMode = (Xamarin.Essentials.BrowserTitleMode)browserLaunchOptions.TitleMode + }; + } + public async Task OpenAsync(string uri) + { + await Browser.OpenAsync(uri).ConfigureAwait(false); + } + + public async Task OpenAsync(string uri, Service.Browser.BrowserLaunchMode browserLaunchMode) + { + await Browser.OpenAsync(uri, (Xamarin.Essentials.BrowserLaunchMode)browserLaunchMode).ConfigureAwait(false); + } + + public async Task OpenAsync(string uri, Service.Browser.BrowserLaunchOptions browserLaunchOptions) + { + await Browser.OpenAsync(uri, ConvertBrowserLaunchOptions(browserLaunchOptions)); + } + + public async Task OpenAsync(Uri uri) + { + await Browser.OpenAsync(uri).ConfigureAwait(false); + } + + public async Task OpenAsync(Uri uri, Service.Browser.BrowserLaunchMode browserLaunchMode) + { + await Browser.OpenAsync(uri, (Xamarin.Essentials.BrowserLaunchMode)browserLaunchMode).ConfigureAwait(false); + } + + public async Task OpenAsync(Uri uri, Service.Browser.BrowserLaunchOptions browserLaunchOptions) + { + await Browser.OpenAsync(uri, ConvertBrowserLaunchOptions(browserLaunchOptions)); + } + } +} \ No newline at end of file diff --git a/Borepin/Borepin/Model/MachineVisualize.cs b/Borepin/Borepin/Model/MachineVisualize.cs index 2c51d6d..a77867b 100644 --- a/Borepin/Borepin/Model/MachineVisualize.cs +++ b/Borepin/Borepin/Model/MachineVisualize.cs @@ -26,6 +26,7 @@ namespace Borepin.Model //Space = new SpaceVisualize(_Machine.Space); Name = _Machine.Name; Description = _Machine.Description; + Wiki = _Machine.Wiki; State = _Machine.State; if(_Machine.Manager.Just != null) @@ -106,6 +107,13 @@ namespace Borepin.Model set => SetProperty(ref _Description, value); } + private string _Wiki; + public string Wiki + { + get => _Wiki; + set => SetProperty(ref _Wiki, value); + } + private MachineState _State; public MachineState State { diff --git a/Borepin/Borepin/Page/MachinePage.xaml b/Borepin/Borepin/Page/MachinePage.xaml index fabbc80..5e7d2d9 100644 --- a/Borepin/Borepin/Page/MachinePage.xaml +++ b/Borepin/Borepin/Page/MachinePage.xaml @@ -22,31 +22,38 @@ - -