PM-3349 PM-3350

Added (migrated) CustomNavigationHandler (which should partially fix the AvatarIcon in the NavBar in iOS) Added (migrated) CustomContentPageHandler (which should mostly place the AvatarIcon in the navBar in the correct place for iOS) Added Task.Delay (workaround) to allow the Avatar to load in iOS on the LoginPage Added workaround for iOS bug with the toolbar size (more info in comment in AvatarImageSource.cs) Went through the AccountViewCell MAUI-Migration comments. (and deleted/added more comments as needed) Migrated some Device calls to DeviceInfo and MainThread Added (migrated) CustomTabbedHandler (for managing the iOS TabBar)
2025-12-18 01:03:24 +00:00 · 2023-10-15 22:06:26 +01:00
parent 2e4da1b87d
commit ce9503fa0c
7 changed files with 274 additions and 24 deletions
--- a/src/iOS.Core/Handlers/CustomTabbedHandler.cs
+++ b/src/iOS.Core/Handlers/CustomTabbedHandler.cs
@@ -0,0 +1,90 @@
+using Bit.App.Abstractions;
+using Bit.App.Pages;
+using Bit.App.Utilities;
+using Bit.Core.Abstractions;
+using Bit.Core.Utilities;
+using Bit.iOS.Core.Utilities;
+using Microsoft.Maui.Controls.Handlers.Compatibility;
+using Microsoft.Maui.Controls.Platform;
+using UIKit;
+
+namespace Bit.iOS.Core.Handlers
+{
+    public partial class CustomTabbedHandler : TabbedRenderer
+    {
+        private IBroadcasterService _broadcasterService;
+        private UITabBarItem _previousSelectedItem;
+
+        public CustomTabbedHandler()
+        {
+            _broadcasterService = ServiceContainer.Resolve<IBroadcasterService>("broadcasterService");
+            _broadcasterService.Subscribe(nameof(CustomTabbedHandler), (message) =>
+            {
+                if (message.Command is ThemeManager.UPDATED_THEME_MESSAGE_KEY)
+                {
+                    MainThread.BeginInvokeOnMainThread(() =>
+                    {
+                        iOSCoreHelpers.AppearanceAdjustments();
+                        UpdateTabBarAppearance();
+                    });
+                }
+            });
+        }
+
+        protected override void OnElementChanged(VisualElementChangedEventArgs e)
+        {
+            base.OnElementChanged(e);
+            TabBar.Translucent = false;
+            TabBar.Opaque = true;
+            UpdateTabBarAppearance();
+        }
+
+        public override void ViewDidAppear(bool animated)
+        {
+            base.ViewDidAppear(animated);
+
+            if(TabBar?.Items != null)
+            {
+                if (SelectedIndex < TabBar.Items.Length)
+                {
+                    _previousSelectedItem = TabBar.Items[SelectedIndex];
+                }
+            }
+        }
+
+        public override void ItemSelected(UITabBar tabbar, UITabBarItem item)
+        {
+            if (_previousSelectedItem == item && Element is TabsPage tabsPage)
+            {
+                tabsPage.OnPageReselected();
+            }
+            _previousSelectedItem = item;
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                _broadcasterService.Unsubscribe(nameof(CustomTabbedHandler));
+            }
+            base.Dispose(disposing);
+        }
+
+        private void UpdateTabBarAppearance()
+        {
+            // https://developer.apple.com/forums/thread/682420
+            var deviceActionService = ServiceContainer.Resolve<IDeviceActionService>("deviceActionService");
+            if (deviceActionService.SystemMajorVersion() >= 15)
+            {
+                var appearance = new UITabBarAppearance();
+                appearance.ConfigureWithOpaqueBackground();
+                appearance.BackgroundColor = ThemeHelpers.TabBarBackgroundColor;
+                appearance.StackedLayoutAppearance.Normal.IconColor = ThemeHelpers.TabBarItemColor;
+                appearance.StackedLayoutAppearance.Normal.TitleTextAttributes =
+                    new UIStringAttributes { ForegroundColor = ThemeHelpers.TabBarItemColor };
+                TabBar.StandardAppearance = appearance;
+                TabBar.ScrollEdgeAppearance = TabBar.StandardAppearance;
+            }
+        }
+    }
+}