From c6309173ba1202980d75f750807c579362488087 Mon Sep 17 00:00:00 2001
From: Dinis Vieira <dinisvieira@outlook.com>
Date: Sat, 4 Nov 2023 17:48:59 +0000
Subject: [PATCH] PM-3349 PM-3350 Migrated IconLabelButton Frames to Borders to
 fix issue with TapGestureRecognizer in Android Also fixed some minor "styles"
 for normal Button and IconLabelButton (both Android and iOS)

---
 .../IconLabelButton/IconLabelButton.xaml      | 67 +++++++++----------
 .../IconLabelButton/IconLabelButton.xaml.cs   | 23 +++----
 src/Core/Pages/Accounts/LoginPage.xaml        |  2 +-
 src/Core/Resources/Styles/iOS.xaml            |  4 ++
 4 files changed, 47 insertions(+), 49 deletions(-)

diff --git a/src/Core/Controls/IconLabelButton/IconLabelButton.xaml b/src/Core/Controls/IconLabelButton/IconLabelButton.xaml
index bb3ce642a..18d89eb64 100644
--- a/src/Core/Controls/IconLabelButton/IconLabelButton.xaml
+++ b/src/Core/Controls/IconLabelButton/IconLabelButton.xaml
@@ -1,42 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Frame xmlns="http://schemas.microsoft.com/dotnet/2021/maui" 
+<ContentView xmlns="http://schemas.microsoft.com/dotnet/2021/maui" 
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     x:Class="Bit.App.Controls.IconLabelButton"
     xmlns:controls="clr-namespace:Bit.App.Controls"
     x:Name="_iconLabelButton"
     HeightRequest="45"
