Merge remote-tracking branch 'origin/UpdateMobileApplicationStyle'

Author: habarthierry-hue

src/Mobile/SimpleIdServer.Mobile/Components/LinkComponent.xaml

@@ -5,7 +5,7 @@
              xmlns:local="clr-namespace:SimpleIdServer.Mobile.Components"
              x:Class="SimpleIdServer.Mobile.Components.LinkComponent"
              x:Name="this">
-    <Border Margin="5">
+    <StackLayout Style="{StaticResource linkComponent}">
         <StackLayout Orientation="Horizontal" Padding="10,20,10,20">
             <Image WidthRequest="20" HeightRequest="20" Source="{Binding Path=Source}" HorizontalOptions="Start"></Image>
             <Label Padding="5,0,0,0" HorizontalOptions="StartAndExpand" Text="{Binding Path=Title}"></Label>
@@ -14,5 +14,6 @@
                 <TapGestureRecognizer Command="{Binding Path=NavigateCommand}" />
             </StackLayout.GestureRecognizers>
         </StackLayout>
-    </Border>
+        <BoxView Style="{StaticResource separator}"></BoxView>
+    </StackLayout>
 </ContentView>

src/Mobile/SimpleIdServer.Mobile/Components/ViewOTPCode.xaml

@@ -42,7 +42,10 @@
                 <Button Text="Generate" Command="{Binding Path=GenerateHOTPCommand}"></Button>
             </StackLayout>
             <StackLayout IsVisible="{Binding Path=IsOTPCodeExists, Converter={StaticResource InvertedBoolConverter}}" Padding="10">
-                <Label Text="Select a one-time password"></Label>
+                <ContentView Style="{StaticResource noRecord}">
+                    <Image Source="nootp.png" HorizontalOptions="Center" Aspect="AspectFit" />
+                </ContentView>
+                <Label Text="Select a one-time password from below to view the result." HorizontalOptions="Center"/>
             </StackLayout>
         </Grid>
     </ContentView.Content>

src/Mobile/SimpleIdServer.Mobile/DidsPage.xaml

@@ -2,20 +2,32 @@
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:local="clr-namespace:SimpleIdServer.Mobile.ViewModels"
+             xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
              x:DataType="local:DidsViewModel"
              x:Class="SimpleIdServer.Mobile.DidsPage"
              xmlns:components="clr-namespace:SimpleIdServer.Mobile.Components"
              xmlns:models="clr-namespace:SimpleIdServer.Mobile.Models"
              xmlns:common="clr-namespace:SimpleIdServer.Mobile.Common"
              Title="DIDs">
+    <ContentPage.Resources>
+        <ResourceDictionary>
+            <toolkit:InvertedBoolConverter x:Key="InvertedBoolConverter"></toolkit:InvertedBoolConverter>
+        </ResourceDictionary>
+    </ContentPage.Resources>
     <ContentPage.ToolbarItems>
         <ToolbarItem Order="Primary" Text="Add" Command="{Binding Path=AddCommand}"></ToolbarItem>
         <ToolbarItem Order="Primary" Text="Active" Command="{Binding Path=SetActiveCommand}"></ToolbarItem>
         <ToolbarItem Order="Primary" Text="Delete" Command="{Binding Path=DeleteCommand}"></ToolbarItem>
     </ContentPage.ToolbarItems>
-    <Grid Margin="20">
+    <Grid Padding="20" BackgroundColor="{StaticResource BackgroundColor}">
         <common:Loader IsVisible="{Binding Path=IsLoading}" ZIndex="2" />
-        <CollectionView ItemsSource="{Binding Path=Dids}">
+        <StackLayout IsVisible="{Binding Path=AtLeastOneDid, Converter={StaticResource InvertedBoolConverter}}" Padding="10">
+            <ContentView Style="{StaticResource noRecord}">
+                <Image Source="did.png" HorizontalOptions="Center" Aspect="AspectFit" />
+            </ContentView>
+            <Label Text="There is no distributed identity. Click 'Add' to generate a new one." HorizontalOptions="Center"/>
+        </StackLayout>
+        <CollectionView IsVisible="{Binding Path=AtLeastOneDid}" ItemsSource="{Binding Path=Dids}">
             <CollectionView.ItemTemplate>
                 <DataTemplate>
                     <Border Margin="5" x:DataType="models:DidRecord">

src/Mobile/SimpleIdServer.Mobile/EnrollPage.xaml

@@ -40,7 +40,7 @@
                                     <OrientationStateTrigger Orientation="Portrait"></OrientationStateTrigger>
                                 </VisualState.StateTriggers>
                                 <VisualState.Setters>
-                                    <Setter Property="BackgroundColor" Value="#E1E1E1" />
+                                    <Setter Property="BackgroundColor" Value="{StaticResource BackgroundColor}" />
                                 </VisualState.Setters>
                             </VisualState>
                             <VisualState x:Name="Landscape">

src/Mobile/SimpleIdServer.Mobile/InfoPage.xaml

@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="SimpleIdServer.Mobile.InfoPage"
              Title="Info">
-    <StackLayout Spacing="5">
+    <StackLayout Spacing="5" BackgroundColor="{StaticResource BackgroundColor}">
         <StackLayout Spacing="10" Padding="10">
             <Label FontAttributes="Bold">URL</Label>
             <Label>https://github.com/simpleidserver/SimpleIdServer</Label>

src/Mobile/SimpleIdServer.Mobile/ProfilePage.xaml

@@ -7,7 +7,7 @@
              x:DataType="local:ProfileViewModel"
              x:Class="SimpleIdServer.Mobile.ProfilePage"
              Title="Profile">
-    <Grid>
+    <Grid BackgroundColor="{StaticResource BackgroundColor}">
         <common:Loader IsVisible="{Binding Path=IsLoading}" ZIndex="2" />
         <StackLayout Spacing="5">
             <StackLayout Spacing="10" Padding="10">

src/Mobile/SimpleIdServer.Mobile/QRCodeScannerPage.xaml

@@ -20,12 +20,14 @@
         <Grid ZIndex="1">
             <Grid.RowDefinitions>
                 <RowDefinition Height="*" />
+                <RowDefinition Height="auto" />
             </Grid.RowDefinitions>
             <zxing:CameraBarcodeReaderView x:Name="cameraBarCodeReader" Grid.Row="0">
                 <zxing:CameraBarcodeReaderView.Behaviors>
                     <toolkit:EventToCommandBehavior EventName="BarcodesDetected" Command="{Binding ScanQRCodeCommand}" EventArgsConverter="{StaticResource barcodeDetectionEventArgsConverter}" />
                 </zxing:CameraBarcodeReaderView.Behaviors>
             </zxing:CameraBarcodeReaderView>
+            <Button Text="Close" Grid.Row="1" Command="{Binding Path=CloseCommand}"></Button>
         </Grid>
     </Grid>
 </ContentPage>