fix: discord login (#450)

* prevent popup crash

* AuthPopUp| code cleanup

* tweak the discord portal UI and navigation

Author: bricefriha

App/Views/PopUps/AuthPopUp.xaml.cs

@@ -21,13 +21,12 @@ public AuthPopUp(Action<AuthResponse> callBack)
     public App CurrentApp { get; private set; }
     private async void Discord_Clicked(object sender, System.EventArgs e)
     {
-        CurrentApp.ShowLoadingIndicator();
-        DiscordAuthPortal discordAuthPortal = new(CallBack);
+        // Close this popup
+        await this.CloseAsync();
 
+        CurrentApp.ShowLoadingIndicator();
 
-        await App.Current.Windows[0].Page.Navigation.PushAsync(discordAuthPortal);
+        await Shell.Current.Navigation.PushAsync(new DiscordAuthPortal(CallBack));
 
-        // Close this popup
-        await this.CloseAsync();
     }
 }

App/Views/Portals/DiscordAuthPortal.xaml

@@ -5,16 +5,37 @@
              xmlns:Core="GamHubApp.Core"
              xmlns:local="clr-namespace:GamHubApp.Views.Portals"
                  BackgroundColor="{StaticResource BgBannerColor}"
-             x:DataType="local:DiscordAuthPortal">
+             x:DataType="local:DiscordAuthPortal"
+             Shell.NavBarIsVisible="True">
     <ContentPage.Content>
-        <WebView Source="{Binding Url}"
-                 VerticalOptions="Fill"
-                 HorizontalOptions="Fill"
-                 Navigated="DiscordPortal_Navigated"
-                 Navigating="DiscordPortal_Navigating"
-                 x:Name="DiscordPortal"
-                 BackgroundColor="{StaticResource BgBannerColor}"
-                 />
+        <Grid RowDefinitions="50,*" >
+            <Grid ColumnDefinitions="*,20"
+                  BackgroundColor="{DynamicResource LightDark}">
+                <Button Text="&#xf00d;"
+                        FontFamily="FaSolid"
+                        FontSize="27"
+                        CornerRadius="20"
+                        WidthRequest="80"
+                        TextColor="{DynamicResource FontColor}"
+                        BackgroundColor="{DynamicResource LightDark}"
+                        VerticalOptions="Center"
+                        HorizontalOptions="End"
+                        Clicked="Close_Clicked"
+                        Grid.Column="1"/>
+            </Grid>
+            <WebView Source="{Binding Url}"
+                     VerticalOptions="Fill"
+                     HorizontalOptions="Fill"
+                     Navigated="DiscordPortal_Navigated"
+                     Navigating="DiscordPortal_Navigating"
+                     x:Name="DiscordPortal"
+                     BackgroundColor="{StaticResource BgBannerColor}"
+                     Grid.Row="1"
+                     />
+            
+        </Grid>
+
+
     </ContentPage.Content>
 </ContentPage>
 

App/Views/Portals/DiscordAuthPortal.xaml.cs

@@ -31,8 +31,6 @@ protected override void OnAppearing()
     private async void DiscordPortal_Navigated(object sender, WebNavigatedEventArgs e)
     {
 
-        
-
         // Remove loding indicator
         if (e.Url.Contains("discord.com/oauth2/authorize"))
         {
@@ -54,14 +52,19 @@ private async void DiscordPortal_Navigated(object sender, WebNavigatedEventArgs
             Result = true;
             CallBack(res);
 
-            // Navigate back
-            CurrentApp.Windows[0].Page.Navigation.RemovePage(this);
-
-            CurrentApp.RemoveLoadingIndicator();
+            await NavigateBack();
             return;
         }
     }
 
+    private static async Task NavigateBack()
+    {
+        await Shell.Current.Navigation.PopModalAsync();
+        await CurrentApp.Windows[0].Navigation.PopModalAsync();
+
+        CurrentApp.RemoveLoadingIndicator();
+    }
+
     private void DiscordPortal_Navigating(object sender, WebNavigatingEventArgs e)
     {
         // Catch the navigation to the api
@@ -73,4 +76,9 @@ private void DiscordPortal_Navigating(object sender, WebNavigatingEventArgs e)
             DiscordPortal.IsVisible = false;
         }
     }
+
+    private void Close_Clicked(object sender, EventArgs e)
+    {
+        NavigateBack().GetAwaiter();
+    }
 }