From 86dc7b7c73086d0a96171cacc0f70dccfe2a0e5b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 26 May 2022 15:44:45 +0000 Subject: [PATCH] [create-pull-request] automated change --- .../src/Maui/Tizen/WebViewContainer.cs | 2 +- .../src/Maui/Tizen/WebViewExtensions.cs | 36 ++-- .../src/Maui/Windows/WinUIWebViewManager.cs | 2 +- .../BlazorWebViewDeveloperTools.cs | 6 +- ...lazorWebViewServiceCollectionExtensions.cs | 18 +- .../HandlerTestBase.Windows.cs | 2 +- .../Embedding.Droid/MainActivity.cs | 14 +- .../Embedding.Droid/SecondActivity.cs | 12 +- .../Embedding.UWP/App.xaml.cs | 196 +++++++++--------- .../Embedding.iOS/ViewController.cs | 12 +- .../src/Issues.Shared/Issue5680.xaml.cs | 10 +- .../src/Issues.Shared/Issue8279.cs | 14 +- .../src/Tizen/DisposeLabelRenderer.cs | 2 +- .../PlatformSpecificCoreGalleryFactory.cs | 2 +- .../RegistrarValidationService.cs | 2 +- .../Core/src/MacOS/Cells/CellNSView.cs | 6 +- .../src/MacOS/Extensions/BrushExtensions.cs | 2 +- .../src/MacOS/Extensions/FontExtensions.cs | 6 +- .../NSAttributedStringExtensions.cs | 82 ++++---- .../src/MacOS/FormsApplicationDelegate.cs | 8 +- .../Core/src/MacOS/ImageSourceHandlers.cs | 5 +- .../Core/src/MacOS/ModalPageTracker.cs | 8 +- .../Core/src/MacOS/NativeToolbarTracker.cs | 5 +- src/Compatibility/Core/src/MacOS/Platform.cs | 9 +- .../Core/src/MacOS/PlatformNavigation.cs | 2 +- .../Core/src/MacOS/Properties/AssemblyInfo.cs | 3 +- .../Renderers/ActivityIndicatorRenderer.cs | 2 +- .../src/MacOS/Renderers/BoxViewRenderer.cs | 4 +- .../src/MacOS/Renderers/ButtonRenderer.cs | 2 +- .../MacOS/Renderers/CarouselPageRenderer.cs | 5 +- .../src/MacOS/Renderers/DatePickerRenderer.cs | 2 +- .../src/MacOS/Renderers/EditorRenderer.cs | 3 +- .../Core/src/MacOS/Renderers/EntryRenderer.cs | 2 +- .../src/MacOS/Renderers/FlyoutPageRenderer.cs | 2 +- .../MacOS/Renderers/NavigationPageRenderer.cs | 4 +- .../Core/src/MacOS/Renderers/PageRenderer.cs | 2 +- .../MacOS/Renderers/ProgressBarRenderer.cs | 3 +- .../src/MacOS/Renderers/ScrollViewRenderer.cs | 2 +- .../src/MacOS/Renderers/SliderRenderer.cs | 2 +- .../src/MacOS/Renderers/TabbedPageRenderer.cs | 3 +- .../MacOS/Renderers/TableViewDataSource.cs | 4 +- .../src/MacOS/Renderers/WebViewRenderer.cs | 15 +- .../Core/src/RendererToHandlerShim.Windows.cs | 4 +- .../CollectionView/ItemTemplateAdaptor.cs | 2 +- .../Core/src/Tizen/NativeBindingService.cs | 2 +- .../Core/src/Tizen/PopupManager.cs | 2 +- .../Core/src/Tizen/Shell/NavigationView.cs | 2 +- .../Core/src/Windows/AccessKeyHelper.cs | 3 +- .../src/Windows/ActivityIndicatorRenderer.cs | 4 +- .../Core/src/Windows/AlignmentExtensions.cs | 2 +- .../Core/src/Windows/BoxViewBorderRenderer.cs | 2 +- .../Core/src/Windows/ButtonRenderer.cs | 6 +- .../Core/src/Windows/CheckBoxRenderer.cs | 4 +- .../CollectionView/ItemContentControl.cs | 4 +- .../CollectionView/ItemsViewRenderer.cs | 18 +- .../SelectableItemsViewRenderer.cs | 2 +- .../Core/src/Windows/DatePickerRenderer.cs | 2 +- .../Core/src/Windows/EditorRenderer.cs | 2 +- .../Core/src/Windows/EntryRenderer.cs | 2 +- .../Core/src/Windows/FlyoutPageControl.cs | 42 ++-- .../Core/src/Windows/FlyoutPageRenderer.cs | 2 +- .../src/Windows/FontImageSourceHandler.cs | 6 +- .../Core/src/Windows/FormsButton.cs | 10 +- .../Core/src/Windows/FormsCancelButton.cs | 2 +- .../Core/src/Windows/FormsCheckBox.cs | 8 +- .../Core/src/Windows/FormsComboBox.cs | 2 +- .../Core/src/Windows/FormsCommandBar.cs | 4 +- .../Core/src/Windows/FormsFlyout.xaml.cs | 2 +- .../Core/src/Windows/FormsTextBox.cs | 6 +- .../Core/src/Windows/ImageElementManager.cs | 4 +- .../Core/src/Windows/IndicatorViewRenderer.cs | 2 +- .../Windows/InterceptVisualStateManager.cs | 2 +- .../Core/src/Windows/ListViewRenderer.cs | 4 +- .../Core/src/Windows/NativeBindingService.cs | 60 +++--- .../Core/src/Windows/NativeEventWrapper.cs | 6 +- .../src/Windows/NativePropertyListener.cs | 2 +- .../Windows/NativeValueConverterService.cs | 26 +-- .../Core/src/Windows/NativeViewWrapper.cs | 2 +- .../src/Windows/NavigationPageRenderer.cs | 6 +- .../Core/src/Windows/PageControl.cs | 30 +-- .../Core/src/Windows/PageRenderer.cs | 2 +- .../Core/src/Windows/PickerRenderer.cs | 4 +- .../Core/src/Windows/Platform.cs | 2 +- .../Core/src/Windows/RefreshViewRenderer.cs | 2 +- .../Core/src/Windows/ScrollViewRenderer.cs | 5 +- .../Core/src/Windows/SearchBarRenderer.cs | 16 +- .../Core/src/Windows/SliderRenderer.cs | 4 +- .../Core/src/Windows/StepperControl.cs | 2 +- .../Core/src/Windows/StepperRenderer.cs | 2 +- .../Core/src/Windows/TabbedPageRenderer.cs | 2 +- .../Core/src/Windows/TableViewRenderer.cs | 6 +- .../Core/src/Windows/TimePickerRenderer.cs | 2 +- .../src/Windows/ToolbarPlacementHelper.cs | 2 +- .../Core/src/Windows/UriImageSourceHandler.cs | 2 +- .../Core/src/Windows/VisualElementPackager.cs | 3 +- .../Core/src/Windows/VisualElementRenderer.cs | 5 +- .../Core/src/iOS/DragAndDropDelegate.cs | 4 +- src/Compatibility/Core/src/iOS/Forms.cs | 2 +- .../Material/src/iOS/FormsMaterial.cs | 12 +- .../iOS/MaterialActivityIndicatorRenderer.cs | 3 +- .../src/iOS/MaterialDatePickerRenderer.cs | 2 +- .../src/iOS/MaterialEditorRenderer.cs | 8 +- .../Material/src/iOS/MaterialFrameRenderer.cs | 2 +- .../src/iOS/MaterialMultiLineTextField.cs | 2 +- .../src/iOS/MaterialProgressBarRenderer.cs | 2 +- .../Material/src/iOS/MaterialTextManager.cs | 2 +- .../src/iOS/MaterialTimePickerRenderer.cs | 2 +- src/Controls/Foldable/test/TestDeviceInfo.cs | 8 +- .../Foldable/test/TestDualScreenService.cs | 4 +- .../test/TwoPaneViewNotSpannedTests.cs | 2 +- .../Foldable/test/TwoPaneViewSpannedTests.cs | 2 +- .../src/Core.Design/AttributeTableBuilder.cs | 10 +- .../FlexEnumDesignTypeConverters.cs | 6 +- .../FlowDirectionDesignTypeConverter.cs | 2 +- .../ItemsLayoutDesignTypeConverter.cs | 2 +- .../TableView/Windows/TableViewRenderer.cs | 6 +- .../Handlers/Windows/VisualElementRenderer.cs | 2 +- .../Windows/WindowsResourcesProvider.cs | 4 +- .../Core/HandlerImpl/Button/Button.Tizen.cs | 2 +- .../Core/HandlerImpl/Editor/Editor.Tizen.cs | 2 +- .../src/Core/HandlerImpl/Entry/Entry.Tizen.cs | 2 +- .../HandlerImpl/SearchBar/SearchBar.Tizen.cs | 2 +- .../VisualElement/VisualElement.Windows.cs | 6 +- .../Items/CarouselViewHandler.Windows.cs | 4 +- .../Items/CollectionViewHandler.Windows.cs | 2 +- .../Items/ItemsViewHandler.Windows.cs | 6 +- .../StructuredItemsViewHandler.Windows.cs | 2 +- .../Handlers/Shapes/Line/LineHandler.Tizen.cs | 2 +- .../Shapes/Line/LineHandler.Windows.cs | 2 +- .../Handlers/Shapes/Path/PathHandler.Tizen.cs | 2 +- .../Rectangle/RectangleHandler.Windows.cs | 2 +- .../Handlers/Shell/ShellHandler.Windows.cs | 2 +- .../Windows/ShellFlyoutTemplateSelector.cs | 4 +- .../Handlers/Shell/Windows/ShellFooterView.cs | 8 +- .../Handlers/Shell/Windows/ShellHeaderView.cs | 8 +- .../Handlers/Shell/Windows/ShellSplitView.cs | 10 +- .../Shell/Windows/ShellToolbarItemView.cs | 2 +- .../Shell/Windows/ViewToHandlerConverter.cs | 6 +- .../AlertManager/AlertManager.Windows.cs | 2 +- .../GestureManager/GestureManager.Windows.cs | 2 +- .../ModalNavigationManager.Tizen.cs | 2 +- .../Core/Platform/Tizen/GestureDetector.cs | 3 +- .../Tizen/Shell/ShellFlyoutItemAdaptor.cs | 2 +- .../Platform/Tizen/Shell/ShellItemView.cs | 4 +- .../Platform/Tizen/Shell/ShellSearchView.cs | 4 +- .../Tizen/Shell/ShellSectionHandler.cs | 4 +- .../Core/Platform/Tizen/Shell/ShellView.cs | 10 +- .../GroupFooterItemTemplateContext.cs | 4 +- .../CollectionView/GroupTemplateContext.cs | 2 +- .../GroupedItemTemplateCollection.cs | 2 +- .../CollectionView/ItemContentControl.cs | 2 +- .../CollectionView/ItemTemplateContext.cs | 2 +- .../ItemTemplateContextEnumerable.cs | 2 +- .../CollectionView/ItemTemplateContextList.cs | 4 +- .../ObservableItemTemplateCollection.cs | 8 +- .../Windows/CollectionView/ScrollHelpers.cs | 8 +- .../Extensions/AccessibilityExtensions.cs | 10 +- .../Extensions/AutoSuggestBoxExtensions.cs | 2 +- .../Windows/Extensions/BrushExtensions.cs | 2 +- .../Windows/Extensions/FontExtensions.cs | 2 +- .../Extensions/VisualElementExtensions.cs | 2 +- .../Core/Platform/Windows/FormsListView.cs | 10 +- .../Core/Platform/Windows/MauiCommandBar.cs | 4 +- .../src/Core/Platform/Windows/PageControl.cs | 30 +-- .../Windows/ToolbarPlacementHelper.cs | 2 +- .../Platform/Windows/VisualElementTracker.cs | 8 +- .../Core/Platform/iOS/DragAndDropDelegate.cs | 4 +- .../Elements/Label/LabelTests.Windows.cs | 2 +- .../Elements/Shell/ShellTests.Windows.cs | 2 +- .../Elements/Shell/ShellTests.iOS.cs | 2 +- .../Elements/Window/WindowTests.cs | 2 +- .../BindingDiagnosticsTests.xaml.cs | 2 +- .../src/Animations/PlatformTicker.Tizen.cs | 2 +- src/Core/src/Dispatching/Dispatcher.Tizen.cs | 2 +- .../src/Fonts/EmbeddedFontLoader.Tizen.cs | 2 +- src/Core/src/Fonts/FontManager.Tizen.cs | 4 +- .../src/Graphics/PaintExtensions.Windows.cs | 2 +- .../ContentView/ContentViewHandler.Windows.cs | 66 +++--- .../Handlers/Editor/EditorHandler.Tizen.cs | 2 +- .../GraphicsView/GraphicsViewHandler.Tizen.cs | 2 +- .../IndicatorViewHandler.Tizen.cs | 2 +- .../src/Handlers/Label/LabelHandler.Tizen.cs | 8 +- .../Handlers/Layout/LayoutHandler.Tizen.cs | 4 +- .../Handlers/Layout/LayoutHandler.Windows.cs | 10 +- .../NavigationViewHandler.Tizen.cs | 2 +- .../src/Handlers/Page/PageHandler.Tizen.cs | 2 +- .../Handlers/Picker/PickerHandler.Tizen.cs | 12 +- .../src/Handlers/Picker/PickerHandler.iOS.cs | 40 ++-- .../RefreshView/RefreshViewHandler.Windows.cs | 4 +- .../ScrollView/ScrollViewHandler.Tizen.cs | 4 +- .../ScrollView/ScrollViewHandler.Windows.cs | 8 +- .../SearchBar/SearchBarHandler.Windows.cs | 6 +- .../ShapeView/ShapeViewHandler.Tizen.cs | 2 +- .../Stepper/StepperHandler.Windows.cs | 24 +-- .../SwipeItemMenuItemHandler.Windows.cs | 2 +- .../SwipeView/SwipeViewHandler.Windows.cs | 4 +- .../TimePicker/TimePickerHandler.Tizen.cs | 2 +- .../src/Handlers/View/ViewHandler.Tizen.cs | 2 +- .../WebView/WebViewHandler.Windows.cs | 20 +- .../AppHostBuilderExtensions.Tizen.cs | 2 +- .../FileImageSourceService.Tizen.cs | 2 +- .../StreamImageSourceService.Tizen.cs | 2 +- .../UriImageSourceService.Tizen.cs | 2 +- .../src/Platform/Tizen/LabelExtensions.cs | 4 +- .../Tizen/PlatformTouchGraphicsView.cs | 11 +- .../src/Platform/Tizen/ShapeViewExtensions.cs | 2 +- .../src/Platform/Tizen/WindowExtensions.cs | 2 +- .../src/Platform/Windows/ButtonExtensions.cs | 4 +- .../Platform/Windows/CheckBoxExtensions.cs | 2 +- .../src/Platform/Windows/ColorConverter.cs | 4 +- .../src/Platform/Windows/ColorExtensions.cs | 2 +- .../Platform/Windows/CompositionImageBrush.cs | 106 +++++----- src/Core/src/Platform/Windows/LayoutPanel.cs | 4 +- .../Platform/Windows/LayoutPanelExtensions.cs | 4 +- .../src/Platform/Windows/MauiPageControl.cs | 4 +- .../Platform/Windows/MauiPasswordTextBox.cs | 2 +- .../src/Platform/Windows/PickerExtensions.cs | 6 +- .../src/Platform/Windows/PlatformMethods.cs | 6 +- .../Platform/Windows/RadioButtonExtensions.cs | 2 +- .../Platform/Windows/RootNavigationView.cs | 2 +- .../src/Platform/Windows/ShadowExtensions.cs | 14 +- .../src/Platform/Windows/SizeExtensions.cs | 4 +- .../src/Platform/Windows/StrokeExtensions.cs | 2 +- ...AlignmentToHorizontalAlignmentConverter.cs | 2 +- .../src/Platform/Windows/WebViewExtensions.cs | 8 +- src/Core/src/Platform/Windows/WrapperView.cs | 4 +- .../WindowOverlay/WindowOverlay.Windows.cs | 2 +- .../Layout/LayoutHandlerTests.Windows.cs | 8 +- .../RadioButtonHandlerTests.Windows.cs | 14 +- src/Essentials/src/Contacts/Contacts.tizen.cs | 2 +- .../src/Geocoding/Geocoding.tizen.cs | 2 +- src/Essentials/src/Map/Map.uwp.cs | 2 +- .../src/Platform/PlatformUtils.android.cs | 2 +- .../DeviceTests/Platforms/Windows/App.xaml.cs | 32 +-- src/ProfiledAot/src/CommonMethods.cs | 58 +++--- .../src/templates/maui-blazor/MauiProgram.cs | 4 +- .../maui-blazor/Platforms/Windows/App.xaml.cs | 18 +- .../templates/maui-mobile/AppShell.xaml.cs | 8 +- .../maui-mobile/Platforms/Windows/App.xaml.cs | 18 +- .../AssertionExtensions.Windows.cs | 2 +- 240 files changed, 923 insertions(+), 891 deletions(-) diff --git a/src/BlazorWebView/src/Maui/Tizen/WebViewContainer.cs b/src/BlazorWebView/src/Maui/Tizen/WebViewContainer.cs index 52b3a3423f67..beb14251deee 100644 --- a/src/BlazorWebView/src/Maui/Tizen/WebViewContainer.cs +++ b/src/BlazorWebView/src/Maui/Tizen/WebViewContainer.cs @@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.Components.WebView.Maui /// public class WebViewContainer : WidgetLayout { - + /// /// A Tizen WebView. /// diff --git a/src/BlazorWebView/src/Maui/Tizen/WebViewExtensions.cs b/src/BlazorWebView/src/Maui/Tizen/WebViewExtensions.cs index 4150989f1013..fcd21554eea7 100644 --- a/src/BlazorWebView/src/Maui/Tizen/WebViewExtensions.cs +++ b/src/BlazorWebView/src/Maui/Tizen/WebViewExtensions.cs @@ -7,18 +7,18 @@ namespace Microsoft.AspNetCore.Components.WebView.Maui /// /// WebViewExtension /// - internal static class WebViewExtensions - { - public const string ChromiumEwk = "libchromium-ewk.so"; + internal static class WebViewExtensions + { + public const string ChromiumEwk = "libchromium-ewk.so"; - public static void SetInterceptRequestCallback(this TWebView webView, InterceptRequestCallback callback) - { + public static void SetInterceptRequestCallback(this TWebView webView, InterceptRequestCallback callback) + { var context = webView.GetContext(); var handleField = context.GetType().GetField("_handle", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance); - var contextHandle = (IntPtr?)handleField?.GetValue(context); + var contextHandle = (IntPtr?)handleField?.GetValue(context); if (contextHandle != null) ewk_context_intercept_request_callback_set(contextHandle.Value, callback, IntPtr.Zero); - } + } public static void SetInspectorStart(this TWebView webView, uint port) { @@ -30,27 +30,27 @@ public static void SetInspectorStart(this TWebView webView, uint port) } public static bool SetInterceptRequestResponse(this TWebView webView, IntPtr request, string header, byte[] body, uint length) - { - return ewk_intercept_request_response_set(request, header, body, length); - } + { + return ewk_intercept_request_response_set(request, header, body, length); + } public static bool IgnoreInterceptRequest(this TWebView webView, IntPtr request) - { - return ewk_intercept_request_ignore(request); - } + { + return ewk_intercept_request_ignore(request); + } public static string GetInterceptRequestUrl(this TWebView webView, IntPtr request) { return Marshal.PtrToStringAnsi(_ewk_intercept_request_url_get(request)) ?? string.Empty; - } + } - [DllImport(ChromiumEwk)] + [DllImport(ChromiumEwk)] internal static extern IntPtr ewk_view_context_get(IntPtr obj); [UnmanagedFunctionPointer(CallingConvention.Cdecl)] - public delegate void InterceptRequestCallback(IntPtr context, IntPtr request, IntPtr userData); + public delegate void InterceptRequestCallback(IntPtr context, IntPtr request, IntPtr userData); - [DllImport(ChromiumEwk)] + [DllImport(ChromiumEwk)] internal static extern void ewk_context_intercept_request_callback_set(IntPtr context, InterceptRequestCallback callback, IntPtr userData); [DllImport(ChromiumEwk, EntryPoint = "ewk_intercept_request_url_get")] @@ -62,7 +62,7 @@ public static string GetInterceptRequestUrl(this TWebView webView, IntPtr reques internal static string ewk_intercept_request_http_method_get(IntPtr request) { return Marshal.PtrToStringAnsi(_ewk_intercept_request_http_method_get(request)) ?? string.Empty; - } + } [DllImport(ChromiumEwk)] public static extern uint ewk_context_inspector_server_start(IntPtr context, uint port); diff --git a/src/BlazorWebView/src/Maui/Windows/WinUIWebViewManager.cs b/src/BlazorWebView/src/Maui/Windows/WinUIWebViewManager.cs index 0572cb838ba5..640d8dac3382 100644 --- a/src/BlazorWebView/src/Maui/Windows/WinUIWebViewManager.cs +++ b/src/BlazorWebView/src/Maui/Windows/WinUIWebViewManager.cs @@ -132,7 +132,7 @@ protected override async Task HandleWebResourceRequest(CoreWebView2WebResourceRe await stream.WriteAsync(memStream.GetWindowsRuntimeBuffer()); } } - + var hotReloadedContent = Stream.Null; if (StaticContentHotReloadManager.TryReplaceResponseContent(_contentRootRelativeToAppRoot, requestUri, ref statusCode, ref hotReloadedContent, headers)) { diff --git a/src/BlazorWebView/src/SharedSource/BlazorWebViewDeveloperTools.cs b/src/BlazorWebView/src/SharedSource/BlazorWebViewDeveloperTools.cs index 0f088fb3d261..424fd1f3d22d 100644 --- a/src/BlazorWebView/src/SharedSource/BlazorWebViewDeveloperTools.cs +++ b/src/BlazorWebView/src/SharedSource/BlazorWebViewDeveloperTools.cs @@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Components.WebView.Maui #endif { internal class BlazorWebViewDeveloperTools - { - public bool Enabled { get; set; } = false; - } +{ + public bool Enabled { get; set; } = false; +} } diff --git a/src/BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs b/src/BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs index 20150d38c056..65765deacd7a 100644 --- a/src/BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs +++ b/src/BlazorWebView/src/SharedSource/BlazorWebViewServiceCollectionExtensions.cs @@ -54,14 +54,14 @@ public static IMauiBlazorWebViewBuilder AddMauiBlazorWebView(this IServiceCollec #endif } - /// - /// Enables Developer tools on the underlying WebView controls. - /// - /// The . - /// The . - public static IServiceCollection AddBlazorWebViewDeveloperTools(this IServiceCollection services) - { - return services.AddSingleton(new BlazorWebViewDeveloperTools { Enabled = true }); - } +/// +/// Enables Developer tools on the underlying WebView controls. +/// +/// The . +/// The . +public static IServiceCollection AddBlazorWebViewDeveloperTools(this IServiceCollection services) +{ + return services.AddSingleton(new BlazorWebViewDeveloperTools { Enabled = true }); +} } } diff --git a/src/BlazorWebView/tests/MauiDeviceTests/HandlerTestBase.Windows.cs b/src/BlazorWebView/tests/MauiDeviceTests/HandlerTestBase.Windows.cs index 08d4a8edb172..7d5a5988c169 100644 --- a/src/BlazorWebView/tests/MauiDeviceTests/HandlerTestBase.Windows.cs +++ b/src/BlazorWebView/tests/MauiDeviceTests/HandlerTestBase.Windows.cs @@ -7,7 +7,7 @@ namespace Microsoft.Maui.MauiBlazorWebView.DeviceTests public partial class HandlerTestBase { protected bool GetIsAccessibilityElement(IViewHandler viewHandler) => - ((AccessibilityView)((DependencyObject)viewHandler.PlatformView).GetValue(NativeAutomationProperties.AccessibilityViewProperty)) + ((AccessibilityView)((DependencyObject)viewHandler.PlatformView).GetValue(NativeAutomationProperties.AccessibilityViewProperty)) == AccessibilityView.Content; } } diff --git a/src/Compatibility/ControlGallery/src/EmbeddingTestBeds/Embedding.Droid/MainActivity.cs b/src/Compatibility/ControlGallery/src/EmbeddingTestBeds/Embedding.Droid/MainActivity.cs index 83f7c9699f8e..f437f30f87ec 100644 --- a/src/Compatibility/ControlGallery/src/EmbeddingTestBeds/Embedding.Droid/MainActivity.cs +++ b/src/Compatibility/ControlGallery/src/EmbeddingTestBeds/Embedding.Droid/MainActivity.cs @@ -33,8 +33,8 @@ protected override void OnCreate(Bundle bundle) Forms.Init(this, null); - SetContentView (Resource.Layout.Main); - + SetContentView(Resource.Layout.Main); + var ft = SupportFragmentManager.BeginTransaction(); ft.Replace(Resource.Id.fragment_frame_layout, new MainFragment(), "main"); ft.Commit(); @@ -54,7 +54,7 @@ public void ShowWebView() { if (_webview == null) { - _webview= new WebViewExample().CreateSupportFragment(this); + _webview = new WebViewExample().CreateSupportFragment(this); } ShowEmbeddedPageFragment(_webview); @@ -66,12 +66,12 @@ public void ShowOpenUri() _openUri = new OpenUri().CreateSupportFragment(this); } - ShowEmbeddedPageFragment(_openUri ); + ShowEmbeddedPageFragment(_openUri); } public void ShowAlertsAndActionSheets() { - if (_alertsAndActionSheets== null) + if (_alertsAndActionSheets == null) { _alertsAndActionSheets = new AlertsAndActionSheets().CreateSupportFragment(this); } @@ -85,7 +85,7 @@ void ShowEmbeddedPageFragment(Fragment fragment) ft.AddToBackStack(null); ft.Replace(Resource.Id.fragment_frame_layout, fragment, "hello"); - + ft.Commit(); } @@ -99,7 +99,7 @@ public class MainFragment : Fragment { public override View OnCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - var view = inflater.Inflate(Resource.Layout.MainFragment, container, false); + var view = inflater.Inflate(Resource.Layout.MainFragment, container, false); var showEmbeddedButton = view.FindViewById