Optimize dropdown android implementation

enisn · Jul 13, 2024 · 4410758 · 4410758
1 parent ac4628c
commit 4410758
Showing 1 changed file with 31 additions and 3 deletions.
diff --git a/src/UraniumUI/Handlers/DropdownHandler.Android.cs b/src/UraniumUI/Handlers/DropdownHandler.Android.cs
@@ -1,6 +1,8 @@
 #if ANDROID
 using Android.Views;
+using Android.Widget;
 using Google.Android.Material.Button;
+using Java.Interop;
 using Microsoft.Maui.Handlers;
 using UraniumUI.Controls;
 
@@ -16,27 +18,53 @@ protected override MaterialButton CreatePlatformView()
     {
         var button = base.CreatePlatformView();
         button.Text = VirtualViewDropdown?.SelectedItem?.ToString();
-        button.Click += Button_Click;
         return button;
     }
 
     private void Button_Click(object sender, EventArgs e)
     {
         var activity = Microsoft.Maui.ApplicationModel.Platform.CurrentActivity;
 
-        var popupMenu = new Android.Widget.PopupMenu(activity, PlatformView, GravityFlags.Top);
+        var popupMenu = new Android.Widget.PopupMenu(activity, PlatformView, GravityFlags.Center);
 
         if (VirtualViewDropdown.ItemsSource is not null)
         {
             foreach (var item in VirtualViewDropdown.ItemsSource)
             {
-                popupMenu.Menu.Add(new Java.Lang.String(item.ToString()));
+                var menuItem = popupMenu.Menu.Add(new Java.Lang.String(item.ToString()));
+
+                menuItem.SetOnMenuItemClickListener(new MenuItemOnMenuItemClickListener((menuitem) =>
+                {
+                    VirtualViewDropdown.SelectedItem = item;
+                }));
             }
         }
 
         popupMenu.Show();
     }
 
+    class MenuItemOnMenuItemClickListener : Java.Lang.Object, IMenuItemOnMenuItemClickListener
+    {
+        private Action<IMenuItem> _onMenuItemClick;
+
+        public MenuItemOnMenuItemClickListener(Action<IMenuItem> onMenuItemClick)
+        {
+            _onMenuItemClick = onMenuItemClick;
+        }
+
+        public bool OnMenuItemClick(IMenuItem item)
+        {
+            _onMenuItemClick?.Invoke(item);
+            return true;
+        }
+    }
+
+    protected override void ConnectHandler(MaterialButton platformView)
+    {
+        base.ConnectHandler(platformView);
+        platformView.Click += Button_Click;
+    }
+
     protected override void DisconnectHandler(MaterialButton platformView)
     {
         base.DisconnectHandler(platformView);