Merge branch 'develop' into guoldev/xctsample_backgroundcolor_issue

Author: TheCodeTraveler

.github/ISSUE_TEMPLATE/bug-report.md renamed to .github/ISSUE_TEMPLATE/bug_report_template.md

@@ -1,14 +1,31 @@
 ---
 name: Bug Report
-about: Create a report to help us improve
+about: Report a bug in the Xamarin Community Toolkit
 title: "[Bug] "
-labels: 'bug, s/unverified'
+labels: bug, unverified
 assignees: ''
 
 ---
 
+<!--
+Hello, and thanks for your interest in contributing to the Xamarin Community Toolkit! 
+
+Please describe the issue below, including detailed steps for reproduction. If we are unable to reproduce the bug we will be unable to fix the issue and may close this Issue.
+
+-->
+
 ### Description
 
+<!-- Please provide a detailed description of the issue -->
+
+### Stack Trace
+
+<!-- Please copy/paste the complete stack trace (if applicable) -->
+
+### Link to Reproduction Sample
+
+<!-- Please link to a GitHub Repo or GitHub Page -->
+
 ### Steps to Reproduce
 
 1. 
@@ -38,7 +55,3 @@ assignees: ''
 ### Reproduction imagery
 
 <!-- If it is a visual issue, please include imagery (GIF/Screenshots) showing the problem -->
-
-### Reproduction Link
-
-<!-- Please upload or provide a link to a reproduction case -->

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,8 @@
 blank_issues_enabled: false
 contact_links:
+  - name: Propose a New Feature for .NET MAUI Toolkit
+    url: https://github.com/communitytoolkit/maui/discussions/new
+    about: The Xamarin Community Toolkit is no longer accepting new feature proposals. Going forward, all new features will be added to the .NET MAUI Community Toolkit.
   - name: DotNetEvolution Discord Server
     url: https://aka.ms/dotnet-discord
     about: Please ask and answer questions here in the #xamarin-community-toolkit channel.

.github/ISSUE_TEMPLATE/feature-request.md

@@ -2,47 +2,24 @@
 Hey there friend! First of all, thank you so much for this PR!
 Some things that you should be aware of before opening this amazing PR❣
 
-1. Please check if you are targeting the correct branch, we work on two branches and you should target the:
-**main**: If you are fixing a bug and this bug doesn't change our public APIs
-**develop**: If you are fixing a bug that introduces an API change, for example when you are implementing a new feature.
-If you are not sure what branch target, ping one of the team directly or ask in the PR/issue and we will get back to you ASAP!
+1. Before doing a lot of work, please check if there's an open issue for this chang, If not, please open an issue first so we can discuss upfront.
 
-2. Before doing a lot of work, please check if there's an open issue for this chang, If not, please open an issue first so we can discuss upfront.
+2. Please ensure this is a PR for a Bug Fix. The Xamarin Community Toolkit is no longer accepting New Features. Going forward, all New Features are being add to the .NET MAUI Community Toolkit: https://github.com/communitytoolkit/maui
+
+3. Please ensure you are targeting the correct branch, `main`
 
 Also make sure you've read our Contribution guide here: https://github.com/xamarin/XamarinCommunityToolkit/blob/pj/update-pr-template/CONTRIBUTING.md
 -->
 
-### Description of Change ###
+### Description of Bug ###
 
-<!-- Describe your changes here. -->
+<!-- Describe your changes here that fix the bug. -->
 
-### Bugs Fixed ###
+### Issues Fixed ###
 <!-- Provide links to issues here. Ensure that a GitHub issue was created for your feature or bug fix before sending PR. -->
 
 - Fixes #
 
-### API Changes ###
-
-<!-- List all API changes here (or just put None), example:
-
-Added: 
- 
-- `string Class.Property { get; set; }`
-- `void Class.Method();`
-
-Changed:
-
- - `object Cell.OldPropertyName` => `object Cell.NewPropertyName`
- 
-If there is an entirely new API, then you can use a more verbose style:
-
-```csharp
-public static class NewClass {
-    public static int SomeProperty { get; set; }
-    public static void SomeMethod(string value);
-}
-``` -->
-
 ### Behavioral Changes ###
 
 <!-- Describe any non-bug related behavioral changes that may change how users app behaves when upgrading to this version of the codebase. -->

.github/ISSUE_TEMPLATE/new-api-spec.md

