[WiP] Touch effect

CONTRIBUTING.md

@@ -36,13 +36,16 @@ Please see our [Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
 
 As should be clear by now: we assume everyone tries to do their best, everyone should be treated with respect and equally.
 
-In the unfortunate event that doesn't happen, please feel free to report it to any of the team members or reach out to [Gerald](maillo:gerald.versluis@microsoft.com) directly.
+In the unfortunate event that doesn't happen, please feel free to report it to any of the team members or reach out to [Gerald](mailto:gerald.versluis@microsoft.com) directly.
 
 We will take appropriate actions and measures if necessary.
 
 ## Prerequisites
 
-You will need to complete a Contribution License Agreement before any pull request can be accepted. Complete the CLA at https://cla.dotnetfoundation.org/. This will also be triggered whenever you open a PR and the link should guide you through it.
+1. Install latest stable [.NET SDK](https://dotnet.microsoft.com/en-us/download)
+1. Install .NET MAUI workloads (we recommend using Visual Studio installer)
+
+> You will need to complete a Contribution License Agreement before any pull request can be accepted. Complete the CLA at https://cla.dotnetfoundation.org/. This will also be triggered whenever you open a PR and the link should guide you through it.
 
 ## Reporting a bug
 

Directory.Build.props

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project>
  <PropertyGroup>
+ <NetVersion>net7.0</NetVersion>
  <!-- Fixes https://github.com/dotnet/maui/pull/12114 -->
  <PublishReadyToRun>false</PublishReadyToRun>
  <LangVersion>latest</LangVersion>
@@ -26,8 +27,11 @@
  CS1592: Badly formed XML in included comments file 
  CS1598: XML parser could not be loaded. The XML documentation file will not be generated. 
  CS1658: Identifier expected; 'true' is a keyword 
- CS1734: XML comment has a paramref tag, but there is no parameter by that name -->
- <WarningsAsErrors>nullable,CS0419,CS1570,CS1571,CS1572,CS1573,CS1574,CS1580,CS1581,CS1584,CS1589,CS1590,CS1592,CS1598,CS1658,CS1734</WarningsAsErrors>
+ CS1734: XML comment has a paramref tag, but there is no parameter by that name 
+ MA0001: Don't define public events in NSObject subclasses
+ MA0002: Don't declare members in NSObject subclasses unless they are WeakReference, WeakReference<T>, or Value types
+ MA0003: Don't subscribe to events inside NSObject subclasses unless it's your event (via this.MyEvent) or inherited from a base type, or the method is static -->
+ <WarningsAsErrors>nullable,CS0419,CS1570,CS1571,CS1572,CS1573,CS1574,CS1580,CS1581,CS1584,CS1589,CS1590,CS1592,CS1598,CS1658,CS1734,MA0001,MA0002,MA0003</WarningsAsErrors>
  </PropertyGroup>
 
  <ItemGroup>

Directory.Build.targets

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Project>
- <ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.iOS')) != true AND $(TargetFramework.StartsWith('net7.0-ios')) != true">
+ <ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.iOS')) != true AND $(TargetFramework.StartsWith('$(NetVersion)-ios')) != true">
  <Compile Remove="**\**\*.ios.cs" />
  <None Include="**\**\*.ios.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
  <Compile Remove="**\ios\**\*.cs" />
  <None Include="**\ios\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
  </ItemGroup>
- <ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.Mac')) != true AND $(TargetFramework.StartsWith('net7.0-maccatalyst')) != true">
+ <ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.Mac')) != true AND $(TargetFramework.StartsWith('$(NetVersion)-maccatalyst')) != true">
  <Compile Remove="**\*.macos.cs" />
  <None Include="**\*.macos.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
  <Compile Remove="**\macos\**\*.cs" />
  <None Include="**\macos\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
  </ItemGroup>
- <ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.Mac')) != true AND $(TargetFramework.StartsWith('Xamarin.iOS')) != true AND $(TargetFramework.StartsWith('net7.0-ios')) != true AND $(TargetFramework.StartsWith('net7.0-maccatalyst')) != true">
+ <ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin.Mac')) != true AND $(TargetFramework.StartsWith('Xamarin.iOS')) != true AND $(TargetFramework.StartsWith('$(NetVersion)-ios')) != true AND $(TargetFramework.StartsWith('$(NetVersion)-maccatalyst')) != true">
  <Compile Remove="**\*.macios.cs" />
  <None Include="**\*.macios.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
  <Compile Remove="**\macios\**\*.cs" />
  <None Include="**\macios\**\*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
  </ItemGroup>
- <ItemGroup Condition="$(TargetFramework.StartsWith('MonoAndroid')) != true AND $(TargetFramework.StartsWith('net7.0-android')) != true ">
+ <ItemGroup Condition="$(TargetFramework.StartsWith('MonoAndroid')) != true AND $(TargetFramework.StartsWith('$(NetVersion)-android')) != true ">
  <Compile Remove="**\**\*.android.cs" />
  <None Include="**\**\*.android.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
  <Compile Remove="**\android\**\*.cs" />

global.json

@@ -1,7 +1,7 @@
 {
  "sdk": {
  "version": "7.0.200",
- "rollForward": "latestMajor",
+ "rollForward": "latestFeature",
  "allowPrerelease": false
  }
 }

samples/CommunityToolkit.Maui.Sample/App.xaml.cs

@@ -8,6 +8,6 @@ public App()
 {
 InitializeComponent();
 
-MainPage = new AppShell();
+MainPage = new TouchPageSample();
 }
 }

samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj

@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFrameworks>net7.0-ios;net7.0-android;net7.0-maccatalyst</TargetFrameworks>
- <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
- <TargetFrameworks Condition="'$(IncludeTizenTargetFrameworks)' == 'true'">$(TargetFrameworks);net7.0-tizen</TargetFrameworks>
+ <TargetFrameworks>$(NetVersion)-ios;$(NetVersion)-android;$(NetVersion)-maccatalyst</TargetFrameworks>
+ <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);$(NetVersion)-windows10.0.19041.0</TargetFrameworks>
+ <TargetFrameworks Condition="'$(IncludeTizenTargetFrameworks)' == 'true'">$(TargetFrameworks);$(NetVersion)-tizen</TargetFrameworks>
  <OutputType>Exe</OutputType>
  <UseMaui>true</UseMaui>
  <SingleProject>true</SingleProject>
