From b03c5afcf5d1dc78ce65e996b6cbf24c7afa69e4 Mon Sep 17 00:00:00 2001
From: marcchevaldonne <marc.chevaldonne@uca.fr>
Date: Sat, 27 Apr 2024 02:33:57 +0200
Subject: [PATCH] :lipstick: minor changes in the custom toolbar sample

---
 .../ex_CustomToolbar/AppShell.xaml            | 28 -------------------
 .../ex_CustomToolbar/MainPage.xaml            |  8 +++---
 .../ex_CustomToolbar/MainPage.xaml.cs         |  7 ++---
 3 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/ch02_DesigningViews/ex_CustomToolbar/AppShell.xaml b/ch02_DesigningViews/ex_CustomToolbar/AppShell.xaml
index 1cfb84a..811451f 100644
--- a/ch02_DesigningViews/ex_CustomToolbar/AppShell.xaml
+++ b/ch02_DesigningViews/ex_CustomToolbar/AppShell.xaml
@@ -10,34 +10,6 @@
     Shell.BackgroundColor="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource PrimaryDark}}"
     Title="ex_CustomToolbar">
 
-    <!-- <Shell.TitleView>
-        <Grid ColumnDefinitions="Auto, *, Auto, Auto, Auto" HorizontalOptions="Fill">
-            <Image Source="vinyl.png" HeightRequest="36"/>
-            <Label Grid.Column="1" Margin="10, 0, 0, 0"
-                Text="My Music App"
-                TextColor="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource PrimaryDarkText}}" 
-                VerticalTextAlignment="Center"
-                VerticalOptions="Center"
-                HeightRequest="36"
-                FontSize="Medium"/>
-            <ImageButton Source="hare.png" Grid.Column="2" MaximumHeightRequest="24">
-                <ImageButton.Behaviors>
-                    <toolkit:IconTintColorBehavior TintColor="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource PrimaryDarkText}}"  />
-                </ImageButton.Behaviors>
-            </ImageButton>
-            <ImageButton Source="info_circle.png" Grid.Column="3" MaximumHeightRequest="24">
-                <ImageButton.Behaviors>
-                    <toolkit:IconTintColorBehavior TintColor="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource PrimaryDarkText}}"  />
-                </ImageButton.Behaviors>
-            </ImageButton>
-            <ImageButton Source="ellipsis_vert.png" Grid.Column="4" MaximumHeightRequest="24">
-                <ImageButton.Behaviors>
-                    <toolkit:IconTintColorBehavior TintColor="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource PrimaryDarkText}}"  />
-                </ImageButton.Behaviors>
-            </ImageButton>
-        </Grid>
-    </Shell.TitleView> -->
-
     <ShellContent
         Title="Home"
         ContentTemplate="{DataTemplate local:MainPage}"
diff --git a/ch02_DesigningViews/ex_CustomToolbar/MainPage.xaml b/ch02_DesigningViews/ex_CustomToolbar/MainPage.xaml
index 15f1b38..1da7b70 100644
--- a/ch02_DesigningViews/ex_CustomToolbar/MainPage.xaml
+++ b/ch02_DesigningViews/ex_CustomToolbar/MainPage.xaml
@@ -20,19 +20,19 @@
                 VerticalOptions="Center"
                 HeightRequest="36"
                 FontSize="Medium"/>
-            <ImageButton Source="hare.png" Grid.Column="2" MaximumHeightRequest="24" MinimumHeightRequest="{OnPlatform WinUI=24}"
+            <ImageButton Source="hare.png" Grid.Column="2" MaximumHeightRequest="24" MinimumHeightRequest="24"
                          BackgroundColor="Transparent">
                 <ImageButton.Behaviors>
                     <toolkit:IconTintColorBehavior TintColor="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource PrimaryDarkText}}"  />
                 </ImageButton.Behaviors>
             </ImageButton>
-            <ImageButton Source="info_circle.png" Grid.Column="3" MaximumHeightRequest="24"  MinimumHeightRequest="{OnPlatform WinUI=24}"
+            <ImageButton Source="info_circle.png" Grid.Column="3" MaximumHeightRequest="24"  MinimumHeightRequest="24"
                          BackgroundColor="Transparent">
                 <ImageButton.Behaviors>
                     <toolkit:IconTintColorBehavior TintColor="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource PrimaryDarkText}}"  />
                 </ImageButton.Behaviors>
             </ImageButton>
-            <ImageButton Source="ellipsis_vert.png" Grid.Column="4" MaximumHeightRequest="24"  MinimumHeightRequest="{OnPlatform WinUI=24}" Clicked="EllipsisClicked"
+            <ImageButton Source="ellipsis_vert.png" Grid.Column="4" MaximumHeightRequest="24"  MinimumHeightRequest="24" Clicked="EllipsisClicked"
                          BackgroundColor="Transparent">
                 <ImageButton.Behaviors>
                     <toolkit:IconTintColorBehavior TintColor="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource PrimaryDarkText}}"  />
@@ -74,7 +74,7 @@
         </ScrollView>
         <AbsoluteLayout AbsoluteLayout.LayoutFlags="All"
                         AbsoluteLayout.LayoutBounds="0, 0, 1, 1"
-                        x:Name="test"
+                        x:Name="secondaryMenu"
                         IsVisible="false">
             <AbsoluteLayout.GestureRecognizers>
                 <TapGestureRecognizer Tapped="BackgroundClicked"/>
diff --git a/ch02_DesigningViews/ex_CustomToolbar/MainPage.xaml.cs b/ch02_DesigningViews/ex_CustomToolbar/MainPage.xaml.cs
index 1e57fe2..a395dad 100644
--- a/ch02_DesigningViews/ex_CustomToolbar/MainPage.xaml.cs
+++ b/ch02_DesigningViews/ex_CustomToolbar/MainPage.xaml.cs
@@ -23,15 +23,12 @@ public partial class MainPage : ContentPage
 
 	private void EllipsisClicked(object sender, EventArgs e)
 	{
-		test.IsVisible = !test.IsVisible;
+		secondaryMenu.IsVisible = !secondaryMenu.IsVisible;
 	}
 
 	private void BackgroundClicked(object sender, TappedEventArgs e)
 	{
-		if(test.IsVisible)
-		{
-			test.IsVisible = false;
-		}
+		secondaryMenu.IsVisible = false;
 	}
 }