Merge pull request #37 from uderline/bugfix/scoped-imports

Change imports to scoped packages

Author: jdnichollsc

src/ChromeTabsManagerActivity.ts

@@ -2,7 +2,7 @@ import Context = android.content.Context;
 import Intent = android.content.Intent;
 import Bundle = android.os.Bundle;
 
-import { Observable } from 'tns-core-modules/data/observable';
+import { Observable } from '@nativescript/core';
 
 export class ChromeTabsEvent extends Observable {
   public message: String;

src/InAppBrowser.android.ts

@@ -6,10 +6,7 @@ import Browser = android.provider.Browser;
 import Pattern = java.util.regex.Pattern;
 import AssertionError = java.lang.AssertionError;
 
-import { Color } from 'tns-core-modules/color';
-import { ad } from 'tns-core-modules/utils/utils';
-import { android as androidApp } from 'tns-core-modules/application';
-import { EventData } from 'tns-core-modules/data/observable';
+import { Color, Utils, Application, EventData } from '@nativescript/core';
 import {
   ChromeTabsEvent,
   BROWSER_ACTIVITY_EVENTS,
@@ -96,7 +93,7 @@ class InAppBrowserModule extends java.lang.Object {
       return Promise.resolve(result);
     }
 
-    this.currentActivity = androidApp.foregroundActivity || androidApp.startActivity;
+    this.currentActivity = Application.android.foregroundActivity || Application.android.startActivity;
     if (!this.currentActivity) {
       return Promise.reject(new Error(InAppBrowserModule.ERROR_CODE));
     }
@@ -128,7 +125,7 @@ class InAppBrowserModule extends java.lang.Object {
     if (inAppBrowserOptions[InAppBrowserModule.KEY_DEFAULT_SHARE_MENU_ITEM]) {
       builder.addDefaultShareMenuItem();
     }
-    const context = ad.getApplicationContext();
+    const context = Utils.android.getApplicationContext();
     if (inAppBrowserOptions[InAppBrowserModule.KEY_ANIMATIONS]) {
       const animations = inAppBrowserOptions[InAppBrowserModule.KEY_ANIMATIONS];
       this.applyAnimation(context, builder, animations);

src/InAppBrowser.ios.ts

@@ -1,5 +1,4 @@
-import { Color } from 'tns-core-modules/color';
-import { ios } from 'tns-core-modules/utils/utils';
+import { Color, Utils } from '@nativescript/core';
 
 import {
   BrowserResult,
@@ -46,7 +45,7 @@ const getPresentationStyle = function (styleKey: string): UIModalPresentationSty
     overCurrentContext: UIModalPresentationStyle.OverCurrentContext,
     popover: UIModalPresentationStyle.Popover
   };
-  const defaultModalPresentationStyle = ios.MajorVersion >= 13 ?
+  const defaultModalPresentationStyle = Utils.ios.MajorVersion >= 13 ?
     UIModalPresentationStyle.Automatic : UIModalPresentationStyle.FullScreen;
   return styles[styleKey] !== undefined ? styles[styleKey] : defaultModalPresentationStyle;
 };
@@ -65,7 +64,7 @@ const DEFAULT_PROTOCOLS = [
   SFSafariViewControllerDelegate,
   UIAdaptivePresentationControllerDelegate
 ];
-const protocols = ios.MajorVersion >= 13 ? [
+const protocols = Utils.ios.MajorVersion >= 13 ? [
   ...DEFAULT_PROTOCOLS,
   ASWebAuthenticationPresentationContextProviding
 ] : DEFAULT_PROTOCOLS;
@@ -81,7 +80,7 @@ class InAppBrowserModule extends NSObject {
   private animated = false;
 
   public isAvailable(): Promise<boolean> {
-    return Promise.resolve(ios.MajorVersion >= 9);
+    return Promise.resolve(Utils.ios.MajorVersion >= 9);
   }
   public open(
     authURL: string,
@@ -94,7 +93,7 @@ class InAppBrowserModule extends NSObject {
       this.animated = inAppBrowserOptions.animated;
 
       const url = NSURL.URLWithString(inAppBrowserOptions['url']);
-      if (ios.MajorVersion >= 11) {
+      if (Utils.ios.MajorVersion >= 11) {
         const config = SFSafariViewControllerConfiguration.alloc().init();
         config.barCollapsingEnabled = inAppBrowserOptions.enableBarCollapsing;
         config.entersReaderIfAvailable = inAppBrowserOptions.readerMode;
@@ -107,7 +106,7 @@ class InAppBrowserModule extends NSObject {
       }
       this.safariVC.delegate = this;
 
-      if (ios.MajorVersion >= 11) {
+      if (Utils.ios.MajorVersion >= 11) {
         if (inAppBrowserOptions.dismissButtonStyle === 'done') {
           this.safariVC.dismissButtonStyle = SFSafariViewControllerDismissButtonStyle.Done;
         }
@@ -119,7 +118,7 @@ class InAppBrowserModule extends NSObject {
         }
       }
 
-      if (ios.MajorVersion >= 10) {
+      if (Utils.ios.MajorVersion >= 10) {
         if (inAppBrowserOptions.preferredBarTintColor) {
           this.safariVC.preferredBarTintColor = new Color(inAppBrowserOptions.preferredBarTintColor).ios;
         }
@@ -138,7 +137,7 @@ class InAppBrowserModule extends NSObject {
         if (this.animated) {
           safariHackVC.modalTransitionStyle = getTransitionStyle(inAppBrowserOptions.modalTransitionStyle);
         }
-        if (ios.MajorVersion >= 13) {
+        if (Utils.ios.MajorVersion >= 13) {
           safariHackVC.modalInPresentation = true;
           if (safariHackVC['setModalInPresentation'])
             safariHackVC['setModalInPresentation'](true);
@@ -172,13 +171,13 @@ class InAppBrowserModule extends NSObject {
       ...options,
       ephemeralWebSession: options.ephemeralWebSession !== undefined ? options.ephemeralWebSession : false,
     };
-    if (ios.MajorVersion >= 11) {
+    if (Utils.ios.MajorVersion >= 11) {
       return new Promise<AuthSessionResult>((resolve, reject) => {
         if (!this.initializeWebBrowser(resolve, reject)) return;
 
         const url = NSURL.URLWithString(authUrl);
         this.authSession = (
-          ios.MajorVersion >= 12 ? ASWebAuthenticationSession : SFAuthenticationSession
+          Utils.ios.MajorVersion >= 12 ? ASWebAuthenticationSession : SFAuthenticationSession
         ).alloc().initWithURLCallbackURLSchemeCompletionHandler(
           url,
           redirectUrl,
@@ -197,7 +196,7 @@ class InAppBrowserModule extends NSObject {
             this.flowDidFinish();
           }
         );
-        if (ios.MajorVersion >= 13) {
+        if (Utils.ios.MajorVersion >= 13) {
           const webAuthSession = this.authSession as ASWebAuthenticationSession;
           // Prevent re-use cookie from last auth session
           webAuthSession.prefersEphemeralWebBrowserSession = inAppBrowserOptions.ephemeralWebSession;
@@ -216,7 +215,7 @@ class InAppBrowserModule extends NSObject {
     }
   }
   public closeAuth() {
-    if (ios.MajorVersion >= 11) {
+    if (Utils.ios.MajorVersion >= 11) {
       const authSession: SFAuthenticationSession | ASWebAuthenticationSession = this.authSession;
       authSession.cancel();
       if (this.redirectResolve) {

src/package-lock.json

@@ -57,7 +57,7 @@
 	"license": "MIT",
 	"homepage": "https://github.com/proyecto26/nativescript-inappbrowser",
 	"devDependencies": {
-		"tns-core-modules": "^6.5.1",
+		"@nativescript/core": "^6.5.1",
 		"tns-platform-declarations": "^6.5.1",
 		"typescript": "~3.8.3",
 		"prompt": "^1.0.0",

src/package.json

@@ -3,14 +3,11 @@ import Intent = android.content.Intent;
 import NfcAdapter = android.nfc.NfcAdapter;
 
 import {
-  on as onEvent,
-  off as offEvent,
-  android as androidApp,
-  resumeEvent,
+  Application,
   ApplicationEventData,
   AndroidApplication,
   AndroidActivityEventData
-} from 'tns-core-modules/application';
+} from '@nativescript/core';
 import {
   RedirectResult,
   BrowserResult,
@@ -55,7 +52,7 @@ function _waitForRedirectAsync(
         resolve({ url: url, type: BROWSER_TYPES.SUCCESS });
       }
     };
-    onEvent(resumeEvent, _redirectHandler);
+    Application.on(Application.resumeEvent, _redirectHandler);
   });
 }
 
@@ -82,8 +79,8 @@ function _checkResultAndReturnUrl(
   result: AuthSessionResult
 ): Promise<AuthSessionResult> {
   return new Promise(function(resolve) {
-    if (androidApp && result.type !== BROWSER_TYPES.CANCEL) {
-      androidApp.once(
+    if (Application.android && result.type !== BROWSER_TYPES.CANCEL) {
+      Application.android.once(
         AndroidApplication.activityResumedEvent,
         function(args: AndroidActivityEventData) {
           const url = getInitialURL(args.activity);
@@ -100,7 +97,7 @@ function _checkResultAndReturnUrl(
 
 export function closeAuthSessionPolyfillAsync(): void {
   if (_redirectHandler) {
-    offEvent(resumeEvent, _redirectHandler);
+    Application.off(Application.resumeEvent, _redirectHandler);
     _redirectHandler = null;
   }
 }