@@ -600,3 +600,79 @@ foreach (var child in children)
 ```
 
 - [ ] TextSwitcherRenderer.android.cs
+
+### 9. Add MauiColorExtensions Classes
+
+In .NET MAUI the `Color` object has been changed from a `struct` to an `object`. Because of that, we now need to be aware of passing `null` values on methods that have to do with colors. For instance, the `ToAndroid()` and `ToUIColor()` extension methods that take a .NET MAUI `Color` and convert it into a native platform color. There are multiple ways to solve this, but we chose to overload these extension methods with our own. This method checks if the incoming color is `null`, if it is, we replace the color with `Colors.Transparent` and pass it to the extension method and return its value.
+
+This way we didn't need to edit all the lines with this extension method individually.
+
+#### 9.1 Create `MauiColorExtensions.android.cs`
+The code looks like underneath.
+
+```cs
+using AColor = Android.Graphics.Color;
+
+namespace Xamarin.CommunityToolkit.MauiCompat
+{
+	public static partial class MauiColorExtensions
+	{	
+		public static AColor ToAndroid(this Microsoft.Maui.Graphics.Color self)
+		{
+			var colorToConvert = self;
+
+			if (colorToConvert == null)
+			{
+				colorToConvert = Microsoft.Maui.Graphics.Colors.Transparent;
+			}
+
+			return Microsoft.Maui.Controls.Compatibility.Platform.Android.ColorExtensions.ToAndroid(colorToConvert);
+		}
+	}
+}
+```
+
+#### 9.2 Create `MauiColorExtensions.ios.cs`
+The code looks like underneath.
+
+```cs
+using iColor = UIKit.UIColor;
+
+namespace Xamarin.CommunityToolkit.MauiCompat
+{
+	public static partial class MauiColorExtensions
+	{
+		public static iColor ToUIColor(this Microsoft.Maui.Graphics.Color self)
+		{
+			var colorToConvert = self;
+
+			if (colorToConvert == null)
+			{
+				colorToConvert = Microsoft.Maui.Graphics.Colors.Transparent;
+			}
+
+			return Microsoft.Maui.Controls.Compatibility.Platform.iOS.ColorExtensions.ToUIColor(colorToConvert);
+		}
+	}
+}
+
+```
+
+#### 9.3 Add `using` Statement to Files Which Reference Original Extension Methods
+Now in each file that references the `ToAndroid()` and `ToUIColor()` methods we need to add the `using Xamarin.CommunityToolkit.MauiCompat;` line to make sure that it uses _our_ extension method. There is one catch: you have to declare this using **inside** the namespace declaration so that it will prefer _our_ extension method over the .NET MAUI one. In example:
+
+```cs
+// ... Rest omitted for brevity
+using Microsoft.Maui.Controls.Compatibility;
+using Microsoft.Maui.Controls.Compatibility.Platform.Android;
+// ... Rest omitted for brevity
+
+[assembly: ExportRenderer(typeof(DrawingView), typeof(DrawingViewRenderer))]
+
+namespace Xamarin.CommunityToolkit.UI.Views
+{
+	// Make sure this using is here!
+	using Xamarin.CommunityToolkit.MauiCompat;
+
+	public class DrawingViewRenderer : ViewRenderer<DrawingView, View> { }
+```

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<pages:BasePage xmlns="http://xamarin.com/schemas/2014/forms"
+                xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                xmlns:pages="clr-namespace:Xamarin.CommunityToolkit.Sample.Pages"
+                xmlns:vm="clr-namespace:Xamarin.CommunityToolkit.Sample.ViewModels.Animations"
+                x:Class="Xamarin.CommunityToolkit.Sample.Pages.Animations.AnimationPage"
+                x:DataType="{x:Null}">
+    <pages:BasePage.BindingContext>
+        <vm:AnimationViewModel />
+    </pages:BasePage.BindingContext>
+
+    <Grid RowDefinitions="*,*">
+        <Label Text="Select an animation below and then tap start."
+               HorizontalTextAlignment="Center"
+               x:Name="Lab"/>
+
+        <StackLayout Grid.Row="1">
+            <Picker ItemsSource="{Binding Animations}"
+                    SelectedItem="{Binding SelectedAnimation}"
+                    ItemDisplayBinding="{Binding Name}"/>
+
+            <Button Text="Start"
+                    Command="{Binding StartAnimationCommand}"
+                    CommandParameter="{x:Reference Name=Lab}"/>
+
+            <Button Text="Stop"
+                    Command="{Binding StopAnimationCommand}"/>
+        </StackLayout>
+        
+
+    </Grid>
+</pages:BasePage>

MauiCompatSteps.md

@@ -0,0 +1,10 @@
+namespace Xamarin.CommunityToolkit.Sample.Pages.Animations
+{
+	public partial class AnimationPage : BasePage
+	{
+		public AnimationPage()
+		{
+			InitializeComponent();
+		}
+	}
+}

samples/XCT.Sample/Pages/Animations/AnimationPage.xaml

@@ -16,6 +16,22 @@
             <Label Text="This sample demonstrates how to use ViewTappedAnimationBehaviour applying it in different UI elements."
                    Padding="10,10,10,50"/>
 
+            <Button Text="Tada"
+                    FontSize="40"
+                    FontAttributes="Bold"
+                    TextColor="#2D1767"
+                    BackgroundColor="#F8E3C8">
+                 <Button.Behaviors>
+                      <xct:AnimationBehavior EventName="Clicked">
+                            <xct:AnimationBehavior.AnimationType>
+                                <xct:TadaAnimation Easing="{x:Static Easing.Linear}"
+                                                   IsRepeated="True"
+                                                   Duration="1000"/>
+                            </xct:AnimationBehavior.AnimationType>
+                        </xct:AnimationBehavior>
+                </Button.Behaviors>
+            </Button>
+
             <Button Text="Testing Fade Animation"
                    TextColor="HotPink">
                  <Button.Behaviors>

samples/XCT.Sample/Pages/Animations/AnimationPage.xaml.cs

@@ -3,5 +3,5 @@
 	public partial class AnimationBehaviorPage : BasePage
 	{
 		public AnimationBehaviorPage() => InitializeComponent();
-	}
+    }
 }