From d6ac268516507f021b9efe2c93a98c944e04aad8 Mon Sep 17 00:00:00 2001
From: TheJoKlLa <thejoklla@gmail.com>
Date: Mon, 18 Apr 2022 11:49:27 +0200
Subject: [PATCH] Added Scan QR Code in seperate Page

---
 Borepin/Borepin/App.xaml.cs                   |   9 +-
 Borepin/Borepin/Borepin.csproj                |   2 +-
 Borepin/Borepin/Page/ScanPage.xaml            |  12 ++
 Borepin/Borepin/Page/ScanPage.xaml.cs         |  20 +++
 Borepin/Borepin/Page/ScannerPage.xaml         |   9 --
 Borepin/Borepin/Page/ScannerPage.xaml.cs      |  44 -------
 .../Borepin/Page/SetUpProcess/ScanPage.xaml   |  16 ---
 .../Borepin/PageModel/MachineListPageModel.cs |  60 +++++----
 Borepin/Borepin/PageModel/ScanPageModel.cs    | 118 ++++++++++++++++++
 .../PageModel/SetUpProcess/ScanPageModel.cs   |  50 --------
 10 files changed, 194 insertions(+), 146 deletions(-)
 create mode 100644 Borepin/Borepin/Page/ScanPage.xaml
 create mode 100644 Borepin/Borepin/Page/ScanPage.xaml.cs
 delete mode 100644 Borepin/Borepin/Page/ScannerPage.xaml
 delete mode 100644 Borepin/Borepin/Page/ScannerPage.xaml.cs
 delete mode 100644 Borepin/Borepin/Page/SetUpProcess/ScanPage.xaml
 create mode 100644 Borepin/Borepin/PageModel/ScanPageModel.cs
 delete mode 100644 Borepin/Borepin/PageModel/SetUpProcess/ScanPageModel.cs

diff --git a/Borepin/Borepin/App.xaml.cs b/Borepin/Borepin/App.xaml.cs
index 33948a1..28165b3 100644
--- a/Borepin/Borepin/App.xaml.cs
+++ b/Borepin/Borepin/App.xaml.cs
@@ -11,6 +11,7 @@ using Borepin.PageModel.SetUpProcess;
 using Borepin.Page.AddServerProcess;
 using Borepin.PageModel.AddServerProcess;
 using System;
