Add full page loading

src/MobileUI/Controls/ProfileActivity.xaml

@@ -46,13 +46,6 @@
                Style="{StaticResource LabelBold}"
                Margin="0, 5" />
 
-        <ActivityIndicator
-            HorizontalOptions="Center"
-            VerticalOptions="Center"
-            IsRunning="True"
-            Color="{StaticResource primary}"
-            IsVisible="{Binding IsLoading}" />
-
         <VerticalStackLayout
             BindableLayout.ItemsSource="{Binding RecentActivity}"
             Spacing="8">

src/MobileUI/Features/Flyout/FlyoutFooter.xaml

@@ -37,25 +37,25 @@
             ColumnDefinitions="Auto,*">
             <Grid.GestureRecognizers>
                 <TapGestureRecognizer NumberOfTapsRequired="1"
-                                      Command="{Binding MyQrCodeTappedCommand}"/>
+                                      Command="{Binding MyProfileTappedCommand}"/>
             </Grid.GestureRecognizers>
             <Label Grid.Column="0"
                    HeightRequest="30"
                    WidthRequest="30"
                    VerticalOptions="Center"
                    VerticalTextAlignment="Center"
                    FontSize="16"
-                   FontFamily="FluentIcons"
+                   FontFamily="FluentIconsFilled"
                    TextColor="#DDDDDD"
-                   Text="&#xf636;">
+                   Text="&#xf5ca;">
             </Label>
             <Label Grid.Column="1"
                    Style="{StaticResource LabelBold}"
                    TextColor="#DDDDDD"
                    HorizontalOptions="Start"
                    VerticalOptions="Center"
                    FontSize="16"
-                   Text="My QR Code" />
+                   Text="My Profile" />
         </Grid>
     </VerticalStackLayout>
     <VerticalStackLayout VerticalOptions="Start">

src/MobileUI/Features/Flyout/FlyoutFooterViewModel.cs

@@ -31,13 +31,9 @@ public FlyoutFooterViewModel(IUserService userService, IAuthenticationService au
     }
 
     [RelayCommand]
-    private async Task MyQrCodeTapped()
+    private async Task MyProfileTapped()
     {
-        var granted = await _permissionsService.CheckAndRequestPermission<Permissions.Camera>();
-        if (granted)
-        {
-            await App.Current.MainPage.Navigation.PushModalAsync<ScanPage>(ScanPageSegments.MyCode);
-        }
+        await App.Current.MainPage.Navigation.PushModalAsync<MyProfilePage>();
     }
 
     [RelayCommand]

src/MobileUI/Features/Profile/MyProfilePage.xaml

@@ -13,31 +13,47 @@
     </ContentPage.Behaviors>
 
     <ScrollView>
-        <VerticalStackLayout Margin="15">
-
+        <Grid RowDefinitions="Auto, *"
+              Margin="15,0">
+
             <!-- Close button -->
-            <Border
-                HorizontalOptions="End"
-                BackgroundColor="{StaticResource Background}"
-                StrokeShape="Ellipse"
-                StrokeThickness="0"
-                IsVisible="{Binding ShowCloseButton}">
-                <Border.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding ClosePageCommand}" />
-                </Border.GestureRecognizers>
-                <Label
-                    FontFamily="FluentIcons"
-                    Text="&#xe4c3;"
-                    FontSize="35"
-                    FontAutoScalingEnabled="False"
-                    TextColor="{StaticResource primary}" />
-            </Border>
+            <Grid Grid.Row="0"
+                  Margin="0,10">
+                <Border
+                    HorizontalOptions="End"
+                    BackgroundColor="{StaticResource Background}"
+                    StrokeShape="Ellipse"
+                    StrokeThickness="0"
+                    IsVisible="{Binding ShowCloseButton}">
+                    <Border.GestureRecognizers>
+                        <TapGestureRecognizer Command="{Binding ClosePageCommand}" />
+                    </Border.GestureRecognizers>
+                    <Label
+                        FontFamily="FluentIcons"
+                        Text="&#xe4c3;"
+                        FontSize="35"
+                        FontAutoScalingEnabled="False"
+                        TextColor="{StaticResource primary}" />
+                </Border>
+            </Grid>
 
