Merge branch 'master' of https://github.com/beto-rodriguez/FluidNav

Author: beto-rodriguez

.gitignore

@@ -360,4 +360,5 @@ MigrationBackup/
 .ionide/
 
 # Fody - auto-generated XML schema
-FodyWeavers.xsd
+FodyWeavers.xsd
+.DS_Store

samples/Views/Playlist.cs

@@ -43,7 +43,7 @@ public override View GetView() =>
 
             _ = scrollView.ScrollToAsync(0, 0, false);
 
-            if (DeviceInfo.Platform == DevicePlatform.WinUI) return;
+            if (DeviceInfo.Idiom == DeviceIdiom.Desktop) return;
             StatusBar.SetColor(user.BackgroundColor);
             StatusBar.SetStyle(StatusBarStyle.LightContent);
         });

samples/Views/PlaylistCollection.cs

@@ -28,14 +28,16 @@ public override View GetView() =>
         }
         .ItemsSource(dal.Users)
         .ItemTemplate(
+            // not working properly on mac
+            // https://github.com/dotnet/maui/issues/19329
             TransitionView.Build<PlaylistCollection, Playlist, PlaylistTransitionView>(item =>
             {
                 var user = (PlaylistVM)item;    // <- the item source
                 return $"id={user.Id}";         // <- the route params
             }))
         .OnEntering(this, v =>
         {
-            if (DeviceInfo.Platform == DevicePlatform.WinUI) return;
+            if (DeviceInfo.Idiom == DeviceIdiom.Desktop) return;
             StatusBar.SetColor(Colors.White);
             StatusBar.SetStyle(StatusBarStyle.DarkContent);
         });

samples/Views/PlaylistTransitionView.cs

@@ -105,7 +105,6 @@ public PlaylistTransitionView()
         .Add(Button.TextColorProperty, Colors.Black)
         .Add(Button.FontSizeProperty, 18)
         .Add(Button.FontFamilyProperty, "Icons")
-        .Add(Button.CornerRadiusProperty, 100)
         .Add(Button.PaddingProperty, new Thickness(0));
 
     private void InitializeContent()
@@ -304,5 +303,11 @@ private void InitializeContent()
         .Bind(
             BackgroundColorProperty,
             getter: (PlaylistVM vm) => vm.BackgroundColor);
+
+#if MACCATALYST || IOS
+        // BUG, the Tapped is not working on MacCatalyst
+        _backButton.Clicked += (s, e) => FlowNavigation.Current.GoBack();
+#endif
+
     }
 }

src/FlowExtensions.cs

@@ -73,6 +73,9 @@ public static T OnTapped<T>(this T view, Action<Point> action) where T : Content
 
         tapGesture.Tapped += (s, e) =>
         {
+            // not working properly on mac
+            // https://github.com/dotnet/maui/issues/19329
+
             var p = e.GetPosition(FlowNavigation.Current.View.Presenter);
             var p0 = e.GetPosition(view.Content);
 

src/TransitionView.cs

@@ -46,7 +46,7 @@ public static DataTemplate Build<TFromView, TToView, TTransitionView>(
         {
             var transitionView = new TTransitionView();
 
-            _ = transitionView
+            _ = transitionView.Content
                 .OnTapped(p =>
                 {
                     var tv = FlowNavigation.Current.GetView<TToView>().TransitionView;
@@ -61,10 +61,9 @@ public static DataTemplate Build<TFromView, TToView, TTransitionView>(
                     }
 
                     _ = FlowNavigation.Current.GoTo<TToView>(routeParamsBuilder?.Invoke(transitionView.BindingContext));
-                })
-                .Complete(typeof(TFromView));
+                });
 
-            transitionView.OnBreakpointChanged();
+            transitionView.Complete(typeof(TFromView)).OnBreakpointChanged();
 
             return transitionView;
         });