@@ -42,14 +42,15 @@
 
  <!-- Images -->
  <MauiImage Include="Resources\Images\*" />
+ <MauiImage Update="Resources\Images\splash.svg" BaseSize="128,128" Color="#512BD4" Resize="false" />
 
  <!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
  <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
 
  <EmbeddedResource Include="Resources\Embedded\*" />
 
  <!-- Custom Fonts -->
-<MauiFont Include="Resources\Fonts\*" />
+ <MauiFont Include="Resources\Fonts\*" />
 
  <PackageReference Include="CommunityToolkit.Maui.Markup" Version="3.2.0" />
  <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
@@ -83,4 +84,4 @@
  <RuntimeIdentifiers>maccatalyst-arm64;maccatalyst-x64</RuntimeIdentifiers>
  </PropertyGroup>
 
-</Project>
+</Project>

samples/CommunityToolkit.Maui.Sample/Pages/Essentials/SpeechToTextPage.xaml

@@ -30,7 +30,7 @@
  <Picker
  Grid.Row="2"
  ItemsSource="{Binding Locales}"
- SelectedItem="{Binding Locale}"
+ SelectedItem="{Binding CurrentLocale}"
  ItemDisplayBinding="{Binding ., Converter={StaticResource PickerLocaleDisplayConverter}}"
  Margin="0,0,0,20">
  </Picker>

samples/CommunityToolkit.Maui.Sample/Pages/Views/AvatarView/AvatarViewRatingPage.xaml

@@ -53,8 +53,6 @@
  </Setter>
  <Setter Property="FontSize" Value="Default" />
  <Setter Property="TextColor" Value="Silver" />
- <Setter Property="WidthRequest" Value="48" />
- <Setter Property="HeightRequest" Value="48" />
  </Style>
  </ResourceDictionary>
  </VerticalStackLayout.Resources>
@@ -66,39 +64,39 @@
  Grid.Column="0"
  HeightRequest="48"
  SemanticProperties.Description="Sample AvatarView idea using a polyline stroke shape to override the corder radius to draw a star."
- StrokeShape="Polyline 70,16 76,32 94,32 80,44 84,60 70,50 55,60 60,42 46,32 64,32"
+ StrokeShape="Polyline 24,0 29,16 48,18 34,30 38,48 24,37 10,48 14,30 0,18 19,16"
  Style="{StaticResource Rating}"
  Text="1"
  WidthRequest="48" />
  <mct:AvatarView
  Grid.Column="1"
  HeightRequest="48"
  SemanticProperties.Description="Sample AvatarView idea using a polyline stroke shape to override the corder radius to draw a star."
- StrokeShape="Polyline 70,16 76,32 94,32 80,44 84,60 70,50 55,60 60,42 46,32 64,32"
+ StrokeShape="Polyline 24,0 29,16 48,18 34,30 38,48 24,37 10,48 14,30 0,18 19,16"
  Style="{StaticResource Rating}"
  Text="2"
  WidthRequest="48" />
  <mct:AvatarView
  Grid.Column="2"
  HeightRequest="48"
  SemanticProperties.Description="Sample AvatarView idea using a polyline stroke shape to override the corder radius to draw a star."
