changes in mechanism: one click - scan & upload

lswiderski · May 9, 2022 · 38da031 · 38da031
1 parent c7d9901
commit 38da031
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/src/MiScaleExporter/ViewModels/FormViewModel.cs b/src/MiScaleExporter/ViewModels/FormViewModel.cs
@@ -68,10 +68,9 @@ private bool ValidateSave()
                    &&  !String.IsNullOrWhiteSpace(_password);
         }
 
-        public void CheckPreferences()
+        public void AutoUpload()
         {
-            if ( Preferences.Get(PreferencesKeys.OneClickScanAndUpload, false)
-                 && !string.IsNullOrWhiteSpace(Email)
+            if (!string.IsNullOrWhiteSpace(Email)
                  && !string.IsNullOrWhiteSpace(Password))
             {
                 OnUpload();
@@ -87,7 +86,7 @@ private async void OnUpload()
             await Application.Current.MainPage.DisplayAlert ("Response", message, "OK");
             this.IsBusy = false;
             // This will pop the current page off the navigation stack
-            await Shell.Current.GoToAsync("..");
+            await Shell.Current.GoToAsync("..?autoUpload=false");
         }
 
         private BodyComposition PrepareRequest()

diff --git a/src/MiScaleExporter/ViewModels/IFormViewModel.cs b/src/MiScaleExporter/ViewModels/IFormViewModel.cs
@@ -4,6 +4,6 @@ public interface IFormViewModel
     {
         void LoadBodyComposition();
 
-        void CheckPreferences();
+        void AutoUpload();
     }
 }
diff --git a/src/MiScaleExporter/ViewModels/ScaleViewModel.cs b/src/MiScaleExporter/ViewModels/ScaleViewModel.cs
@@ -104,7 +104,7 @@ await Application.Current.MainPage.DisplayAlert("Problem", msg,
             else
             {
                 App.BodyComposition = bc;
-                await Shell.Current.GoToAsync("///FormPage");
+                await Shell.Current.GoToAsync($"///FormPage?autoUpload={Preferences.Get(PreferencesKeys.OneClickScanAndUpload, false)}");
             }
         }
 

diff --git a/src/MiScaleExporter/Views/FormPage.xaml.cs b/src/MiScaleExporter/Views/FormPage.xaml.cs
@@ -11,6 +11,7 @@
 
 namespace MiScaleExporter.Views
 {
+    [QueryProperty(nameof(AutoUpload), "autoUpload")]
     [XamlCompilation(XamlCompilationOptions.Compile)]
     public partial class FormPage : ContentPage
     {
@@ -27,9 +28,18 @@ public FormPage()
         protected override async void OnAppearing()
         {
             base.OnAppearing();
-
             vm.LoadBodyComposition();
-            vm.CheckPreferences();
+        }
+
+        public bool AutoUpload
+        {
+            set
+            {
+                if (value)
+                {
+                    vm.AutoUpload();
+                }
+            }
         }
 
     }