updated UI

janseris · Jun 29, 2022 · 52b2a18 · 52b2a18
1 parent 2dd531c
commit 52b2a18
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/MauiApp11/MainPage.xaml b/MauiApp11/MainPage.xaml
@@ -8,9 +8,12 @@
             Spacing="25" 
             Padding="30,0" 
             VerticalOptions="Center" >
+
+            <!-- Margin is: Left, Top, ?, ? -->
 
-            <Label 
-                Text="Microsoft.Data.SqlClient 4.0.0+ has Encrypt=true by default which requires a valid certificate (can be disabled either by explicit Encrypt=false or TrustServerCertificate=true"
+            <Label Margin="0, 10, 0, 0" 
+                FontSize="Small"
+                Text="Note: Microsoft.Data.SqlClient 4.0.0+ has Encrypt=true by default which requires a valid certificate (can be disabled either by explicit Encrypt=false or TrustServerCertificate=true"
                 HorizontalOptions="Center" >
 
             </Label>

diff --git a/MauiApp11/MainPage.xaml.cs b/MauiApp11/MainPage.xaml.cs
@@ -117,13 +117,19 @@ private void ExecuteDAOWithUIResult(DAOBase dao, string connectionString, StackL
         });
     }
 
-    private void button_Clicked(object sender, EventArgs e)
+    private async void button_Clicked(object sender, EventArgs e)
     {
         results.Children.Clear();
 
         //use custom or from combobox if using custom is not checked
         var connectionString = useCustomConnectionStringCheckBox.IsChecked ? customConnectionStringTextEdit.Text : SelectedConnectionString;
 
+        if(connectionString == null)
+        {
+            await DisplayAlert("", "No connection string selected", "OK");
+            return;
+        }
+
         //for appended parts to work, the connection string must end with ";"
         if (encryptFalseCheckBox.IsChecked)
         {
@@ -149,12 +155,21 @@ private void button_Clicked(object sender, EventArgs e)
             Trace.WriteLine($"Executing {dao.Name}...");
             ExecuteDAOWithUIResult(dao, connectionString, results);
         }
-
+        
         //these texts should be displayed below the button
         foreach (var label in results.Children)
         {
             Trace.WriteLine((label as Label).Text);
         }
+
+
+        //Labels are not displayed on Android (bug) so instead, a MessageBox is shown
+#if ANDROID
+        var labelTexts = results.Children
+            .Where(item => item.GetType() == typeof(Label))
+            .Select(label => (label as Label).Text);
+        await DisplayActionSheet("Results", null, "OK", labelTexts.ToArray());
+#endif
     }
 }