From a73923c4f73e8f1b942ac4b16ad778046e486509 Mon Sep 17 00:00:00 2001
From: Dinis Vieira <dinisvieira@outlook.com>
Date: Tue, 20 Feb 2024 22:06:47 +0000
Subject: [PATCH] [PM-5909] Fix Font MAUI Sizes (#3014)

* PM-5909 Set the default FontSize for Entry, Editor, SearchBar and Picker on Android so that the fonts have a similar size to the one in the Xamarin Forms app.

* PM-5909 Set the default FontSize for Entry, Editor, SearchBar and Picker on iOS so that the fonts have a similar size to the one in the Xamarin Forms app.

* PM-5909 Added spacing in specific scenario for Send Groups (between icon and text)
---
 .../Pages/Send/SendGroupingsPage/SendGroupingsPage.xaml   | 1 +
 src/Core/Resources/Styles/Android.xaml                    | 8 ++++++++
 src/Core/Resources/Styles/iOS.xaml                        | 8 ++++++++
 3 files changed, 17 insertions(+)

diff --git a/src/Core/Pages/Send/SendGroupingsPage/SendGroupingsPage.xaml b/src/Core/Pages/Send/SendGroupingsPage/SendGroupingsPage.xaml
index 2f7a66790..c663d6acc 100644
--- a/src/Core/Pages/Send/SendGroupingsPage/SendGroupingsPage.xaml
+++ b/src/Core/Pages/Send/SendGroupingsPage/SendGroupingsPage.xaml
@@ -50,6 +50,7 @@
                           x:DataType="pages:SendGroupingsPageListItem">
                 <controls:ExtendedStackLayout Orientation="Horizontal" 
                                               StyleClass="list-row, list-row-platform"
+                                              Spacing="6"
                                               AutomationId="{Binding AutomationId}">
                     <controls:IconLabel Text="{Binding Icon, Mode=OneWay}"
                                       HorizontalOptions="Start"
diff --git a/src/Core/Resources/Styles/Android.xaml b/src/Core/Resources/Styles/Android.xaml
index 91e4ac7b6..d69688191 100644
--- a/src/Core/Resources/Styles/Android.xaml
+++ b/src/Core/Resources/Styles/Android.xaml
@@ -11,11 +11,15 @@
                 Value="{DynamicResource TextColor}" />
         <Setter Property="Margin"
                 Value="-4, 0, -4, -4" />
+        <Setter Property="FontSize"
+                Value="18" />
     </Style>
     <Style TargetType="Picker"
            ApplyToDerivedTypes="True">
         <Setter Property="TextColor"
                 Value="{DynamicResource TextColor}" />
+        <Setter Property="FontSize"
+                Value="18" />
         <Setter Property="Margin"
                 Value="-4, 0, -4, -4" />
     </Style>
@@ -39,6 +43,8 @@
                 Value="{DynamicResource TextColor}" />
         <Setter Property="PlaceholderColor"
                 Value="{DynamicResource InputPlaceholderColor}" />
+        <Setter Property="FontSize"
+                Value="18" />
         <Setter Property="Margin"
                 Value="-4, 0, -4, -4" />
     </Style>
@@ -46,6 +52,8 @@
            ApplyToDerivedTypes="True">
         <Setter Property="BackgroundColor"
                 Value="Transparent" />
+        <Setter Property="FontSize"
+                Value="18" />
         <Setter Property="TextColor"
                 Value="{DynamicResource TitleEntryTextColor}" />
         <Setter Property="CancelButtonColor"
diff --git a/src/Core/Resources/Styles/iOS.xaml b/src/Core/Resources/Styles/iOS.xaml
index a50af93de..1664c0b53 100644
--- a/src/Core/Resources/Styles/iOS.xaml
+++ b/src/Core/Resources/Styles/iOS.xaml
@@ -9,6 +9,8 @@
                 Value="{DynamicResource InputPlaceholderColor}" />
         <Setter Property="TextColor"
                 Value="{DynamicResource TextColor}" />
+        <Setter Property="FontSize"
+                Value="18" />
         <Setter Property="Margin"
                 Value="0, 5, 0, 12" />
     </Style>
@@ -16,6 +18,8 @@
            ApplyToDerivedTypes="True">
         <Setter Property="TextColor"
                 Value="{DynamicResource TextColor}" />
+        <Setter Property="FontSize"
+                Value="18" />
         <Setter Property="Margin"
                 Value="0, 5, 0, 12" />
     </Style>
@@ -37,6 +41,8 @@
            ApplyToDerivedTypes="True">
         <Setter Property="TextColor"
                 Value="{DynamicResource TextColor}" />
+        <Setter Property="FontSize"
+                Value="18" />
         <Setter Property="BackgroundColor"
                 Value="{DynamicResource BackgroundColor}" />
         <Setter Property="PlaceholderColor"
@@ -51,6 +57,8 @@
     </Style>
     <Style TargetType="SearchBar"
            ApplyToDerivedTypes="True">
+        <Setter Property="FontSize"
+                Value="18" />
         <Setter Property="BackgroundColor"
                 Value="{DynamicResource ListHeaderBackgroundColor}" />
         <Setter Property="TextColor"