diff --git a/MPowerKit.VirtualizeListView/Android/FixedRefreshViewRenderer.cs b/MPowerKit.VirtualizeListView/Android/FixedRefreshViewHandler.cs similarity index 65% rename from MPowerKit.VirtualizeListView/Android/FixedRefreshViewRenderer.cs rename to MPowerKit.VirtualizeListView/Android/FixedRefreshViewHandler.cs index 63ede6d..61e24c1 100644 --- a/MPowerKit.VirtualizeListView/Android/FixedRefreshViewRenderer.cs +++ b/MPowerKit.VirtualizeListView/Android/FixedRefreshViewHandler.cs @@ -5,33 +5,33 @@ namespace MPowerKit.VirtualizeListView; -public class FixedRefreshViewRenderer : ViewHandler +public class FixedRefreshViewHandler : ViewHandler { - public static IPropertyMapper RefreshViewRendererMapper = new PropertyMapper(ViewMapper) + public static IPropertyMapper FixedRefreshViewHandlerMapper = new PropertyMapper(ViewMapper) { [FixedRefreshView.IsRefreshingProperty.PropertyName] = MapIsRefreshing, [FixedRefreshView.ContentProperty.PropertyName] = MapContent, [FixedRefreshView.RefreshColorProperty.PropertyName] = MapRefreshColor, [FixedRefreshView.BackgroundProperty.PropertyName] = MapBackground, - [FixedRefreshView.IsEnabledProperty.PropertyName] = (r, v) => { }, + [FixedRefreshView.IsEnabledProperty.PropertyName] = (h, v) => { }, }; - public static CommandMapper RefreshViewRendererCommandMapper = new(ViewCommandMapper) + public static CommandMapper FixedRefreshViewHandlerCommandMapper = new(ViewCommandMapper) { }; - public FixedRefreshViewRenderer() : base(RefreshViewRendererMapper, RefreshViewRendererCommandMapper) + public FixedRefreshViewHandler() : base(FixedRefreshViewHandlerMapper, FixedRefreshViewHandlerCommandMapper) { } - public FixedRefreshViewRenderer(IPropertyMapper? mapper) - : base(mapper ?? RefreshViewRendererMapper, RefreshViewRendererCommandMapper) + public FixedRefreshViewHandler(IPropertyMapper? mapper) + : base(mapper ?? FixedRefreshViewHandlerMapper, FixedRefreshViewHandlerCommandMapper) { } - public FixedRefreshViewRenderer(IPropertyMapper? mapper, CommandMapper? commandMapper) - : base(mapper ?? RefreshViewRendererMapper, commandMapper ?? RefreshViewRendererCommandMapper) + public FixedRefreshViewHandler(IPropertyMapper? mapper, CommandMapper? commandMapper) + : base(mapper ?? FixedRefreshViewHandlerMapper, commandMapper ?? FixedRefreshViewHandlerCommandMapper) { } @@ -64,12 +64,12 @@ protected virtual void OnSwipeRefresh(object? sender, EventArgs e) else PlatformView.Refreshing = false; } - static void UpdateContent(FixedRefreshViewRenderer handler) + static void UpdateContent(FixedRefreshViewHandler handler) { handler.PlatformView.UpdateContent(handler.VirtualView.Content, handler.MauiContext); } - static void UpdateRefreshColor(FixedRefreshViewRenderer handler) + static void UpdateRefreshColor(FixedRefreshViewHandler handler) { var color = handler.VirtualView.RefreshColor?.ToInt(); if (color is null) return; @@ -77,7 +77,7 @@ static void UpdateRefreshColor(FixedRefreshViewRenderer handler) handler.PlatformView.SetColorSchemeColors(color.Value); } - static void UpdateIsRefreshing(FixedRefreshViewRenderer handler) + static void UpdateIsRefreshing(FixedRefreshViewHandler handler) { var virtualView = handler.VirtualView; var platformView = handler.PlatformView; @@ -89,7 +89,7 @@ static void UpdateIsRefreshing(FixedRefreshViewRenderer handler) platformView.Refreshing = refreshing; } - static void UpdateBackground(FixedRefreshViewRenderer handler) + static void UpdateBackground(FixedRefreshViewHandler handler) { var color = (handler.VirtualView as IView)?.Background?.ToColor()?.ToInt(); if (color is null) return; @@ -97,31 +97,31 @@ static void UpdateBackground(FixedRefreshViewRenderer handler) handler.PlatformView.SetProgressBackgroundColorSchemeColor(color.Value); } - public static void MapBackground(FixedRefreshViewRenderer handler, FixedRefreshView refreshView) + public static void MapBackground(FixedRefreshViewHandler handler, FixedRefreshView refreshView) { UpdateBackground(handler); } - public static void MapIsRefreshing(FixedRefreshViewRenderer handler, FixedRefreshView refreshView) + public static void MapIsRefreshing(FixedRefreshViewHandler handler, FixedRefreshView refreshView) { UpdateIsRefreshing(handler); } - public static void MapContent(FixedRefreshViewRenderer handler, FixedRefreshView refreshView) + public static void MapContent(FixedRefreshViewHandler handler, FixedRefreshView refreshView) { UpdateContent(handler); } - public static void MapRefreshColor(FixedRefreshViewRenderer handler, FixedRefreshView refreshView) + public static void MapRefreshColor(FixedRefreshViewHandler handler, FixedRefreshView refreshView) { UpdateRefreshColor(handler); } public class RefreshLayout : MauiSwipeRefreshLayout { - private readonly FixedRefreshViewRenderer _renderer; + private readonly FixedRefreshViewHandler _renderer; - public RefreshLayout(Context context, FixedRefreshViewRenderer renderer) : base(context) + public RefreshLayout(Context context, FixedRefreshViewHandler renderer) : base(context) { _renderer = renderer; } diff --git a/MPowerKit.VirtualizeListView/BuilderExtensions.cs b/MPowerKit.VirtualizeListView/BuilderExtensions.cs index b146684..829d80a 100644 --- a/MPowerKit.VirtualizeListView/BuilderExtensions.cs +++ b/MPowerKit.VirtualizeListView/BuilderExtensions.cs @@ -11,7 +11,7 @@ public static MauiAppBuilder UseMPowerKitListView(this MauiAppBuilder builder) #endif #if ANDROID || MACIOS - handlers.AddHandler(); + handlers.AddHandler(); #endif }); diff --git a/MPowerKit.VirtualizeListView/MaciOS/FixedRefreshViewRenderer.cs b/MPowerKit.VirtualizeListView/MaciOS/FixedRefreshViewHandler.cs similarity index 87% rename from MPowerKit.VirtualizeListView/MaciOS/FixedRefreshViewRenderer.cs rename to MPowerKit.VirtualizeListView/MaciOS/FixedRefreshViewHandler.cs index 883cfb3..ada8650 100644 --- a/MPowerKit.VirtualizeListView/MaciOS/FixedRefreshViewRenderer.cs +++ b/MPowerKit.VirtualizeListView/MaciOS/FixedRefreshViewHandler.cs @@ -9,34 +9,34 @@ namespace MPowerKit.VirtualizeListView; -public class FixedRefreshViewRenderer : ViewHandler +public class FixedRefreshViewHandler : ViewHandler { - public static IPropertyMapper RefreshViewRendererMapper = new PropertyMapper(ViewMapper) + public static IPropertyMapper FixedRefreshViewHandlerMapper = new PropertyMapper(ViewMapper) { [FixedRefreshView.IsRefreshingProperty.PropertyName] = MapIsRefreshing, [FixedRefreshView.ContentProperty.PropertyName] = MapContent, [FixedRefreshView.RefreshColorProperty.PropertyName] = MapRefreshColor, - [FixedRefreshView.BackgroundProperty.PropertyName] = MapBackground, + [FixedRefreshView.BackgroundProperty.PropertyName] = (h, v) => { }, [FixedRefreshView.IsPullToRefreshEnabledProperty.PropertyName] = MapIsPullToRefreshEnabled, - [FixedRefreshView.IsEnabledProperty.PropertyName] = (r, v) => { }, + [FixedRefreshView.IsEnabledProperty.PropertyName] = (h, v) => { }, }; - public static CommandMapper RefreshViewRendererCommandMapper = new(ViewCommandMapper) + public static CommandMapper FixedRefreshViewHandlerCommandMapper = new(ViewCommandMapper) { }; - public FixedRefreshViewRenderer() : base(RefreshViewRendererMapper, RefreshViewRendererCommandMapper) + public FixedRefreshViewHandler() : base(FixedRefreshViewHandlerMapper, FixedRefreshViewHandlerCommandMapper) { } - public FixedRefreshViewRenderer(IPropertyMapper? mapper) - : base(mapper ?? RefreshViewRendererMapper, RefreshViewRendererCommandMapper) + public FixedRefreshViewHandler(IPropertyMapper? mapper) + : base(mapper ?? FixedRefreshViewHandlerMapper, FixedRefreshViewHandlerCommandMapper) { } - public FixedRefreshViewRenderer(IPropertyMapper? mapper, CommandMapper? commandMapper) - : base(mapper ?? RefreshViewRendererMapper, commandMapper ?? RefreshViewRendererCommandMapper) + public FixedRefreshViewHandler(IPropertyMapper? mapper, CommandMapper? commandMapper) + : base(mapper ?? FixedRefreshViewHandlerMapper, commandMapper ?? FixedRefreshViewHandlerCommandMapper) { } @@ -75,32 +75,32 @@ protected virtual void OnRefresh(object? sender, EventArgs e) else PlatformView.IsRefreshing = false; } - public static void MapBackground(FixedRefreshViewRenderer handler, FixedRefreshView view) + public static void MapBackground(FixedRefreshViewHandler handler, FixedRefreshView view) { handler.PlatformView.RefreshControl.UpdateBackground(view); } - public static void MapIsRefreshing(FixedRefreshViewRenderer handler, FixedRefreshView refreshView) + public static void MapIsRefreshing(FixedRefreshViewHandler handler, FixedRefreshView refreshView) { UpdateIsRefreshing(handler); } - public static void MapContent(FixedRefreshViewRenderer handler, FixedRefreshView refreshView) + public static void MapContent(FixedRefreshViewHandler handler, FixedRefreshView refreshView) { UpdateContent(handler); } - public static void MapRefreshColor(FixedRefreshViewRenderer handler, FixedRefreshView refreshView) + public static void MapRefreshColor(FixedRefreshViewHandler handler, FixedRefreshView refreshView) { UpdateRefreshColor(handler); } - public static void MapIsPullToRefreshEnabled(FixedRefreshViewRenderer handler, FixedRefreshView refreshView) + public static void MapIsPullToRefreshEnabled(FixedRefreshViewHandler handler, FixedRefreshView refreshView) { handler.PlatformView?.UpdateIsEnabled(refreshView.IsPullToRefreshEnabled); } - static void UpdateIsRefreshing(FixedRefreshViewRenderer handler) + static void UpdateIsRefreshing(FixedRefreshViewHandler handler) { var virtualView = handler.VirtualView; var platformView = handler.PlatformView; @@ -112,12 +112,12 @@ static void UpdateIsRefreshing(FixedRefreshViewRenderer handler) platformView.IsRefreshingAnimated = refreshing; } - static void UpdateContent(FixedRefreshViewRenderer handler) + static void UpdateContent(FixedRefreshViewHandler handler) { handler.PlatformView.UpdateContent(handler.VirtualView.Content, handler.MauiContext); } - static void UpdateRefreshColor(FixedRefreshViewRenderer handler) + static void UpdateRefreshColor(FixedRefreshViewHandler handler) { var color = handler.VirtualView?.RefreshColor?.ToPlatform(); diff --git a/MPowerKit.VirtualizeListView/VirtualizeListView.cs b/MPowerKit.VirtualizeListView/VirtualizeListView.cs index a352ccc..7293e0f 100644 --- a/MPowerKit.VirtualizeListView/VirtualizeListView.cs +++ b/MPowerKit.VirtualizeListView/VirtualizeListView.cs @@ -320,6 +320,7 @@ public virtual bool IsOrientation(ScrollOrientation orientation) || (Orientation == ScrollOrientation.Neither && PrevScrollOrientation == orientation); } +#if MACIOS protected override Size MeasureOverride(double widthConstraint, double heightConstraint) { var size = base.MeasureOverride(widthConstraint, heightConstraint); @@ -345,6 +346,7 @@ protected override Size MeasureOverride(double widthConstraint, double heightCon return new Size(Math.Min(desiredWidth, widthConstraint), Math.Min(desiredHeight, heightConstraint)); } +#endif #region Adapter public DataAdapter Adapter