Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

632 bug avatar view clipping on windows #1344

Merged
merged 9 commits into from
Aug 17, 2023
Merged

632 bug avatar view clipping on windows #1344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b3184b4
Resolves issue on Windows where the splash screen icon is not found.
GeorgeLeithead Aug 14, 2023
8244b3b
Resolves an issue with the 'Ratings' sample for AvatarView.
GeorgeLeithead Aug 14, 2023
e3ec1ce
Spaces and not tabs
GeorgeLeithead Aug 14, 2023
07d143b
Spaces and not tabs
GeorgeLeithead Aug 14, 2023
9bd898e
Changed MauiImage to point to Images folder.
GeorgeLeithead Aug 14, 2023
d1b7d58
Changed splash for Windows to be Resize=False
GeorgeLeithead Aug 15, 2023
aee7c0f
Typo in name of MauiImage
GeorgeLeithead Aug 15, 2023
099376a
Try to prevent locking.
GeorgeLeithead Aug 15, 2023
947cb75
Merge branch 'main' into 632-BUG-AvatarView-clipping-on-Windows
GeorgeLeithead Aug 17, 2023
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
7 changes: 4 additions & 3 deletions samples/CommunityToolkit.Maui.Sample/CommunityToolkit.Maui.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(NetVersion)-ios;$(NetVersion)-android;$(NetVersion)-maccatalyst</TargetFrameworks>
Expand Down Expand Up @@ -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" />
Expand Down Expand Up @@ -83,4 +84,4 @@
<RuntimeIdentifiers>maccatalyst-arm64;maccatalyst-x64</RuntimeIdentifiers>
</PropertyGroup>

</Project>
</Project>
18 changes: 8 additions & 10 deletions samples/CommunityToolkit.Maui.Sample/Pages/Views/AvatarView/AvatarViewRatingPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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">
Expand All @@ -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" />
Expand All @@ -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" />
Expand All @@ -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">
Expand Down
8 changes: 8 additions & 0 deletions samples/CommunityToolkit.Maui.Sample/Resources/Images/splash.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading