Fix mobile application

Author: habarthierry-hue

src/Mobile/SimpleIdServer.Mobile/QRCodeScannerPage.xaml

@@ -20,13 +20,8 @@
         <Grid ZIndex="1">
             <Grid.RowDefinitions>
                 <RowDefinition Height="*" />
-                <RowDefinition Height="9*" />
             </Grid.RowDefinitions>
-            <StackLayout Grid.Row="0" Style="{StaticResource modalToolbar}">
-                <ImageButton Command="{Binding Path=CloseCommand}" Style="{StaticResource modalToolbarClose}" />
-                <Label Style="{StaticResource modalToolbarTitle}">Scan QR Code</Label>
-            </StackLayout>
-            <zxing:CameraBarcodeReaderView x:Name="cameraBarCodeReader" Grid.Row="1">
+            <zxing:CameraBarcodeReaderView x:Name="cameraBarCodeReader" Grid.Row="0">
                 <zxing:CameraBarcodeReaderView.Behaviors>
                     <toolkit:EventToCommandBehavior EventName="BarcodesDetected" Command="{Binding ScanQRCodeCommand}" EventArgsConverter="{StaticResource barcodeDetectionEventArgsConverter}" />
                 </zxing:CameraBarcodeReaderView.Behaviors>

src/Mobile/SimpleIdServer.Mobile/Services/NavigationService.cs

@@ -5,6 +5,8 @@ public interface INavigationService
     Task GoBack();
     Task<T> DisplayModal<T>() where T : ContentPage;
     Task<T> DisplayModal<T>(T content) where T : ContentPage;
+    Task<T> Navigate<T>() where T : ContentPage;
+    Task<T> Navigate<T>(T content) where T : ContentPage;
 }
 
 public class NavigationService : INavigationService
@@ -30,6 +32,12 @@ public Task<T> DisplayModal<T>() where T : ContentPage
         return DisplayModal(service);
     }
 
+    public Task<T> Navigate<T>() where T : ContentPage
+    {
+        var service = _serviceProvider.GetRequiredService<T>();
+        return Navigate(service);
+    }
+
     public async Task<T> DisplayModal<T>(T content) where T : ContentPage
     {
         await App.Current.Dispatcher.DispatchAsync(async () =>
@@ -39,4 +47,14 @@ await App.Current.Dispatcher.DispatchAsync(async () =>
         });
         return content;
     }
+
+    public async Task<T> Navigate<T>(T content) where T : ContentPage
+    {
+        await App.Current.Dispatcher.DispatchAsync(async () =>
+        {
+            var navigation = App.Current.MainPage.Navigation;
+            await navigation.PushAsync(content);
+        });
+        return content;
+    }
 }

src/Mobile/SimpleIdServer.Mobile/ViewCredentialListPage.xaml

@@ -12,24 +12,17 @@
              xmlns:zxing="clr-namespace:ZXing.Net.Maui.Controls;assembly=ZXing.Net.MAUI.Controls"
              x:Class="SimpleIdServer.Mobile.ViewCredentialListPage"
              Shell.TabBarIsVisible="false"
-             Title="One time password">
+             Title="Credentials">
+    <ContentPage.ToolbarItems>
+        <ToolbarItem Order="Primary" Text="Delete" Command="{Binding Path=RemoveSelectedCredentialsCommand}"></ToolbarItem>
+    </ContentPage.ToolbarItems>
     <Grid>
         <common:Loader IsVisible="{Binding Path=IsLoading}" ZIndex="2" />
         <Grid ZIndex="1">
             <Grid.RowDefinitions>
                 <RowDefinition Height="*" />
-                <RowDefinition Height="9*" />
             </Grid.RowDefinitions>
-            <StackLayout Grid.Row="0" Style="{StaticResource modalToolbar}">
-                <ImageButton Command="{Binding Path=CloseCommand}" Style="{StaticResource modalToolbarClose}" />
-                <Label Style="{StaticResource modalToolbarTitle}">Credentials</Label>
-                <Label Text="Delete" Style="{StaticResource removeBtn}">
-                    <Label.GestureRecognizers>
-                        <TapGestureRecognizer Command="{Binding Path=RemoveSelectedCredentialsCommand}"></TapGestureRecognizer>
-                    </Label.GestureRecognizers>
-                </Label>
-            </StackLayout>
-            <ListView ItemsSource="{Binding Path=Credentials}" SelectionMode="None" Grid.Row="1">
+            <ListView ItemsSource="{Binding Path=Credentials}" SelectionMode="None" Grid.Row="0">
                 <ListView.ItemTemplate>
                     <DataTemplate x:DataType="stores:SelectableCredentialRecord">
                         <ViewCell>

src/Mobile/SimpleIdServer.Mobile/ViewModels/EnrollViewModel.cs

@@ -11,15 +11,15 @@ public EnrollViewModel(INavigationService navigationService)
     {
         ScanQRCodeCommand = new Command(async () =>
         {
-            await navigationService.DisplayModal<QRCodeScannerPage>();
+            await navigationService.Navigate<QRCodeScannerPage>();
         });
         ViewOTPCommand = new Command((async () =>
         {
-            await navigationService.DisplayModal<ViewOtpListPage>();
+            await navigationService.Navigate<ViewOtpListPage>();
         }));
         ViewCredentialListCommand = new Command((async () =>
         {
-            await navigationService.DisplayModal<ViewCredentialListPage>();
+            await navigationService.Navigate<ViewCredentialListPage>();
         }));
     }
 

src/Mobile/SimpleIdServer.Mobile/ViewOtpListPage.xaml

@@ -19,23 +19,13 @@
         <common:Loader IsVisible="{Binding Path=IsLoading}" ZIndex="2" />
         <Grid ZIndex="1">
             <Grid.RowDefinitions>
+                <RowDefinition Height="9*" />
                 <RowDefinition Height="*" />
-                <RowDefinition Height="8*" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>            
-            <StackLayout Grid.Row="0" Style="{StaticResource modalToolbar}">
-                <ImageButton Command="{Binding Path=CloseCommand}" Style="{StaticResource modalToolbarClose}" />
-                <Label Style="{StaticResource modalToolbarTitle}">One Time Password</Label>
-                <Label Text="Delete" Style="{StaticResource removeBtn}">
-                    <Label.GestureRecognizers>
-                        <TapGestureRecognizer Command="{Binding Path=RemoveSelectedOtpCommand}"></TapGestureRecognizer>
-                    </Label.GestureRecognizers>
-                </Label>
-            </StackLayout>
+            </Grid.RowDefinitions>
             <!-- Display the selected OTP Code -->
-            <components:ViewOTPCode Grid.Row="1" OTPCode="{Binding Path=SelectedOTPCode}" />
+            <components:ViewOTPCode Grid.Row="0" OTPCode="{Binding Path=SelectedOTPCode}" />
             <!-- Display list of OTP Codes -->
-            <CollectionView Grid.Row="2" ItemsSource="{Binding Path=OTPCodes}" SelectionMode="Single" SelectedItem="{Binding Path=SelectedOTPCode}">
+            <CollectionView Grid.Row="1" ItemsSource="{Binding Path=OTPCodes}" SelectionMode="Single" SelectedItem="{Binding Path=SelectedOTPCode}">
                 <CollectionView.ItemsLayout>
                     <LinearItemsLayout Orientation="Horizontal" />
                 </CollectionView.ItemsLayout>