Fixed BaseRepositoryDataTemplate AvatarImage Bug

AvatarImage was rendering as an oval on smaller screens
brminnick · Dec 28, 2021 · e6996f9 · e6996f9
1 parent 73d27f6
commit e6996f9
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/GitTrends/Views/Base/CircleImage.cs b/GitTrends/Views/Base/CircleImage.cs
@@ -26,6 +26,7 @@ public CircleImage()
 			this.Bind(Frame.BorderColorProperty, nameof(BorderColor), source: this);
 
 			Content = new CachedImage()
+						.Bind(CachedImage.AspectProperty, nameof(Aspect), source: this)
 						.Bind(CachedImage.SourceProperty, nameof(ImageSource), source: this)
 						.Bind(CachedImage.ErrorPlaceholderProperty, nameof(ErrorPlaceholder), source: this)
 						.Bind(CachedImage.LoadingPlaceholderProperty, nameof(LoadingPlaceholder), source: this);

diff --git a/GitTrends/Views/Base/CirclePancakeView.cs b/GitTrends/Views/Base/CirclePancakeView.cs
@@ -1,4 +1,5 @@
-using Xamarin.CommunityToolkit.Markup;
+using System;
+using Xamarin.CommunityToolkit.Markup;
 using Xamarin.Forms.PancakeView;
 
 namespace GitTrends
@@ -7,6 +8,8 @@ public class CirclePancakeView : PancakeView
 	{
 		public CirclePancakeView()
 		{
+			HeightRequest = WidthRequest = Math.Min(HeightRequest, WidthRequest);
+
 			this.Bind<PancakeView, double, double>(CornerRadiusProperty, nameof(Width), convert: convertWidthToCornerRadius, source: this);
 
 			IsClippedToBounds = true;

diff --git a/GitTrends/Views/Repository/BaseRepositoryDataTemplate.cs b/GitTrends/Views/Repository/BaseRepositoryDataTemplate.cs
@@ -20,7 +20,8 @@ abstract class BaseRepositoryDataTemplate : DataTemplate
 		const int _statsColumnSize = 40;
 		const double _statisticsRowHeight = StatisticsLabel.StatisticsFontSize + 4;
 		const double _emojiColumnSize = _statisticsRowHeight;
-		readonly static double _circleImageHeight = IsSmallScreen ? 52 : 62;
+
+		readonly static double _circleImageHeight = IsSmallScreen ? 48 : 62;
 
 		readonly static AsyncAwaitBestPractices.WeakEventManager _tappedWeakEventManager = new();
 
@@ -112,8 +113,8 @@ public ContentGrid(in IEnumerable<View> dataTemplateChildren, in Repository repo
 							(Row.Statistics, _statisticsRowHeight));
 
 						ColumnDefinitions = Columns.Define(
-							(Column.Avatar, IsSmallScreen ? _circleImageHeight - 4 : _circleImageHeight),
-							(Column.AvatarPadding, IsSmallScreen ? 4 : 16),
+							(Column.Avatar, _circleImageHeight),
+							(Column.AvatarPadding, IsSmallScreen ? 4 : 8),
 							(Column.Trending, Star),
 							(Column.Emoji1, _emojiColumnSize),
 							(Column.Statistic1, _statsColumnSize),

diff --git a/GitTrends/Views/Settings/GitHubUserView.cs b/GitTrends/Views/Settings/GitHubUserView.cs
@@ -46,9 +46,7 @@ public GitHubAvatarImage()
 			{
 				this.Center();
 
-				HeightRequest = _imageHeight;
-				WidthRequest = _imageHeight;
-				Aspect = Aspect.AspectFit;
+				HeightRequest = WidthRequest = _imageHeight;
 
 				AutomationId = SettingsPageAutomationIds.GitHubAvatarImage;