Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/Core/src/Handlers/TimePicker/TimePickerHandler.iOS.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using Microsoft.Extensions.DependencyInjection;

namespace Microsoft.Maui.Handlers
{
Expand Down
1 change: 0 additions & 1 deletion src/Core/src/Platform/Android/MauiDatePicker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ protected override void OnFocusChanged(bool gainFocus, [GeneratedEnum] FocusSear
}
}


void Initialize()
{
DrawableCompat.Wrap(Background);
Expand Down
30 changes: 24 additions & 6 deletions src/Core/src/Platform/Android/MauiTimePicker.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
using System;
using Android.Content;
using Android.Runtime;
using Android.Text;
using Android.Util;
using Android.Views;
using Android.Widget;
using AndroidX.Core.Graphics.Drawable;
using static Android.Views.View;

namespace Microsoft.Maui
Expand All @@ -29,18 +31,34 @@ protected MauiTimePicker(IntPtr javaReference, JniHandleOwnership transfer) : ba
{
}

private void Initialize()
{
Focusable = true;
SetOnClickListener(this);
}

public Action? ShowPicker { get; set; }
public Action? HidePicker { get; set; }

public void OnClick(View? v)
{
ShowPicker?.Invoke();
}

protected override void OnFocusChanged(bool gainFocus, [GeneratedEnum] FocusSearchDirection direction, Android.Graphics.Rect? previouslyFocusedRect)
{
base.OnFocusChanged(gainFocus, direction, previouslyFocusedRect);

if (gainFocus)
{
if (Clickable)
CallOnClick();
}
}

void Initialize()
{
DrawableCompat.Wrap(Background);

Focusable = true;
Clickable = true;
InputType = InputTypes.Null;

SetOnClickListener(this);
}
}
}