- StrokeShape="Polyline 70,16 76,32 94,32 80,44 84,60 70,50 55,60 60,42 46,32 64,32"
+ StrokeShape="Polyline 24,0 29,16 48,18 34,30 38,48 24,37 10,48 14,30 0,18 19,16"
  Style="{StaticResource Rating}"
  Text="3"
  WidthRequest="48" />
  <mct:AvatarView
  Grid.Column="3"
  HeightRequest="48"
  SemanticProperties.Description="Sample AvatarView idea using a polyline stroke shape to override the corder radius to draw a star."
- StrokeShape="Polyline 70,16 76,32 94,32 80,44 84,60 70,50 55,60 60,42 46,32 64,32"
+ StrokeShape="Polyline 24,0 29,16 48,18 34,30 38,48 24,37 10,48 14,30 0,18 19,16"
  Style="{StaticResource Rating}"
  Text="4"
  WidthRequest="48" />
  <mct:AvatarView
  Grid.Column="4"
  HeightRequest="48"
  SemanticProperties.Description="Sample AvatarView idea using a polyline stroke shape to override the corder radius to draw a star, cliped by parent size."
- StrokeShape="Polyline 70,16 76,32 94,32 80,44 84,60 70,50 55,60 60,42 46,32 64,32"
+ StrokeShape="Polyline 24,0 29,16 48,18 34,30 38,48 24,37 10,48 14,30 0,18 19,16"
  Style="{StaticResource Rating}"
  Text="5"
  WidthRequest="48">
@@ -112,7 +110,7 @@
  HeightRequest="48"
  ImageSource="avatar_icon.png"
  SemanticProperties.Description="Sample AvatarView idea using a polyline stroke shape to override the corder radius to draw a star."
- StrokeShape="Polyline 70,16 76,32 94,32 80,44 84,60 70,50 55,60 60,42 46,32 64,32"
+ StrokeShape="Polyline 24,0 29,16 48,18 34,30 38,48 24,37 10,48 14,30 0,18 19,16"
  Style="{StaticResource Rating}"
  Text="1"
  WidthRequest="48" />
@@ -122,7 +120,7 @@
  HeightRequest="48"
  ImageSource="https://aka.ms/campus.jpg"
  SemanticProperties.Description="Sample AvatarView idea using a polyline stroke shape to override the corder radius to draw a star."
- StrokeShape="Polyline 70,16 76,32 94,32 80,44 84,60 70,50 55,60 60,42 46,32 64,32"
+ StrokeShape="Polyline 24,0 29,16 48,18 34,30 38,48 24,37 10,48 14,30 0,18 19,16"
  Style="{StaticResource Rating}"
  Text="2"
  WidthRequest="48" />
@@ -132,7 +130,7 @@
  HeightRequest="48"
  ImageSource="avatar_icon.png"
  SemanticProperties.Description="Sample AvatarView idea using a polyline stroke shape to override the corder radius to draw a star, cliped by parent size."
- StrokeShape="Polyline 70,16 76,32 94,32 80,44 84,60 70,50 55,60 60,42 46,32 64,32"
+ StrokeShape="Polyline 24,0 29,16 48,18 34,30 38,48 24,37 10,48 14,30 0,18 19,16"
  Style="{StaticResource Rating}"
  Text="3"
  WidthRequest="48">

samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/PopupPositionPage.xaml

@@ -13,25 +13,21 @@
  <ResourceDictionary>
  <Style x:Key="Header"
  TargetType="Label">
- <Setter Property="VerticalOptions" Value="CenterAndExpand" />
- <Setter Property="HorizontalOptions" Value="CenterAndExpand" />
+ <Setter Property="VerticalOptions" Value="Center" />
+ <Setter Property="HorizontalOptions" Value="Center" />
  <Setter Property="Margin" Value="15, 10" />
  </Style>
  <Style TargetType="ScrollView">
- <Setter Property="VerticalOptions" Value="FillAndExpand" />
- </Style>
- <Style x:Key="ItemsLayout"
- TargetType="StackLayout">
- <Setter Property="Spacing" Value="16" />
+ <Setter Property="VerticalOptions" Value="Fill" />
  </Style>
  </ResourceDictionary>
  </ContentPage.Resources>
 
  <ScrollView>
  <Grid ColumnDefinitions="Auto, Auto, Auto"
- HorizontalOptions="CenterAndExpand"
+ HorizontalOptions="Center"
  RowDefinitions="Auto, Auto, Auto, Auto"
- VerticalOptions="CenterAndExpand">
+ VerticalOptions="Center">
 
  <Label Grid.Row="0"
  Grid.ColumnSpan="3"

samples/CommunityToolkit.Maui.Sample/Pages/Views/Popup/ShowPopupInOnAppearingPage.xaml.cs

@@ -20,8 +20,7 @@ public ShowPopupInOnAppearingPage(
 
 protected override async void OnAppearing()
 {
-
 // Proves that we now support showing a popup before the platform is even ready.
-var result = await this.ShowPopupAsync(new ReturnResultPopup(popupSizeConstants));
+await this.ShowPopupAsync(new ReturnResultPopup(popupSizeConstants));
 }
 }