[Android] Correctly scale Button image #19834
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,35 +1,169 @@ | ||
| using System; | ||
| using Android.Content; | ||
| using Android.Graphics.Drawables; | ||
| using Android.Views; | ||
| using AndroidX.Core.Widget; | ||
| using Google.Android.Material.Button; | ||
|
|
||
| namespace Microsoft.Maui.Platform | ||
| { | ||
| public class MauiMaterialButton : MaterialButton | ||
| { | ||
| // The default MaterialButton currently does not have a concept of bottom | ||
| // gravity which we need for .NET MAUI. | ||
| // In order to get this feature, we have added a custom gravity option | ||
| // that serves as a flag to indicate that the icon should be placed at | ||
| // the bottom. | ||
| // The real gravity value is IconGravityTop in order to perform all the | ||
| // normal layout calculations. We then set ForceBottomIconGravity for our | ||
| // custom layout pass where we simply swap the icon from the top to the | ||
| // bottom using SetCompoundDrawablesRelative. | ||
| internal const int IconGravityBottom = 0x1000; | ||
|
|
||
| public MauiMaterialButton(Context context) | ||
| : base(context) | ||
| { | ||
| } | ||
|
|
||
| public override int IconGravity | ||
|
Member
There was a problem hiding this comment. If we set an invalid/new value here, then the measure and layout passes will not work properly. Luckily, we can pretend that bottom is top, and then swap to the bottom at the last minute after the layout has completed. |
||
| { | ||
| get => base.IconGravity; | ||
| set | ||
| { | ||
| // Intercept the gravity value and set the flag if it's bottom. | ||
| ForceBottomIconGravity = value == IconGravityBottom; | ||
| base.IconGravity = ForceBottomIconGravity ? IconGravityTop : value; | ||
| } | ||
| } | ||
|
|
||
| internal bool ForceBottomIconGravity { get; private set; } | ||
|
|
||
| protected override void OnMeasure(int widthMeasureSpec, int heightMeasureSpec) | ||
| { | ||
| if (Icon is MauiResizableDrawable currentIcon) | ||
| { | ||
| // if there is BOTH an icon AND text, but the text layout has NOT been measured yet, | ||
| // we need to measure JUST the text first to get the remaining space for the icon | ||
| if (Layout is null && TextFormatted?.Length() > 0) | ||
| { | ||
| // remove the icon and measure JUST the text | ||
| Icon = null; | ||
| base.OnMeasure(widthMeasureSpec, heightMeasureSpec); | ||
|
|
||
| // restore the icon | ||
| Icon = currentIcon; | ||
| } | ||
|
Comment on lines
+45
to
+55
Member
There was a problem hiding this comment. Due to the way TextView measures, it appears to prioritize the icon and will clip/squash the text. However, we want the text to be the priority. In order for this to happen, we have to measure the initial pass without an icon and this sets us up to re-measure with a smaller/fitting icon. |
||
|
|
||
| // determine the total client area available for BOTH the icon AND text to fit | ||
| var availableWidth = MeasureSpec.GetMode(widthMeasureSpec) == MeasureSpecMode.Unspecified | ||
| ? int.MaxValue | ||
| : MeasureSpec.GetSize(widthMeasureSpec); | ||
| var availableHeight = MeasureSpec.GetMode(heightMeasureSpec) == MeasureSpecMode.Unspecified | ||
| ? int.MaxValue | ||
| : MeasureSpec.GetSize(heightMeasureSpec); | ||
|
|
||
| // calculate the icon size based on the remaining space | ||
| CalculateIconSize(currentIcon, availableWidth, availableHeight); | ||
| } | ||
|
|
||
| // re-measure with both text and icon | ||
| base.OnMeasure(widthMeasureSpec, heightMeasureSpec); | ||
| } | ||
|
|
||
| protected override void OnLayout(bool changed, int left, int top, int right, int bottom) | ||
| { | ||
| base.OnLayout(changed, left, top, right, bottom); | ||
|
|
||
| // After the layout pass, we swap the icon from the top to the bottom. | ||
| if (ForceBottomIconGravity) | ||
| { | ||
| var icons = TextViewCompat.GetCompoundDrawablesRelative(this); | ||
| if (icons[1] is { } icon) | ||
| { | ||
| TextViewCompat.SetCompoundDrawablesRelative(this, null, null, null, icon); | ||
| icon.SetBounds(0, 0, icon.IntrinsicWidth, icon.IntrinsicHeight); | ||
| } | ||
| } | ||
|
Comment on lines
+78
to
+86
|
||
| } | ||
|
|
||
| void CalculateIconSize(MauiResizableDrawable resizable, int availableWidth, int availableHeight) | ||
| { | ||
| // bail if the text layout is not available yet, this is most likely a bug | ||
| if (Layout is null) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| var actual = resizable.Drawable; | ||
|
|
||
| var remainingWidth = availableWidth - PaddingLeft - PaddingRight; | ||
| var remainingHeight = availableHeight - PaddingTop - PaddingBottom; | ||
|
|
||
| if (IsIconGravityHorizontal) | ||
| { | ||
| remainingWidth -= IconPadding + GetTextLayoutWidth(); | ||
| } | ||
| else | ||
| { | ||
| remainingHeight -= IconPadding + GetTextLayoutHeight(); | ||
| } | ||
|
|
||
| var iconWidth = Math.Min(remainingWidth, actual.IntrinsicWidth); | ||
| var iconHeight = Math.Min(remainingHeight, actual.IntrinsicHeight); | ||
|
|
||
| var ratio = Math.Min( | ||
| (double)iconWidth / actual.IntrinsicWidth, | ||
| (double)iconHeight / actual.IntrinsicHeight); | ||
|
|
||
| resizable.SetPreferredSize( | ||
| Math.Max(0, (int)(actual.IntrinsicWidth * ratio)), | ||
| Math.Max(0, (int)(actual.IntrinsicHeight * ratio))); | ||
|
|
||
| // trigger a layout re-calculation | ||
| Icon = null; | ||
| Icon = resizable; | ||
| } | ||
|
|
||
| bool IsIconGravityHorizontal => | ||
| IconGravity is IconGravityTextStart or IconGravityTextEnd or IconGravityStart or IconGravityEnd; | ||
|
|
||
| int GetTextLayoutWidth() | ||
| { | ||
| float maxWidth = 0; | ||
| int lineCount = LineCount; | ||
| for (int line = 0; line < lineCount; line++) | ||
| { | ||
| maxWidth = Math.Max(maxWidth, Layout!.GetLineWidth(line)); | ||
| } | ||
| return (int)Math.Ceiling(maxWidth); | ||
| } | ||
|
|
||
| int GetTextLayoutHeight() | ||
| { | ||
| var layoutHeight = Layout!.Height; | ||
|
|
||
| return layoutHeight; | ||
| } | ||
|
|
||
| internal class MauiResizableDrawable : LayerDrawable | ||
| { | ||
| public MauiResizableDrawable(Drawable drawable) | ||
| : base([drawable]) | ||
| { | ||
| PaddingMode = (int)LayerDrawablePaddingMode.Stack; | ||
| } | ||
|
|
||
| public Drawable Drawable => GetDrawable(0)!; | ||
|
|
||
| public void SetPreferredSize(int width, int height) | ||
| { | ||
| if (OperatingSystem.IsAndroidVersionAtLeast(23)) | ||
| { | ||
| SetLayerSize(0, width, height); | ||
| } | ||
|
|
||
| // TODO: find something that works for older versions | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of toggling the icon here, we are doing that as part of the measure. This makes the updates happen all together instead of here, and then it is better for maintenance.