Merge pull request #14 from Bl4ckL10n/feature/add_visit_link_without_…

…saving_button_in_add_new_item_page Add visit now button in add new item page
Bl4ckL10n · Jun 17, 2022 · 1f0cc9a · 1f0cc9a
2 parents 7513483 + 619ccac
commit 1f0cc9a
Show file tree

Hide file tree

Showing 4 changed files with 96 additions and 5 deletions.
diff --git a/BlackLion.QRStore/BlackLion.QRStore/Localization/NewItemPageResources.Designer.cs b/BlackLion.QRStore/BlackLion.QRStore/Localization/NewItemPageResources.Designer.cs
diff --git a/BlackLion.QRStore/BlackLion.QRStore/Localization/NewItemPageResources.resx b/BlackLion.QRStore/BlackLion.QRStore/Localization/NewItemPageResources.resx
@@ -123,12 +123,18 @@
   <data name="Button_Save" xml:space="preserve">
     <value>Save</value>
   </data>
+  <data name="Button_Visit_Now" xml:space="preserve">
+    <value>Visit now</value>
+  </data>
   <data name="Entry_Name_Placeholder" xml:space="preserve">
     <value>Name</value>
   </data>
   <data name="Entry_URL_Placeholder" xml:space="preserve">
     <value>URL</value>
   </data>
+  <data name="Label_Or" xml:space="preserve">
+    <value>Or</value>
+  </data>
   <data name="Page_Title" xml:space="preserve">
     <value>New Item</value>
   </data>
@@ -141,4 +147,13 @@
   <data name="Save_Modal_Title" xml:space="preserve">
     <value>Duplicated entry</value>
   </data>
+  <data name="Visit_Now_Modal_Content" xml:space="preserve">
+    <value>We couldn't open this webpage due to an error.</value>
+  </data>
+  <data name="Visit_Now_Modal_Ok_Option" xml:space="preserve">
+    <value>Ok</value>
+  </data>
+  <data name="Visit_Now_Modal_Title" xml:space="preserve">
+    <value>Oopps!</value>
+  </data>
 </root>
diff --git a/BlackLion.QRStore/BlackLion.QRStore/ViewModels/NewItemViewModel.cs b/BlackLion.QRStore/BlackLion.QRStore/ViewModels/NewItemViewModel.cs
@@ -4,7 +4,9 @@
 using BlackLion.QRStore.Services;
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using System.Web;
+using Xamarin.Essentials;
 using Xamarin.Forms;
 
 namespace BlackLion.QRStore.ViewModels
@@ -36,14 +38,16 @@ public string URL
 
         public Command CancelCommand { get; }
         public Command SaveCommand { get; }
+        public Command VisitNowCommand { get; }
 
         public NewItemViewModel()
         {
             _dataStore = DependencyService.Get<IDataStore<Item>>();
             _messageService = DependencyService.Get<IMessageService>();
             Title = NewItemPageResources.Page_Title;
             SaveCommand = new Command(OnSave, ValidateSave);
-            CancelCommand = new Command(OnCancel);
+            CancelCommand = new Command(async () => await OnCancel());
+            VisitNowCommand = new Command(async() => await OnVisitNow());
             PropertyChanged += (_, __) => SaveCommand.ChangeCanExecute();
         }
 
@@ -56,8 +60,8 @@ private bool ValidateSave()
 
             IsValidURL = URLValidatorHelper.IsValidURL(URL);
 
-            return !String.IsNullOrWhiteSpace(url) &&
-                !String.IsNullOrWhiteSpace(name) &&
+            return !string.IsNullOrWhiteSpace(url) &&
+                !string.IsNullOrWhiteSpace(name) &&
                 isValidURL;
         }
 
@@ -66,7 +70,7 @@ public void ApplyQueryAttributes(IDictionary<string, string> query)
             URL = HttpUtility.UrlDecode(query["url"]);
         }
 
-        private async void OnCancel()
+        private async Task OnCancel()
         {
             await Shell.Current.GoToAsync("//ItemsPage");
         }
@@ -95,5 +99,28 @@ await _messageService.ShowAsync(
                 await Shell.Current.GoToAsync("//ItemsPage");
             }
         }
+
+        private async Task OnVisitNow()
+        {
+            try
+            {
+                await Task.Run(async () =>
+                {
+                    await Browser.OpenAsync(url, BrowserLaunchMode.SystemPreferred);
+                }).ContinueWith(async _ =>
+                {
+                    await Task.Delay(300);
+                    await Shell.Current.GoToAsync("//ItemsPage");
+                });
+            }
+            catch (Exception)
+            {
+                await _messageService.ShowAsync(
+                    NewItemPageResources.Visit_Now_Modal_Title,
+                    NewItemPageResources.Visit_Now_Modal_Content,
+                    NewItemPageResources.Visit_Now_Modal_Ok_Option
+                );
+            }
+        }
     }
 }
diff --git a/BlackLion.QRStore/BlackLion.QRStore/Views/NewItemPage.xaml b/BlackLion.QRStore/BlackLion.QRStore/Views/NewItemPage.xaml
@@ -12,7 +12,7 @@
         <local:NewItemViewModel/>
     </ContentPage.BindingContext>
     <ContentPage.Content>
-        <StackLayout Padding="15" Spacing="3">
+        <StackLayout Padding="15" Spacing="10">
             <Entry FontSize="Medium"
                    Placeholder="{x:Static resources:NewItemPageResources.Entry_Name_Placeholder}"
                    Text="{Binding Name}"/>
@@ -43,6 +43,10 @@
                         HorizontalOptions="FillAndExpand"
                         Text="{x:Static resources:NewItemPageResources.Button_Save}"/>
             </StackLayout>
+            <Label FontSize="Medium"
+                   HorizontalOptions="Center"
+                   Text="{x:Static resources:NewItemPageResources.Label_Or}"/>
+            <Button Command="{Binding VisitNowCommand}" Text="{x:Static resources:NewItemPageResources.Button_Visit_Now}"/>
         </StackLayout>
     </ContentPage.Content>
 </ContentPage>