Skip to content

Commit

Permalink
- fix removing of Init apis
Browse files Browse the repository at this point in the history
  • Loading branch information
PureWeen committed Jun 18, 2021
1 parent a6b77b4 commit 8ed1c7c
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ protected override void OnCreate(Bundle bundle)
// reflection will stop working
ResourceManager.Init(null);

Microsoft.Maui.Controls.Compatibility.Forms.Init(this, bundle);
FormsMaps.Init(this, bundle);
//Microsoft.Maui.Controls.Compatibility.Forms.Init(this, bundle);
//FormsMaps.Init(this, bundle);

#if ENABLE_TEST_CLOUD
ViewHandler
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ namespace Microsoft.Maui.Controls.Compatibility.ControlGallery.Android
[Activity(Label = "Issue10182Activity", Icon = "@drawable/icon", Theme = "@style/MyTheme",
MainLauncher = false, HardwareAccelerated = true,
ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.UiMode)]
public class Issue10182Activity : Microsoft.Maui.Controls.Compatibility.Platform.Android.FormsAppCompatActivity
public class Issue10182Activity : MauiAppCompatActivity
{
Activity1 _activity1;
protected override void OnCreate(Bundle savedInstanceState)
{
var currentApplication = Microsoft.Maui.Controls.Application.Current;
TabLayoutResource = Resource.Layout.Tabbar;
ToolbarResource = Resource.Layout.Toolbar;
//TabLayoutResource = Resource.Layout.Tabbar;
//ToolbarResource = Resource.Layout.Toolbar;

base.OnCreate(savedInstanceState);

Microsoft.Maui.Controls.Compatibility.Forms.Init(this, savedInstanceState);
LoadApplication(new Issue10182Application());
//Microsoft.Maui.Controls.Compatibility.Forms.Init(this, savedInstanceState);
// LoadApplication(new Issue10182Application());

_activity1 = (Activity1)DependencyService.Resolve<Context>();

Expand Down
4 changes: 2 additions & 2 deletions src/Compatibility/ControlGallery/src/iOS/AppDelegate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ public override bool FinishedLaunching(UIApplication uiApplication, NSDictionary
Xamarin.Calabash.Start();
#endif

Forms.Init();
FormsMaps.Init();
//Forms.Init();
//FormsMaps.Init();
//FormsMaterial.Init();

Forms.ViewInitialized += (object sender, ViewInitializedEventArgs e) =>
Expand Down

0 comments on commit 8ed1c7c

Please sign in to comment.