-            <controls:ProfileStats Margin="0,15,0,0" />
+            <VerticalStackLayout Grid.Row="1"
+                                 Spacing="15"
+                                 IsVisible="{Binding Path=IsLoading, Converter={mct:InvertedBoolConverter}}">
+                <controls:ProfileStats />
 
-            <controls:ProfileActivity Margin="0,15,0,0" />
+                <controls:ProfileActivity />
+            </VerticalStackLayout>
 
-        </VerticalStackLayout>
+            <ActivityIndicator
+                Grid.Row="1"
+                HorizontalOptions="Center"
+                VerticalOptions="Center"
+                Color="{StaticResource SSWRed}"
+                IsEnabled="{Binding IsLoading}"
+                IsRunning="{Binding IsLoading}"
+                IsVisible="{Binding IsLoading}" />
+        </Grid>
     </ScrollView>
 
 </ContentPage>

src/MobileUI/Features/Profile/MyProfilePage.xaml.cs

@@ -19,6 +19,7 @@ public MyProfilePage(MyProfileViewModel vm, IFirebaseAnalyticsService firebaseAn
 
     protected override async void OnAppearing()
     {
+        base.OnAppearing();
         _firebaseAnalyticsService.Log("MyProfilePage");
         await _viewModel.Initialise();
     }

src/MobileUI/Features/Profile/OthersProfilePage.xaml

@@ -13,47 +13,62 @@
     </ContentPage.Behaviors>
 
     <ScrollView>
-        <VerticalStackLayout Margin="15">
-
+        <Grid RowDefinitions="Auto, *"
+              Margin="15,0">
+
             <!-- Close button -->
-            <Border
-                HorizontalOptions="End"
-                BackgroundColor="{StaticResource Background}"
-                StrokeShape="Ellipse"
-                StrokeThickness="0"
-                IsVisible="{Binding ShowCloseButton}">
-                <Border.GestureRecognizers>
-                    <TapGestureRecognizer Command="{Binding ClosePageCommand}" />
-                </Border.GestureRecognizers>
-                <Label
-                    FontFamily="FluentIcons"
-                    Text="&#xe4c3;"
-                    FontSize="35"
-                    FontAutoScalingEnabled="False"
-                    TextColor="{StaticResource primary}" />
-            </Border>
+            <Grid Grid.Row="0"
+                  Margin="0,10">
+                <Border
+                    HorizontalOptions="End"
+                    BackgroundColor="{StaticResource Background}"
+                    StrokeShape="Ellipse"
+                    StrokeThickness="0"
+                    IsVisible="{Binding ShowCloseButton}">
+                    <Border.GestureRecognizers>
+                        <TapGestureRecognizer Command="{Binding ClosePageCommand}" />
+                    </Border.GestureRecognizers>
+                    <Label
+                        FontFamily="FluentIcons"
+                        Text="&#xe4c3;"
+                        FontSize="35"
+                        FontAutoScalingEnabled="False"
+                        TextColor="{StaticResource primary}" />
+                </Border>
+            </Grid>
 
-            <controls:ProfileStats Margin="0,15,0,0" />
+            <VerticalStackLayout Grid.Row="1"
+                                 Spacing="15"
+                                 IsVisible="{Binding Path=IsLoading, Converter={mct:InvertedBoolConverter}}">
+                <controls:ProfileStats />
 
-            <Button Text="Get in touch"
-                    TextTransform="Uppercase"
-                    Margin="0,15,0,0"
-                    Style="{StaticResource LabelBold}"
-                    HeightRequest="50"
-                    FontSize="16"
-                    BackgroundColor="{StaticResource SSWRed}"
-                    CornerRadius="8"
-                    Command="{Binding EmailUserCommand}"
-                    IsVisible="{Binding IsStaff}">
-                <Button.ImageSource>
-                    <FontImageSource Glyph="&#xf0e0;"
-                                     FontFamily="FA6Solid"
-                                     Size="20"/>
-                </Button.ImageSource>
-            </Button>
+                <Button Text="Get in touch"
+                        TextTransform="Uppercase"
+                        Style="{StaticResource LabelBold}"
+                        HeightRequest="50"
+                        FontSize="16"
+                        BackgroundColor="{StaticResource SSWRed}"
+                        CornerRadius="8"
+                        Command="{Binding EmailUserCommand}"
+                        IsVisible="{Binding IsStaff}">
+                    <Button.ImageSource>
+                        <FontImageSource Glyph="&#xf0e0;"
+                                         FontFamily="FA6Solid"
+                                         Size="20" />
+                    </Button.ImageSource>
+                </Button>
 
-            <controls:ProfileActivity Margin="0,15,0,0" />
+                <controls:ProfileActivity />
+            </VerticalStackLayout>
 
-        </VerticalStackLayout>
+            <ActivityIndicator
+                Grid.Row="1"
+                HorizontalOptions="Center"
+                VerticalOptions="Center"
+                Color="{StaticResource SSWRed}"
+                IsEnabled="{Binding IsLoading}"
+                IsRunning="{Binding IsLoading}"
+                IsVisible="{Binding IsLoading}" />
+        </Grid>
     </ScrollView>
 </ContentPage>

src/MobileUI/Features/Profile/OthersProfilePage.xaml.cs

@@ -23,6 +23,7 @@ public OthersProfilePage(OthersProfileViewModel vm, IFirebaseAnalyticsService fi
 
     protected override async void OnAppearing()
     {
+        base.OnAppearing();
         _firebaseAnalyticsService.Log("OthersProfilePage");
         await _viewModel.Initialise();
     }

src/MobileUI/Features/Profile/ProfileViewModelBase.cs

@@ -90,29 +90,20 @@ public ProfileViewModelBase(
         userService.LinkedInProfileObservable().Subscribe(linkedIn => LinkedInUrl = linkedIn);
         userService.GitHubProfileObservable().Subscribe(gitHub => GitHubUrl = gitHub);
         userService.TwitterProfileObservable().Subscribe(twitter => TwitterUrl = twitter);
-        userService.CompanyUrlObservable().Subscribe(company =>
-        {
-            CompanyUrl = company;
-
-            if (!IsStaff)
-            {
-                Title = company;
-            }
-        });
+        userService.CompanyUrlObservable().Subscribe(company => CompanyUrl = company);
     }
 
     protected async Task _initialise()
     {
-        IsLoading = true;
         await LoadProfileSections();
-        IsLoading = false;
     }
 
     protected async Task LoadProfileSections()
     {
         if (!_loadingProfileSectionsSemaphore.Wait(0))
             return;
 
+        IsLoading = true;
         var profileTask = _userService.GetUserAsync(UserId);
         var socialMediaTask = LoadSocialMedia();
 
@@ -134,6 +125,7 @@ protected async Task LoadProfileSections()
         await UpdateSkillsSectionIfRequired();
 
         _loadingProfileSectionsSemaphore.Release();
+        IsLoading = false;
     }
 
     private async Task LoadSocialMedia()

src/MobileUI/MauiProgram.cs

@@ -24,6 +24,7 @@ public static MauiApp CreateMauiApp()
             fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
             fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
             fonts.AddFont("FluentSystemIcons-Regular.ttf", "FluentIcons");
+            fonts.AddFont("FluentSystemIcons-Filled.ttf", "FluentIconsFilled");
             fonts.AddFont("FA6Brands-Regular.otf", "FA6Brands");
             fonts.AddFont("FontAwesome6-Regular.otf", "FA6Regular");
             fonts.AddFont("FontAwesome6-Solid.otf", "FA6Solid");