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

fix(Android): Fix NRE when TextBlock.FontFamily is null #7132

Merged
merged 1 commit into from
Sep 20, 2021
Merged

fix(Android): Fix NRE when TextBlock.FontFamily is null #7132

merged 1 commit into from
Sep 20, 2021
+29 −14

Conversation

jeromelaban
Copy link
Member

PR Type

What kind of change does this PR introduce?

  • Bugfix

What is the new behavior?

Ensure that a null TextBlock.FontFamily fallsback to the default system font

PR Checklist

Please check if your PR fulfills the following requirements:

Other information

Internal Issue (If applicable):

@jeromelaban jeromelaban requested a review from a team September 17, 2021 20:42
@gitpod-io
Copy link

gitpod-io bot commented Sep 17, 2021

@jeromelaban jeromelaban force-pushed the dev/jela/textblock-nre-android branch from 1a2e8a6 to 5a428c9 Compare September 17, 2021 22:10
@nventive-devops
Copy link
Contributor

The build 33653 found UI Test snapshots differences: android-28-net6: 0, android-28-xamarin: 18, android-28-xamarin-Snap: 27, ios: 25, ios-Snap: 44, skia-gtk-screenshots: 14, wasm: 13, wasm-automated-net5.0-Benchmarks: 0, wasm-automated-net5.0-Default: 3, wasm-automated-net5.0-RuntimeTests: 0

