Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

Fix crash iOS Label measure for RTL languages #15605

Merged
merged 4 commits into from
Nov 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 28 additions & 0 deletions Xamarin.Forms.Platform.Android/Platform.cs
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,9 @@ TabbedPage CurrentTabbedPage
_currentTabbedPage.PropertyChanged -= CurrentTabbedPageOnPropertyChanged;

if (value == null)
#pragma warning disable CS0618 // Type or member is obsolete
ActionBar.RemoveAllTabs();
#pragma warning restore CS0618 // Type or member is obsolete
}

_currentTabbedPage = value;
Expand Down Expand Up @@ -646,15 +648,21 @@ ActionBar.Tab AddTab(Page page, int index)

TabbedPage currentTabs = CurrentTabbedPage;

#pragma warning disable CS0618 // Type or member is obsolete
var atab = actionBar.NewTab();
#pragma warning restore CS0618 // Type or member is obsolete

#pragma warning disable CS0618 // Type or member is obsolete
atab.SetText(new Java.Lang.String(page.Title));
#pragma warning restore CS0618 // Type or member is obsolete
atab.TabSelected += (sender, e) =>
{
if (!_ignoreAndroidSelection)
currentTabs.CurrentPage = page;
};
#pragma warning disable CS0618 // Type or member is obsolete
actionBar.AddTab(atab, index);
#pragma warning restore CS0618 // Type or member is obsolete

page.PropertyChanged += PagePropertyChanged;
return atab;
Expand Down Expand Up @@ -737,7 +745,11 @@ void CurrentTabbedPageChildrenChanged(object sender, NotifyCollectionChangedEven
Page page = CurrentTabbedPage.CurrentPage;
int index = TabbedPage.GetIndex(page);
if (index >= 0 && index < CurrentTabbedPage.Children.Count)
#pragma warning disable CS0618 // Type or member is obsolete
#pragma warning disable CS0618 // Type or member is obsolete
ActionBar.GetTabAt(index).Select();
#pragma warning restore CS0618 // Type or member is obsolete
#pragma warning restore CS0618 // Type or member is obsolete
}

_ignoreAndroidSelection = false;
Expand Down Expand Up @@ -766,7 +778,9 @@ void SelectTab()
Page page = _currentTabbedPage.CurrentPage;
if (page == null)
{
#pragma warning disable CS0618 // Type or member is obsolete
ActionBar.SelectTab(null);
#pragma warning restore CS0618 // Type or member is obsolete
return;
}

Expand All @@ -776,7 +790,11 @@ void SelectTab()
return;
}

#pragma warning disable CS0618 // Type or member is obsolete
#pragma warning disable CS0618 // Type or member is obsolete
ActionBar.SelectTab(ActionBar.GetTabAt(index));
#pragma warning restore CS0618 // Type or member is obsolete
#pragma warning restore CS0618 // Type or member is obsolete
}

Drawable GetActionBarBackgroundDrawable()
Expand Down Expand Up @@ -874,8 +892,12 @@ void PagePropertyChanged(object sender, PropertyChangedEventArgs args)
return;

var page = sender as Page;
#pragma warning disable CS0618 // Type or member is obsolete
var atab = actionBar.GetTabAt(currentTabs.Children.IndexOf(page));
#pragma warning restore CS0618 // Type or member is obsolete
#pragma warning disable CS0618 // Type or member is obsolete
atab.SetText(new Java.Lang.String(page.Title));
#pragma warning restore CS0618 // Type or member is obsolete
}
}

Expand Down Expand Up @@ -940,12 +962,16 @@ void ReloadToolbarItems()
void RemoveTab(Page page, int index)
{
page.PropertyChanged -= PagePropertyChanged;
#pragma warning disable CS0618 // Type or member is obsolete
ActionBar?.RemoveTabAt(index);
#pragma warning restore CS0618 // Type or member is obsolete
}

void Reset()
{
#pragma warning disable CS0618 // Type or member is obsolete
ActionBar.RemoveAllTabs();
#pragma warning restore CS0618 // Type or member is obsolete

if (CurrentTabbedPage == null)
return;
Expand All @@ -955,7 +981,9 @@ void Reset()
{
var realTab = AddTab(tab, i++);
if (tab == CurrentTabbedPage.CurrentPage)
#pragma warning disable CS0618 // Type or member is obsolete
realTab.Select();
#pragma warning restore CS0618 // Type or member is obsolete
}
}

Expand Down
14 changes: 12 additions & 2 deletions Xamarin.Forms.Platform.iOS/Extensions/UIViewExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,18 @@ public static SizeRequest GetSizeRequest(this UIView self, double widthConstrain
else
s = self.FittingSize;
#endif
var request = new Size(s.Width == float.PositiveInfinity ? double.PositiveInfinity : s.Width,
s.Height == float.PositiveInfinity ? double.PositiveInfinity : s.Height);

var width = s.Width;
var height = s.Height;

if (nfloat.IsNaN(width))
width = float.PositiveInfinity;

if (nfloat.IsNaN(height))
height = float.PositiveInfinity;

var request = new Size(width == float.PositiveInfinity ? double.PositiveInfinity : width,
height == float.PositiveInfinity ? double.PositiveInfinity : height);
var minimum = new Size(minimumWidth < 0 ? request.Width : minimumWidth,
minimumHeight < 0 ? request.Height : minimumHeight);
return new SizeRequest(request, minimum);
Expand Down
2 changes: 1 addition & 1 deletion build/steps/build-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
echo "##vso[task.setvariable variable=JI_JAVA_HOME]$(JAVA_HOME_11_X64)"
displayName: 'Setup JDK Paths'

- task: xamops.azdevex.provisionator-task.provisionator@1
- task: xamops.azdevex.provisionator-task.provisionator@2
displayName: 'Provisionator'
condition: eq(variables['provisioning'], 'true')
inputs:
Expand Down
4 changes: 2 additions & 2 deletions build/steps/build-osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ steps:
- checkout: self
clean: true

- task: xamops.azdevex.provisionator-task.provisionator@1
- task: xamops.azdevex.provisionator-task.provisionator@2
displayName: 'Provision Xcode'
condition: ne(variables['REQUIRED_XCODE'], '')
inputs:
provisioning_script: 'build/provisioning/xcode.csx'
env:
AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)

- task: xamops.azdevex.provisionator-task.provisionator@1
- task: xamops.azdevex.provisionator-task.provisionator@2
displayName: 'Provisionator'
condition: eq(variables['provisioning'], 'true')
inputs:
Expand Down
4 changes: 2 additions & 2 deletions build/steps/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ steps:
displayName: 'Cake Provision'
condition: eq(variables['provisioningCake'], 'true')

- task: xamops.azdevex.provisionator-task.provisionator@1
- task: xamops.azdevex.provisionator-task.provisionator@2
displayName: 'Provisionator'
condition: eq(variables['provisioning'], 'true')
inputs:
Expand All @@ -25,7 +25,7 @@ steps:
env:
AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)

- task: xamops.azdevex.provisionator-task.provisionator@1
- task: xamops.azdevex.provisionator-task.provisionator@2
displayName: 'Provisioning VS'
condition: eq(variables['provisioningVS'], 'true')
inputs:
Expand Down