-    Padding="1"
-    StyleClass="btn-icon-secondary"
-    BackgroundColor="{Binding IconLabelBorderColor, Source={x:Reference _iconLabelButton}}"
-    BorderColor="Transparent"
-    HasShadow="False">
-    <Frame.GestureRecognizers>
-        <TapGestureRecognizer Command="{Binding ButtonCommand, Source={x:Reference _iconLabelButton}}" />
-    </Frame.GestureRecognizers>
-    <Frame
-        Margin="0"
-        Padding="0"
-        CornerRadius="{Binding CornerRadius, Source={x:Reference _iconLabelButton}}"
-        BackgroundColor="{Binding IconLabelBackgroundColor, Source={x:Reference _iconLabelButton}}"
-        BorderColor="Transparent"
-        IsClippedToBounds="True"
-        HasShadow="False">
-        <StackLayout
-            Orientation="Horizontal"
-            HorizontalOptions="Center">
-            <controls:IconLabel
-                VerticalOptions="Center"
-                HorizontalTextAlignment="Center"
-                FontSize="Large"
-                TextColor="{Binding IconLabelColor, Source={x:Reference _iconLabelButton}}"
-                Text="{Binding Icon, Source={x:Reference _iconLabelButton}}">
-            </controls:IconLabel>
-            <Label
-                VerticalOptions="Center"
-                HorizontalTextAlignment="Center"
-                TextColor="{Binding IconLabelColor, Source={x:Reference _iconLabelButton}}"
-                FontSize="Medium"
-                Text="{Binding Label, Source={x:Reference _iconLabelButton}}"/>
-        </StackLayout>
-    </Frame>
-</Frame>
+    StyleClass="btn-icon-secondary">
+    <Border StrokeThickness="2" BackgroundColor="{Binding IconLabelBackgroundColor, Source={x:Reference _iconLabelButton}}" Stroke="{Binding IconLabelBorderColor, Source={x:Reference _iconLabelButton}}">
+        <Border.StrokeShape>
+            <RoundRectangle CornerRadius="{Binding CornerRadius, Source={x:Reference _iconLabelButton}}" />
+        </Border.StrokeShape>
+        <Grid>
+            <StackLayout
+                Spacing="6"
+                Orientation="Horizontal"
+                HorizontalOptions="Center">
+                <StackLayout.GestureRecognizers>
+                    <TapGestureRecognizer Command="{Binding ButtonCommand, Source={x:Reference _iconLabelButton}}" />
+                </StackLayout.GestureRecognizers>
+                <controls:IconLabel
+                    VerticalOptions="Center"
+                    HorizontalTextAlignment="Center"
+                    FontSize="Large"
+                    TextColor="{Binding IconLabelColor, Source={x:Reference _iconLabelButton}}"
+                    Text="{Binding Icon, Source={x:Reference _iconLabelButton}}">
+                </controls:IconLabel>
+                <Label
+                    VerticalOptions="Center"
+                    HorizontalTextAlignment="Center"
+                    TextColor="{Binding IconLabelColor, Source={x:Reference _iconLabelButton}}"
+                    FontSize="Medium"
+                    Text="{Binding Label, Source={x:Reference _iconLabelButton}}" />
+            </StackLayout>
+        </Grid>
+    </Border>
+</ContentView>
diff --git a/src/Core/Controls/IconLabelButton/IconLabelButton.xaml.cs b/src/Core/Controls/IconLabelButton/IconLabelButton.xaml.cs
index 1fb63785f..23b306682 100644
--- a/src/Core/Controls/IconLabelButton/IconLabelButton.xaml.cs
+++ b/src/Core/Controls/IconLabelButton/IconLabelButton.xaml.cs
@@ -1,18 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Input;
-using Bit.Core.Models.Domain;
-using Microsoft.Maui.Controls.Xaml;
-using Microsoft.Maui.Graphics;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui;
+using System.Windows.Input;
 
 namespace Bit.App.Controls
 {
-    public partial class IconLabelButton : Frame
+    public partial class IconLabelButton : ContentView
     {
         public static readonly BindableProperty IconProperty = BindableProperty.Create(
             nameof(Icon), typeof(string), typeof(IconLabelButton));
@@ -32,6 +22,9 @@ namespace Bit.App.Controls
         public static readonly BindableProperty IconLabelBorderColorProperty = BindableProperty.Create(
             nameof(IconLabelBorderColor), typeof(Color), typeof(IconLabelButton), Colors.White);
 
+        public static readonly BindableProperty CornerRadiusProperty = BindableProperty.Create(
+            nameof(CornerRadius), typeof(CornerRadius), typeof(IconLabelButton));
+
         public IconLabelButton()
         {
             InitializeComponent();
@@ -72,6 +65,12 @@ namespace Bit.App.Controls
             get { return (Color)GetValue(IconLabelBorderColorProperty); }
             set { SetValue(IconLabelBorderColorProperty, value); }
         }
+
+        public CornerRadius CornerRadius
+        {
+            get { return (CornerRadius)GetValue(CornerRadiusProperty); }
+            set { SetValue(CornerRadiusProperty, value); }
+        }
     }
 }
 
diff --git a/src/Core/Pages/Accounts/LoginPage.xaml b/src/Core/Pages/Accounts/LoginPage.xaml
index c0a59db49..2e500d5fa 100644
--- a/src/Core/Pages/Accounts/LoginPage.xaml
+++ b/src/Core/Pages/Accounts/LoginPage.xaml
@@ -107,7 +107,7 @@
                             </Label>
                         </Grid>
                     </StackLayout>
-                    <StackLayout Padding="10, 10">
+                    <StackLayout Padding="10, 10" Spacing="6">
                         <Button x:Name="_loginWithMasterPassword"
                             Text="{u:I18n LogInWithMasterPassword}" 
                                 StyleClass="btn-primary"
diff --git a/src/Core/Resources/Styles/iOS.xaml b/src/Core/Resources/Styles/iOS.xaml
index 5e35ff981..a50af93de 100644
--- a/src/Core/Resources/Styles/iOS.xaml
+++ b/src/Core/Resources/Styles/iOS.xaml
@@ -175,6 +175,10 @@
                 Value="Bold" />
         <Setter Property="Margin"
                 Value="0, 5, 0, 0" />
+        <Setter Property="CornerRadius"
+                Value="5" />
+        <Setter Property="MinimumHeightRequest"
+                Value="45" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">