Details

  • android-28-net6: 0 changed over 1

  • android-28-xamarin: 18 changed over 732

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ComboBoxTests_Fullscreen_Popup_Generic_Closed
    • ComboBoxTests_Fullscreen_Popup_Generic_Opened
    • ComboBox_Dropdown_Background_ComboBox_open
    • CommandTest_UITests_Microsoft_UI_Xaml_Controls_SplitButtonTests_SplitButtonPage
    • ImageStretch_None_Uno_UI_Samples_UITests_ImageTestsControl_Image_Stretch_None
    • ProgressRing_IsEnabled_Running_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • ProgressRing_Visibility_Collapsed_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • SequentialAnimations_SamplesApp_Windows_UI_Xaml_Media_Animation_SequentialAnimationsPage
    • PasswordBox_AutoGrow_Horizontally_Test_Uno_UI_Samples_Content_UITests_TextBoxControl_PasswordBox_Simple
    • PopupWithOverlay_After
    • WebView_NavigateToAnchor_navigate_to_anchor
    • TestProgressRing_InitialState_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_Features
    • TimePicker_Header_UITests_Windows_UI_Xaml_Controls_TimePicker_TimePicker_Header
    • When_Click_Outside_Dialog_Expect_No_Dismiss_AfterClicking
    • When_Click_Outside_Dialog_Expect_No_Dismiss_BeforeClicking
    • When_Parent_PointerMoved_After_drag_on_non-scrolling_ScrollViewer
    • When_Parent_PointerMoved_After_drag_on_ScrollViewer_-_touch
    • When_TransformToVisual_ScrollViewer_UITests_Shared_Windows_UI_Xaml_UIElementTests_TransformToVisual_ScrollViewer

  • android-28-xamarin-Snap: 27 changed over 917

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Button_Custom_Button_With_ContentTemplate_Uno_UI_Samples_Content_UITests_ButtonTestsControl_Custom_Button_With_ContentTemplate
    • ComboBox_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_DropDownPlacement_UITests_Shared_Windows_UI_Xaml_Controls_ComboBox_ComboBox_DropDownPlacement
    • Default_UITests_Windows_UI_Xaml_Controls_TextBlockControl_TextBlock_IsTextSelectionEnabled_UITests_Windows_UI_Xaml_Controls_TextBlockControl_TextBlock_IsTextSelectionEnabled
    • Default_Uno_UI_Samples_UITests_ImageBrushTestControl_DoubleImageBrushInList_Uno_UI_Samples_UITests_ImageBrushTestControl_DoubleImageBrushInList
    • Default_Uno_UI_Samples_UITests_Image_Image_UseTargetSize_Uno_UI_Samples_UITests_Image_Image_UseTargetSize
    • Map_MapControl_Uno_UI_Samples_Content_UITests_MapControl_MapControl
    • NavigationView_MUXControlsTestApp_NavigationViewPage_MUXControlsTestApp_NavigationViewPage
    • NavigationView_MUXControlsTestApp_NavigationViewRS4Page_MUXControlsTestApp_NavigationViewRS4Page
    • TextBlockControl_TextBlockMultilineInStarStackPanel_Uno_UI_Samples_Content_UITests_TextBlockControl_TextBlockMultilineInStarStackPanel
    • Progress_UITests_Microsoft_UI_Xaml_Controls_ProgressBar_WinUIProgressBarSimple_UITests_Microsoft_UI_Xaml_Controls_ProgressBar_WinUIProgressBarSimple
    • TextBlockControl_TextBlock_FixedWidth_With_DataBound_Run_Uno_UI_Samples_Content_UITests_TextBlockControl_TextBlock_FixedWidth_With_DataBound_Run
    • Progress_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRingPage_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRingPage
    • Progress_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_CustomSources_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_CustomSources
    • Progress_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_Features_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_Features
    • Progress_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220_UITests_Windows_UI_Xaml_Controls_ProgressRing_WindowsProgressRing_GH1220
    • Shapes_UITests_Windows_UI_Xaml_Shapes_Offscreen_Shapes_UITests_Windows_UI_Xaml_Shapes_Offscreen_Shapes
    • SplitButton_MUX_Test_UITests_Microsoft_UI_Xaml_Controls_SplitButtonTests_SplitButtonPage
    • TabView_UITests_Microsoft_UI_Xaml_Controls_TabViewTests_TabViewPage_UITests_Microsoft_UI_Xaml_Controls_TabViewTests_TabViewPage
    • TextBlockControl_TextBoxSizeChanging_Uno_UI_Samples_Content_UITests_TextBlockControl_TextBoxSizeChanging
    • TimePicker_UITests_Windows_UI_Xaml_Controls_TimePicker_TimePicker_Header_UITests_Windows_UI_Xaml_Controls_TimePicker_TimePicker_Header

  • ios: 25 changed over 275

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Change_Manipulation_Property_UITests_Shared_Windows_UI_Xaml_Controls_BorderTests_Border_Clipped_Change_Property
    • Change_Manipulation_Property_After_property_change
    • Change_Manipulation_Property_Before_property_change
    • Keyboard_Textbox_InsideScrollViewer_Validation_1_-_Remove_Focus_on_filledTextBox
    • Keyboard_Textbox_InsideScrollViewer_Validation_2_-_Remove_Focus_on_placeholderTextTextBox
    • Keyboard_Textbox_InsideScrollViewer_Validation_4_-_Remove_Focus_on_multilineTextBox
    • Keyboard_Textbox_NoScrollViewer_Validation_4_-_Remove_Focus_on_multilineTextBox
    • ListView_ExpandableItemLarge_ExpandHeaderWithMultipleItems_Validation_Expanded_State
    • ListView_ExpandableItemLarge_ExpandHeaderWithMultipleItems_Validation_Collapsed_State
    • ListView_ExpandableItemLarge_ExpandHeaderWithMultipleItems_Validation_Initial_State
    • ListView_ExpandableItemLarge_ExpandHeaderWithSingleItem_Validation_Expanded_State
    • ListView_ExpandableItemLarge_ExpandHeaderWithMultipleItems_Validation_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_Expandable_Item_Large
    • ListView_ExpandableItemLarge_ExpandHeaderWithSingleItem_Validation_Initial_State
    • ListView_ExpandableItemLarge_ExpandHeaderWithSingleItem_Validation_Collapsed_State
    • ListView_ExpandableItemLarge_ExpandHeaderWithSingleItem_Validation_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_Expandable_Item_Large
    • ListView_ExpandableItemLarge_ExpandHeader_Validation_Expanded_State
    • ListView_ExpandableItemLarge_ExpandHeader_Validation_Collapsed_State
    • ListView_ExpandableItemLarge_ExpandHeader_Validation_Initial_State
    • ListView_ExpandableItemLarge_ExpandHeader_Validation_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_Expandable_Item_Large
    • NativeCommandBar_Size_thirdOrientation

  • ios-Snap: 44 changed over 908

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Animations_DoubleAnimationUsingKeyFrames_TranslateX_GenericApp_Views_Content_UITests_Animations_DoubleAnimationUsingKeyFrames_TranslateX
    • ComboBox_ComboBox_Picker_SamplesApp_Wasm_Windows_UI_Xaml_Controls_ComboBox_ComboBox_Picker
    • ContentControlTestsControl_ContentControl_Nested_TemplatedParent_Uno_UI_Samples_Content_UITests_ContentControlTestsControl_ContentControl_Nested_TemplatedParent
    • ContentControlTestsControl_ContentControl_SetNull_Uno_UI_Samples_Content_UITests_ContentControlTestsControl_ContentControl_SetNull
    • Border_Border_Simple_No_Background_With_TextBox_Uno_UI_Samples_UITests_BorderTestsControl_Border_Simple_No_Background_With_TextBox
    • Default_UITests_Windows_UI_Xaml_Controls_TextBlockControl_TextBlock_IsTextSelectionEnabled_UITests_Windows_UI_Xaml_Controls_TextBlockControl_TextBlock_IsTextSelectionEnabled
    • Expander_WinUIExpanderPage_UITests_Shared_Microsoft_UI_Xaml_Controls_ExpanderTests_WinUIExpanderPage
    • Flyout_Flyout_ToggleMenu_UITests_Shared_Windows_UI_Xaml_Controls_Flyout_Flyout_ToggleMenu
    • Flyout_Flyout_Transforms_On_Target_UITests_Shared_Windows_UI_Xaml_Controls_Flyout_Flyout_Transforms_On_Target
    • ImageBrushTestControl_BorderImageBrush_Uno_UI_Samples_UITests_ImageBrushTestControl_BorderImageBrush
    • Default_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation_Uno_UI_Samples_Content_UITests_WebView_WebView_AnchorNavigation
    • GridTestsControl_Grid_with_TextBlock_VerticalAlignment_Uno_UI_Samples_Content_UITests_GridTestsControl_Grid_with_TextBlock_VerticalAlignment
    • GridTestsControl_Grid_with_Text_HorizontalAlignment_With_Margin_Uno_UI_Samples_Content_UITests_GridTestsControl_Grid_with_Text_HorizontalAlignment_With_Margin
    • GridTestsControl_Grid_with_UILabel_TextAlignmentVertical_Bottom_Uno_UI_Samples_Content_UITests_GridTestsControl_Grid_with_UILabel_TextAlignmentVertical_Bottom
    • Image_UITests_Shared_Windows_UI_Xaml_Controls_ImageTests_Image_Stretch_Algmnt_Inf_Horizontal_UITests_Shared_Windows_UI_Xaml_Controls_ImageTests_Image_Stretch_Algmnt_Inf_Horizontal
    • ListView_ListViewGroupedEmpty_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewGroupedEmpty
    • ListView_ListViewGroupedVariableHeightComplexTemplate_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewGroupedVariableHeightComplexTemplate
    • ListView_ListViewHeaderImage_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListViewHeaderImage
    • ListView_ListView_Expandable_Item_Large_SamplesApp_Windows_UI_Xaml_Controls_ListView_ListView_Expandable_Item_Large
    • Image_Uno_UI_Samples_UITests_Image_Image_Stretch_Uno_UI_Samples_UITests_Image_Image_Stretch

  • skia-gtk-screenshots: 14 changed over 958

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • Image-Image_Stretch_Alignment_Bigger
    • Image-Image_Stretch_Alignment_Taller
    • ImageBrushTestControl-Ellipse
    • ListView-ListView_IsSelected
    • NavigationView-NavigationViewCompactPaneLengthTestPage
    • NavigationView-NavigationViewCustomThemeResourcesPage
    • Primitives-LoopingSelector_Short
    • Progress-WindowsProgressRing_GH1220
    • Progress-WinUIDeterminateProgressRing
    • RadioButtons-RadioButtonsFocusPage
    • TextBlockControl-TextBlock_IsTextSelectionEnabled
    • Transform-TextBox_With_RotateTransform
    • WinUI-NavigationViewCustomThemeResourcesPage
    • WinUI-NavigationViewTopNavPage

  • wasm: 13 changed over 917

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • SamplesApp.Wasm.Windows_UI_Xaml_Controls.ListView.ListView_IsSelected
    • SamplesApp.Wasm.Windows_UI_Xaml_Media.Transform.TransformToVisual_Translate2d
    • UITests.Microsoft_UI_Xaml_Controls.ColorPickerTests.ColorPickerSample
    • UITests.Microsoft_UI_Xaml_Controls.ProgressRing.WinUIProgressRingPage
    • UITests.Microsoft_UI_Xaml_Controls.ProgressRing.WinUIProgressRing_Features
    • UITests.Windows_UI_Xaml.DragAndDrop.DragDrop_TestPage
    • UITests.Windows_UI_Xaml_Controls.TextBlockControl.TextBlock_IsTextSelectionEnabled
    • UITests.Windows_UI_Xaml_Shapes.Offscreen_Shapes
    • Uno.UI.Samples.Samples.Shared.Content.UITests.ImageBrushInList
    • Uno.UI.Samples.UITests.Image.Image_Stretch
    • Uno.UI.Samples.UITests.Image.Image_Stretch_Alignment_Bigger
    • Uno.UI.Samples.UITests.Image.Image_Stretch_Alignment_Taller
    • Uno.UI.Samples.UITests.ImageBrushTestControl.Ellipse

  • wasm-automated-net5.0-Benchmarks: 0 changed over 1

  • wasm-automated-net5.0-Default: 3 changed over 804

    🚨🚨 Comparison Details (first 20) 🚨🚨
    • ImageStretch_None_Uno_UI_Samples_UITests_ImageTestsControl_Image_Stretch_None
    • ListView_Weird_Measure_During_Arrange_UITests_Shared_Windows_UI_Xaml_Controls_ListView_ListView_Weird_Measure
    • TestProgressRing_InitialState_UITests_Microsoft_UI_Xaml_Controls_ProgressRing_WinUIProgressRing_Features

  • wasm-automated-net5.0-RuntimeTests: 0 changed over 1

@jeromelaban jeromelaban added the ready-to-merge Automatically merge the PR once all '.mergify.yml' policies are met label Sep 20, 2021
@mergify mergify bot merged commit 205cd2a into master Sep 20, 2021
@mergify mergify bot deleted the dev/jela/textblock-nre-android branch September 20, 2021 14:31
@jeromelaban
Copy link
Member Author

@Mergifyio backport release/stable/3.10

@mergify mergify bot mentioned this pull request Sep 20, 2021
Merged
@mergify
Copy link
Contributor

mergify bot commented Sep 20, 2021

Command backport release/stable/3.10: success

Backports have been created

jeromelaban added a commit that referenced this pull request Sep 20, 2021
@jeromelaban
Merge pull request #7143 from unoplatform/mergify/bp/release/stable/3…
a6935c5 
….10/pr-7132

fix(Android): Fix NRE when TextBlock.FontFamily is null (backport #7132)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Youssef1313 Youssef1313 Youssef1313 left review comments

@lindexi lindexi lindexi left review comments

@dr1rrb dr1rrb dr1rrb approved these changes

@carldebilly carldebilly carldebilly approved these changes

Assignees
No one assigned
Labels
ready-to-merge Automatically merge the PR once all '.mergify.yml' policies are met
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@jeromelaban @nventive-devops @carldebilly @dr1rrb @lindexi @Youssef1313