+using Prism.Navigation;
 
 namespace Borepin
 {
@@ -25,6 +26,11 @@ namespace Borepin
         {
             InitializeComponent();
 
+            INavigationParameters parameters = new NavigationParameters()
+            {
+                { "instance", 0 },
+            };
+
             await NavigationService.NavigateAsync(new Uri("https://borepin.fab-access.org/StartPage")).ConfigureAwait(false);
         }
 
@@ -41,12 +47,11 @@ namespace Borepin
             containerRegistry.RegisterForNavigation<MachineListPage, MachineListPageModel>();
             containerRegistry.RegisterForNavigation<ServerListPage, ServerListPageModel>();
             containerRegistry.RegisterForNavigation<ServerPage, ServerPageModel>();
-            containerRegistry.RegisterForNavigation<ScannerPage>();
+            containerRegistry.RegisterForNavigation<ScanPage, ScanPageModel>();
             #endregion
 
             #region Register Sequence Navigation
             containerRegistry.RegisterForNavigation<WelcomePage, WelcomePageModel>("SetUpProcess_WelcomePage");
-            //containerRegistry.RegisterForNavigation<ScanPage, ScanPageModel>("SetUpProcess_ScanPage");
 
             containerRegistry.RegisterForNavigation<AuthPlainPage, AuthPlainPageModel>("AddServerProcess_AuthPlainPage");
             containerRegistry.RegisterForNavigation<SelectServerPage, SelectServerPageModel>("AddServerProcess_SelectServerPage");
diff --git a/Borepin/Borepin/Borepin.csproj b/Borepin/Borepin/Borepin.csproj
index 56a6bbc..6f5458e 100644
--- a/Borepin/Borepin/Borepin.csproj
+++ b/Borepin/Borepin/Borepin.csproj
@@ -101,7 +101,7 @@
     <EmbeddedResource Update="Page\MainPage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
-    <EmbeddedResource Update="Page\ScannerPage.xaml">
+    <EmbeddedResource Update="Page\ScanPage.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
     <EmbeddedResource Update="Page\ServerListPage.xaml">
diff --git a/Borepin/Borepin/Page/ScanPage.xaml b/Borepin/Borepin/Page/ScanPage.xaml
new file mode 100644
index 0000000..a42564e
--- /dev/null
+++ b/Borepin/Borepin/Page/ScanPage.xaml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" 
+             xmlns:zxing="clr-namespace:ZXing.Net.Mobile.Forms;assembly=ZXing.Net.Mobile.Forms"
+             x:Class="Borepin.Page.ScanPage">
+    <ContentPage.Content>
+        <StackLayout IsVisible="{Binding IsVisible}">
+            <zxing:ZXingScannerView Result="{Binding ScanResult, Mode=TwoWay}" ScanResultCommand="{Binding ScannedCommand}"  IsScanning="{Binding IsScanning}" WidthRequest="300" HeightRequest="500" VerticalOptions="CenterAndExpand" HorizontalOptions="CenterAndExpand"/>
+            <Button Text="Abort" Command="{Binding AbortCommand}"/>
+        </StackLayout>
+    </ContentPage.Content>
+</ContentPage>
\ No newline at end of file
diff --git a/Borepin/Borepin/Page/ScanPage.xaml.cs b/Borepin/Borepin/Page/ScanPage.xaml.cs
new file mode 100644
index 0000000..d728b90
--- /dev/null
+++ b/Borepin/Borepin/Page/ScanPage.xaml.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace Borepin.Page
+{
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+    public partial class ScanPage : ContentPage
+    {
+        public ScanPage()
+        {
+            InitializeComponent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Borepin/Borepin/Page/ScannerPage.xaml b/Borepin/Borepin/Page/ScannerPage.xaml
deleted file mode 100644
index 07fb05b..0000000
--- a/Borepin/Borepin/Page/ScannerPage.xaml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<zxing:ZXingScannerPage xmlns="http://xamarin.com/schemas/2014/forms"
-                        xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-                        x:Class="Borepin.Page.ScannerPage"
-                        xmlns:zxing="clr-namespace:ZXing.Net.Mobile.Forms;assembly=ZXing.Net.Mobile.Forms"
-                        Title="Full screen" 
-                        OnScanResult="Handle_OnScanResult" 
-                        IsScanning="true">
-</zxing:ZXingScannerPage>
\ No newline at end of file
diff --git a/Borepin/Borepin/Page/ScannerPage.xaml.cs b/Borepin/Borepin/Page/ScannerPage.xaml.cs
deleted file mode 100644
index cb6c222..0000000
--- a/Borepin/Borepin/Page/ScannerPage.xaml.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using Xamarin.Forms;
-using Xamarin.Forms.Xaml;
-using ZXing;
-using ZXing.Net.Mobile.Forms;
-
-namespace Borepin.Page
-{
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class ScannerPage : ZXingScannerPage
-    {
-        public ScannerPage()
-        {
-            InitializeComponent();
-        }
-
-		public void Handle_OnScanResult(Result result)
-		{
-			Device.BeginInvokeOnMainThread(async () =>
-			{
-				await DisplayAlert("Scanned result", result.Text, "OK").ConfigureAwait(false);
-			});
-		}
-
-		protected override void OnAppearing()
-		{
-			base.OnAppearing();
-
-			IsScanning = true;
-		}
-
-		protected override void OnDisappearing()
-		{
-			base.OnDisappearing();
-
-			IsScanning = false;
-		}
-	}
-}
\ No newline at end of file
diff --git a/Borepin/Borepin/Page/SetUpProcess/ScanPage.xaml b/Borepin/Borepin/Page/SetUpProcess/ScanPage.xaml
deleted file mode 100644
index ffcb52c..0000000
--- a/Borepin/Borepin/Page/SetUpProcess/ScanPage.xaml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="Borepin.Page.SetUpProcess.ScanPage"
-             xmlns:i18n="clr-namespace:Borepin.Helpers"
-             xmlns:views="clr-namespace:Borepin.View"
-             Title="FabAccess">
-    <ContentPage.Content>
-        <ScrollView>
-            <StackLayout Style="{StaticResource Style_StackLayout_Content}">
-                <Label Text="{i18n:Translate SetUp_ScanPage_Text}" Style="{StaticResource Style_Label_Text_Center}"/>
-                <Button Text="{i18n:Translate SetUp_ScanPage_Button}" Command="{Binding NextCommand}" Style="{StaticResource Style_Button_Primary}"/>
-            </StackLayout>
-        </ScrollView>
-    </ContentPage.Content>
-</ContentPage>
\ No newline at end of file
diff --git a/Borepin/Borepin/PageModel/MachineListPageModel.cs b/Borepin/Borepin/PageModel/MachineListPageModel.cs
index d1231d0..691e6c5 100644
--- a/Borepin/Borepin/PageModel/MachineListPageModel.cs
+++ b/Borepin/Borepin/PageModel/MachineListPageModel.cs
@@ -31,7 +31,7 @@ namespace Borepin.PageModel
             _DialogService = dialogService;
 
             SelectInstanceCommand = new DelegateCommand<object>(SelectInstanceCommandExecute);
-            ScanCodeCommand = new DelegateCommand(ScanCodeCommandExecute);
+            ScanCodeCommand = new DelegateCommand(async () => await ScanCodeCommandExecute().ConfigureAwait(false));
             RefreshCommand = new DelegateCommand(async ()=> await RefreshCommandExecute().ConfigureAwait(true));
         }
         #endregion
@@ -138,38 +138,40 @@ namespace Borepin.PageModel
             get => _ScanCodeCommand;
             set => SetProperty(ref _ScanCodeCommand, value);
         }
-        public void ScanCodeCommandExecute()
+        public async Task ScanCodeCommandExecute()
         {
             IsBusy = true;
 
-            _DialogService.ShowDialog("ScanDialog", ScanCodeCommandExecute_Dialog);
+            NavigationParameters parameters = new NavigationParameters()
+            {
+                {"intance", null },
+            };
+
+            await _NavigationService.NavigateAsync("ScanPage", parameters).ConfigureAwait(false);
         }
 
-        public async void ScanCodeCommandExecute_Dialog(IDialogResult result)
+        public async void ScanCode_Result(string value)
         {
-            if (string.Equals(result.Parameters.GetValue<string>("result"), "scanned", System.StringComparison.Ordinal))
+            if (! _BFFHService.IsConnected)
             {
-                if (! _BFFHService.IsConnected)
-                {
-                    IsConnected = false;
-                    IsBusy = false;
-                    return;
-                }
-
-                IMachineSystem machineInterface = (await _BFFHService.GetSession().ConfigureAwait(false)).MachineSystem;
-                MachineSystem.IInfoInterface infoInterface = await machineInterface.Info().ConfigureAwait(false);
-
-                Machine machine = await infoInterface.GetMachineURN(result.Parameters.GetValue<string>("value")).ConfigureAwait(false);
-
-                if(machine == null)
-                {
-                    IsBusy = false;
-                    return;
-                }
-
-                _NextMachine = machine;
+                IsConnected = false;
                 IsBusy = false;
+                return;
             }
+
+            IMachineSystem machineInterface = (await _BFFHService.GetSession().ConfigureAwait(false)).MachineSystem;
+            MachineSystem.IInfoInterface infoInterface = await machineInterface.Info().ConfigureAwait(false);
+
+            Machine machine = await infoInterface.GetMachineURN(value).ConfigureAwait(false);
+
+            if(machine == null)
+            {
+                IsBusy = false;
+                return;
+            }
+
+            _NextMachine = machine;
+            IsBusy = false;
         }
         #endregion
 
@@ -204,6 +206,16 @@ namespace Borepin.PageModel
         public override async void OnNavigatedTo(INavigationParameters parameters)
         {
             IsBusy = true;
+
+            if (parameters["result"] != null)
+            {
+                if (parameters["result"].Equals("scanned"))
+                {
+                    string urn = (string)parameters["value"];
+                    ScanCode_Result(urn);
+                }
+            }
+
             await LoadData().ConfigureAwait(false);
         }
         #endregion
diff --git a/Borepin/Borepin/PageModel/ScanPageModel.cs b/Borepin/Borepin/PageModel/ScanPageModel.cs
new file mode 100644
index 0000000..ed4c4e0
--- /dev/null
+++ b/Borepin/Borepin/PageModel/ScanPageModel.cs
@@ -0,0 +1,118 @@
+using Borepin.Base;
+using Prism.Commands;
+using Prism.Navigation;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using ZXing;
+
+namespace Borepin.PageModel
+{
+    class ScanPageModel : PageModelBase
+    {
+        #region Private Fields
+        private object _Instance;
+        private readonly INavigationService _NavigationService;
+        #endregion
+
+        #region Contructors
+        public ScanPageModel(INavigationService navigationService) : base(navigationService)
+        {
+            _NavigationService = navigationService;
+
+            AbortCommand = new DelegateCommand(async () => await AbortCommandExecute().ConfigureAwait(true));
+            ScannedCommand = new DelegateCommand(async () => await ScannedCommandExecute().ConfigureAwait(true));
+
+            IsVisible = true;
+            IsScanning = true;
+        }
+        #endregion
+
+        #region Data
+        public override async Task LoadData()
+        {
+            IsBusy = true;
+            
+            IsBusy = false;
+        }
+        #endregion
+
+        #region Fields
+        private Result _ScanResult;
+        public Result ScanResult
+        {
+            get => _ScanResult;
+            set => SetProperty(ref _ScanResult, value);
+        }
+
+        private bool _IsScanning;
+        public bool IsScanning
+        {
+            get => _IsScanning;
+            set => SetProperty(ref _IsScanning, value);
+        }
+
+        private bool _IsVisible;
+        public bool IsVisible
+        {
+            get => _IsVisible;
+            set => SetProperty(ref _IsVisible, value);
+        }
+        #endregion
+
+        #region Commands
+        private ICommand _ScannedCommand;
+
+        public ICommand ScannedCommand
+        {
+            get => _ScannedCommand;
+            set => SetProperty(ref _ScannedCommand, value);
+        }
+        public async Task ScannedCommandExecute()
+        {
+            IsScanning = false;
+            IsVisible = false;
+
+            INavigationParameters parameters = new NavigationParameters()
+            {
+                { "result", "scanned" },
+                { "value", ScanResult.Text },
+                { "instance", _Instance }
+            };
+
+            await _NavigationService.NavigateAsync("..", parameters).ConfigureAwait(false);
+        }
+
+        private ICommand _AbortCommand;
+        public ICommand AbortCommand
+        {
+            get => _AbortCommand;
+            set => SetProperty(ref _AbortCommand, value);
+        }
+        public async Task AbortCommandExecute()
+        {
+            IsScanning = false;
+            IsVisible = false;
+
+            INavigationParameters parameters = new NavigationParameters()
+            {
+                { "result", "abort" },
+                { "instance", _Instance }
+            };
+            await _NavigationService.NavigateAsync("..", parameters).ConfigureAwait(false);
+        }
+        #endregion
+
+        #region INavigationService
+        public override void OnNavigatedFrom(INavigationParameters parameters)
+        {
+
+        }
+
+        public override async void OnNavigatedTo(INavigationParameters parameters)
+        {
+            _Instance = parameters.GetValue<object>("instance");
+            await LoadData().ConfigureAwait(false);
+        }
+        #endregion
+    }
+}
diff --git a/Borepin/Borepin/PageModel/SetUpProcess/ScanPageModel.cs b/Borepin/Borepin/PageModel/SetUpProcess/ScanPageModel.cs
deleted file mode 100644
index 431de93..0000000
--- a/Borepin/Borepin/PageModel/SetUpProcess/ScanPageModel.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-using Borepin.Base;
-using Prism.Commands;
-using Prism.Navigation;
-using System.Threading.Tasks;
-using System.Windows.Input;
-
-namespace Borepin.PageModel.SetUpProcess
-{
-    public class ScanPageModel : PageModelBase
-    {
-        #region Constructors
-        public ScanPageModel(INavigationService navigationService) : base(navigationService)
-        {
-            NextCommand = new DelegateCommand<object>(NextCommandCommandExecute);
-        }
-        #endregion
-
-        #region Data
-        public override Task LoadData()
-        {
-            return Task.CompletedTask;
-        }
-        #endregion
-
-        #region Commands
-        private ICommand _NextCommand;
-        public ICommand NextCommand
-        {
-            get => _NextCommand;
-            set => SetProperty(ref _NextCommand, value);
-        }
-        public async void NextCommandCommandExecute(object obj)
-        {
-            await _NavigationService.NavigateAsync("AddServerProcess_HostSelectPage").ConfigureAwait(false);
-        }
-        #endregion
-
-        #region INavigationAware
-        public override void OnNavigatedFrom(INavigationParameters parameters)
-        {
-            
-        }
-
-        public override void OnNavigatedTo(INavigationParameters parameters)
-        {
-            
-        }
-        #endregion
-    }
-}