From ce41eb05787dd039e806d04d30e80d4eb8dff5aa Mon Sep 17 00:00:00 2001
From: Federico Maccaroni <fedemkr@gmail.com>
Date: Mon, 20 Nov 2023 16:09:23 -0300
Subject: [PATCH] PM-3350 Fixed account toolbar item and TitleView on
 SendAddOnlyPage, also removed comments on AvatarImageSource given the
 workaround is not needed anymore to draw the image successfully.

---
 src/Core/Controls/AvatarImageSource.cs      | 13 +-----
 src/Core/Pages/Send/SendAddOnlyPage.xaml    | 50 ++++++++++++++-------
 src/Core/Pages/Send/SendAddOnlyPage.xaml.cs |  8 ----
 src/Core/Resources/Styles/Base.xaml         | 30 +++++++++++++
 4 files changed, 65 insertions(+), 36 deletions(-)

diff --git a/src/Core/Controls/AvatarImageSource.cs b/src/Core/Controls/AvatarImageSource.cs
index 9f3ee89cb..6ffbb1167 100644
--- a/src/Core/Controls/AvatarImageSource.cs
+++ b/src/Core/Controls/AvatarImageSource.cs
@@ -1,12 +1,5 @@
-using System;
-using System.IO;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Bit.Core.Utilities;
+using Bit.Core.Utilities;
 using SkiaSharp;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
 
 namespace Bit.App.Controls
 {
@@ -48,11 +41,7 @@ namespace Bit.App.Controls
 
         private Task<Stream> GetStreamAsync(CancellationToken userToken = new CancellationToken())
         {
-            // TODO: [MAUI-Avatar] now methods are private protected so cannot be used here, figure out workaround
-            //OnLoadingStarted();
-            //userToken.Register(CancellationTokenSource.Cancel);
             var result = Draw();
-            //OnLoadingCompleted(CancellationTokenSource.IsCancellationRequested);
             return Task.FromResult(result);
         }
 
diff --git a/src/Core/Pages/Send/SendAddOnlyPage.xaml b/src/Core/Pages/Send/SendAddOnlyPage.xaml
index d4b34b05e..425912410 100644
--- a/src/Core/Pages/Send/SendAddOnlyPage.xaml
+++ b/src/Core/Pages/Send/SendAddOnlyPage.xaml
@@ -10,26 +10,44 @@
     xmlns:effects="clr-namespace:Bit.App.Effects"
     x:DataType="pages:SendAddEditPageViewModel"
     HideSoftInputOnTapped="True"
-    x:Name="_page"
-    Title="{Binding PageTitle}">
+    x:Name="_page">
     <ContentPage.BindingContext>
         <pages:SendAddEditPageViewModel />
     </ContentPage.BindingContext>
 
-    <ContentPage.ToolbarItems>
-        <!--Order matters here or the avatar's image won't be updated correctly, check iOS CustomNavigationRenderer for more info-->
-        <controls:ExtendedToolbarItem
-            x:Name="_accountAvatar"
-            IconImageSource="{Binding AvatarImageSource}"
-            Command="{Binding Source={x:Reference _accountListOverlay}, Path=ToggleVisibililtyCommand}"
-            Order="Primary"
-            Priority="-2"
-            UseOriginalImage="True"
-            SemanticProperties.Description="{u:I18n Account}"
-            AutomationId="AccountIconButton" />
-        <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" x:Name="_closeItem" />
-        <ToolbarItem Text="{u:I18n Save}" Clicked="Save_Clicked" Order="Primary" x:Name="_saveItem"/>
-    </ContentPage.ToolbarItems>
+    <!--Using a TitleView because ToolbarItem doesn't support adding the item to the left of the title-->
+    <NavigationPage.TitleView>
+        <Grid
+            ColumnDefinitions="Auto,*,Auto,Auto">
+            <ImageButton
+                Source="{Binding AvatarImageSource}"
+                Command="{Binding Source={x:Reference _accountListOverlay}, Path=ToggleVisibililtyCommand}"
+                SemanticProperties.Description="{u:I18n Account}"
+                AutomationId="AccountIconButton"/>
+            <Label
+                Grid.Column="1"
+                Text="{Binding PageTitle}"
+                StyleClass="toolbar-title"
+                HorizontalOptions="Center"
+                VerticalOptions="Center"
+                AutomationId="ViewTitleLabel"/>
+            <Button
+                Grid.Column="2"
+                Text="{u:I18n Cancel}"
+                StyleClass="toolbar-borderless-button"
+                Clicked="Close_Clicked"
+                SemanticProperties.Description="{u:I18n Cancel}"
+                AutomationId="CloseButton"/>
+            <Button
+                Grid.Column="3"
+                x:Name="_saveItem"
+                Text="{u:I18n Save}"
+                StyleClass="toolbar-borderless-button"
+                Clicked="Save_Clicked"
+                SemanticProperties.Description="{u:I18n Save}"
+                AutomationId="SaveButton"/>
+        </Grid>
+    </NavigationPage.TitleView>
 
     <ContentPage.Resources>
         <ResourceDictionary>
diff --git a/src/Core/Pages/Send/SendAddOnlyPage.xaml.cs b/src/Core/Pages/Send/SendAddOnlyPage.xaml.cs
index 125e2fa92..05a4746c7 100644
--- a/src/Core/Pages/Send/SendAddOnlyPage.xaml.cs
+++ b/src/Core/Pages/Send/SendAddOnlyPage.xaml.cs
@@ -70,7 +70,6 @@ namespace Bit.App.Pages
                     return;
                 }
 
-                _accountAvatar?.OnAppearing();
                 await MainThread.InvokeOnMainThreadAsync(async () => _vm.AvatarImageSource = await GetAvatarImageSourceAsync());
 
                 await HandleCreateRequest();
@@ -87,13 +86,6 @@ namespace Bit.App.Pages
             }
         }
 
-        protected override void OnNavigatingFrom(NavigatingFromEventArgs args)
-        {
-            base.OnNavigatingFrom(args);
-
-            _accountAvatar?.OnDisappearing();
-        }
-
         private async Task CloseAsync()
         {
             if (OnClose is null)
diff --git a/src/Core/Resources/Styles/Base.xaml b/src/Core/Resources/Styles/Base.xaml
index ca825485a..a5bc2e0ed 100644
--- a/src/Core/Resources/Styles/Base.xaml
+++ b/src/Core/Resources/Styles/Base.xaml
@@ -625,5 +625,35 @@
         <Setter Property="IsVisible"
                 Value="{OnPlatform Android=True, iOS=False}" />
     </Style>
+
+    <Style TargetType="Label"
+           ApplyToDerivedTypes="True"
+           Class="toolbar-title">
+        <Setter Property="TextColor"
+                Value="{DynamicResource TitleTextColor}" />
+        <Setter Property="FontSize"
+                Value="Header" />
+        <Setter Property="FontAttributes"
+                Value="Bold" />
+        <Setter Property="MaxLines"
+                Value="1" />
+        <Setter Property="LineBreakMode"
+                Value="TailTruncation" />
+    </Style>
+
+    <Style TargetType="Button"
+           ApplyToDerivedTypes="True"
+           Class="toolbar-borderless-button">
+        <Setter Property="TextColor"
+                Value="{DynamicResource TitleTextColor}" />
+        <Setter Property="Background"
+                Value="Transparent" />
+        <Setter Property="BackgroundColor"
+                Value="Transparent" />
+        <Setter Property="BorderWidth"
+                Value="0" />
+        <Setter Property="FontSize"
+                Value="Header" />
+    </Style>
     
 </ResourceDictionary>