fixed branch

Author: haavamoa

src/library/DIPS.Mobile.UI/API/Builder/AppHostBuilderExtensions.cs

@@ -36,6 +36,7 @@
 using SearchBar = DIPS.Mobile.UI.Components.Searching.SearchBar;
 using SearchBarHandler = DIPS.Mobile.UI.Components.Searching.SearchBarHandler;
 using ShellRenderer = DIPS.Mobile.UI.Components.Shell.ShellRenderer;
+using Toolbar = DIPS.Mobile.UI.Components.Toolbar.Toolbar;
 
 namespace DIPS.Mobile.UI.API.Builder;
 

src/library/DIPS.Mobile.UI/Components/Shell/Android/ShellRenderer.cs

@@ -120,8 +120,8 @@ internal class CustomToolbarAppearanceTracker : ShellToolbarAppearanceTracker
 {
     private ShellAppearance? m_appearance;
 
-    public Toolbar Toolbar { get; set; }
-    public override void SetAppearance(Toolbar toolbar, IShellToolbarTracker toolbarTracker, ShellAppearance appearance)
+    public AndroidX.AppCompat.Widget.Toolbar Toolbar { get; set; }
+    public override void SetAppearance(AndroidX.AppCompat.Widget.Toolbar toolbar, IShellToolbarTracker toolbarTracker, ShellAppearance appearance)
     {
         base.SetAppearance(toolbar, toolbarTracker, appearance);
 
@@ -180,12 +180,12 @@ protected override void Dispose(bool disposing)
     private class ToolbarMenuItemClickListener : Object, IMenuItemOnMenuItemClickListener, Application.IActivityLifecycleCallbacks, PopupMenu.IOnDismissListener, PopupMenu.IOnMenuItemClickListener
     {
         private readonly ContextMenu m_contextMenu;
-        private readonly Toolbar m_materialToolbar;
+        private readonly AndroidX.AppCompat.Widget.Toolbar m_materialToolbar;
         private Dictionary<IContextMenuItem, IMenuItem> m_menuItems;
         private PopupMenu? m_popupMenu;
         private bool m_isShowing;
 
-        public ToolbarMenuItemClickListener(ContextMenu contextMenu, Toolbar materialToolbar)
+        public ToolbarMenuItemClickListener(ContextMenu contextMenu, AndroidX.AppCompat.Widget.Toolbar materialToolbar)
         {
             m_contextMenu = contextMenu;
             m_materialToolbar = materialToolbar;

src/library/DIPS.Mobile.UI/Components/Toolbar/Android/ToolbarHandler.cs

@@ -5,6 +5,8 @@
 using Google.Android.Material.Button;
 using Microsoft.Maui.Handlers;
 using Microsoft.Maui.Platform;
+using Orientation = Android.Widget.Orientation;
+using View = Android.Views.View;
 
 namespace DIPS.Mobile.UI.Components.Toolbar;
 
@@ -33,7 +35,7 @@ protected override LinearLayout CreatePlatformView()
         m_buttonsLayout = new LinearLayout(Context)
         {
             Orientation = Orientation.Horizontal,
-            Gravity = GravityFlags.CenterVertical,
+            // Gravity = GravityFlags.CenterVertical, //Didnt work
         };
         outer.AddView(m_buttonsLayout, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MatchParent, ViewGroup.LayoutParams.MatchParent));
 

src/library/DIPS.Mobile.UI/Components/Toolbar/iOS/ToolbarHandler.cs

@@ -47,7 +47,7 @@ private static UIBarButtonItem CreateBarButtonItem(ToolbarButton toolbarButton)
         UIImage? icon = null;
         if (DUI.TryGetUIImageFromImageSource(toolbarButton.Icon, out var uiImage))
         {
-            icon = uiImage?.WithRenderingMode(UIImageRenderingMode.AlwaysTemplate);
+            icon = uiImage?.ImageWithRenderingMode(UIImageRenderingMode.AlwaysTemplate);
         }
 
         var item = new UIBarButtonItem(icon, UIBarButtonItemStyle.Plain, (_, _) =>