javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor the application module to prevent cyclic dependencies, which were:

Browse Source 
* common requires application
* application requires common
* application requires application
Make the exports typed using @hdeshev way.
This commit is contained in:
atanasovg
2016-01-14 13:43:35 +02:00
parent d916d76b30
commit 935939bb51
4 changed files with 110 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
application/application.android.ts
View File

@@ -1,17 +1,17 @@
import appModule = require("./application-common");
import dts = require("application");
import definition = require("application");
import frame = require("ui/frame");
import observable = require("data/observable");
import * as typesModule from "utils/types";
import * as fileResolverModule from "file-system/file-name-resolver";
global.moduleMerge(appModule, exports);
var typedExports: typeof definition = exports;
// We are using the exports object for the common events since we merge the appModule with this module's exports, which is what users will receive when require("application") is called;
// TODO: This is kind of hacky and is "pure JS in TypeScript"
var initEvents = function () {
var androidApp: dts.AndroidApplication = exports.android;
// TODO: Verify whether the logic for triggerring application-wide events based on Activity callbacks is working properly
var lifecycleCallbacks = new android.app.Application.ActivityLifecycleCallbacks({
onActivityCreated: function (activity: any, bundle: any) {
@@ -22,7 +22,7 @@ var initEvents = function () {
if (!androidApp.startActivity) {
androidApp.startActivity = activity;
androidApp.notify(<dts.AndroidActivityBundleEventData>{ eventName: "activityCreated", object: androidApp, activity: activity, bundle: bundle });
androidApp.notify(<definition.AndroidActivityBundleEventData>{ eventName: "activityCreated", object: androidApp, activity: activity, bundle: bundle });
if (androidApp.onActivityCreated) {
androidApp.onActivityCreated(activity, bundle);
@@ -47,16 +47,16 @@ var initEvents = function () {
}
if (activity === androidApp.startActivity) {
if (exports.onExit) {
exports.onExit();
if (typedExports.onExit) {
typedExports.onExit();
}
exports.notify(<dts.ApplicationEventData>{ eventName: dts.exitEvent, object: androidApp, android: activity });
typedExports.notify(<definition.ApplicationEventData>{ eventName: typedExports.exitEvent, object: androidApp, android: activity });
androidApp.startActivity = undefined;
}
androidApp.notify(<dts.AndroidActivityEventData>{ eventName: "activityDestroyed", object: androidApp, activity: activity });
androidApp.notify(<definition.AndroidActivityEventData>{ eventName: "activityDestroyed", object: androidApp, activity: activity });
if (androidApp.onActivityDestroyed) {
androidApp.onActivityDestroyed(activity);
@@ -71,17 +71,17 @@ var initEvents = function () {
return;
}
(<any>androidApp).paused = true;
androidApp.paused = true;
if (activity === androidApp.foregroundActivity) {
if (exports.onSuspend) {
exports.onSuspend();
if (typedExports.onSuspend) {
typedExports.onSuspend();
}
exports.notify(<dts.ApplicationEventData>{ eventName: dts.suspendEvent, object: androidApp, android: activity });
typedExports.notify(<definition.ApplicationEventData>{ eventName: typedExports.suspendEvent, object: androidApp, android: activity });
}
androidApp.notify(<dts.AndroidActivityEventData>{ eventName: "activityPaused", object: androidApp, activity: activity });
androidApp.notify(<definition.AndroidActivityEventData>{ eventName: "activityPaused", object: androidApp, activity: activity });
if (androidApp.onActivityPaused) {
androidApp.onActivityPaused(activity);
@@ -93,17 +93,17 @@ var initEvents = function () {
return;
}
(<any>androidApp).paused = false;
androidApp.paused = false;
if (activity === androidApp.foregroundActivity) {
if (exports.onResume) {
exports.onResume();
if (typedExports.onResume) {
typedExports.onResume();
}
exports.notify(<dts.ApplicationEventData>{ eventName: dts.resumeEvent, object: androidApp, android: activity });
typedExports.notify(<definition.ApplicationEventData>{ eventName: typedExports.resumeEvent, object: androidApp, android: activity });
}
androidApp.notify(<dts.AndroidActivityEventData>{ eventName: "activityResumed", object: androidApp, activity: activity });
androidApp.notify(<definition.AndroidActivityEventData>{ eventName: "activityResumed", object: androidApp, activity: activity });
if (androidApp.onActivityResumed) {
androidApp.onActivityResumed(activity);
@@ -115,7 +115,7 @@ var initEvents = function () {
return;
}
androidApp.notify(<dts.AndroidActivityBundleEventData>{ eventName: "saveActivityState", object: androidApp, activity: activity, bundle: bundle });
androidApp.notify(<definition.AndroidActivityBundleEventData>{ eventName: "saveActivityState", object: androidApp, activity: activity, bundle: bundle });
if (androidApp.onSaveActivityState) {
androidApp.onSaveActivityState(activity, bundle);
@@ -129,7 +129,7 @@ var initEvents = function () {
androidApp.foregroundActivity = activity;
androidApp.notify(<dts.AndroidActivityEventData>{ eventName: "activityStarted", object: androidApp, activity: activity });
androidApp.notify(<definition.AndroidActivityEventData>{ eventName: "activityStarted", object: androidApp, activity: activity });
if (androidApp.onActivityStarted) {
androidApp.onActivityStarted(activity);
@@ -141,7 +141,7 @@ var initEvents = function () {
return;
}
androidApp.notify(<dts.AndroidActivityEventData>{ eventName: "activityStopped", object: androidApp, activity: activity });
androidApp.notify(<definition.AndroidActivityEventData>{ eventName: "activityStopped", object: androidApp, activity: activity });
if (androidApp.onActivityStopped) {
androidApp.onActivityStopped(activity);
@@ -155,15 +155,15 @@ var initEvents = function () {
app.init({
getActivity: function (activity: android.app.Activity) {
var intent = activity.getIntent()
return exports.android.getActivity(intent);
return androidApp.getActivity(intent);
},
onCreate: function () {
exports.android.init(this);
androidApp.init(this);
}
});
export class AndroidApplication extends observable.Observable implements dts.AndroidApplication {
export class AndroidApplication extends observable.Observable implements definition.AndroidApplication {
public static activityCreatedEvent = "activityCreated";
public static activityDestroyedEvent = "activityDestroyed";
public static activityStartedEvent = "activityStarted";
@@ -174,6 +174,7 @@ export class AndroidApplication extends observable.Observable implements dts.And
public static activityResultEvent = "activityResult";
public static activityBackPressedEvent = "activityBackPressed";
public paused: boolean;
public nativeApp: android.app.Application;
public context: android.content.Context;
public currentContext: android.content.Context;
@@ -203,11 +204,11 @@ export class AndroidApplication extends observable.Observable implements dts.And
public getActivity(intent: android.content.Intent): Object {
if (intent && intent.getAction() === android.content.Intent.ACTION_MAIN) {
// application's main activity
if (exports.onLaunch) {
exports.onLaunch(intent);
if (typedExports.onLaunch) {
typedExports.onLaunch(intent);
}
exports.notify({ eventName: dts.launchEvent, object: this, android: intent });
typedExports.notify({ eventName: typedExports.launchEvent, object: this, android: intent });
setupOrientationListener(this);
@@ -221,9 +222,9 @@ export class AndroidApplication extends observable.Observable implements dts.And
var topFrame = frame.topmost();
if (!topFrame) {
// try to navigate to the mainEntry/Module (if specified)
var navParam = dts.mainEntry;
var navParam = typedExports.mainEntry;
if (!navParam) {
navParam = dts.mainModule;
navParam = typedExports.mainModule;
}
if (navParam) {
@@ -304,25 +305,31 @@ class BroadcastReceiver extends android.content.BroadcastReceiver {
}
}
global.__onUncaughtError = function (error: Error) {
global.__onUncaughtError = function (error: definition.NativeScriptError) {
var types: typeof typesModule = require("utils/types");
// TODO: Obsolete this
if (types.isFunction(exports.onUncaughtError)) {
exports.onUncaughtError(error);
if (types.isFunction(typedExports.onUncaughtError)) {
typedExports.onUncaughtError(error);
}
exports.notify({ eventName: dts.uncaughtErrorEvent, object: appModule.android, android: error });
typedExports.notify({ eventName: typedExports.uncaughtErrorEvent, object: appModule.android, android: error });
}
exports.start = function (entry?: frame.NavigationEntry) {
if (entry) {
dts.mainEntry = entry;
function loadCss() {
typedExports.cssSelectorsCache = typedExports.loadCss(typedExports.cssFile);
}
export function start(entry?: frame.NavigationEntry) {
if (entry) {
typedExports.mainEntry = entry;
}
dts.loadCss();
loadCss();
}
exports.android = new AndroidApplication();
var androidApp = new AndroidApplication();
// use the exports object instead of 'export var' due to global namespace collision
typedExports.android = androidApp;
var currentOrientation: number;
function setupOrientationListener(androidApp: AndroidApplication) {
@@ -350,17 +357,17 @@ function onConfigurationChanged(context: android.content.Context, intent: androi
break;
}
exports.notify(<dts.OrientationChangedEventData>{
eventName: dts.orientationChangedEvent,
typedExports.notify(<definition.OrientationChangedEventData>{
eventName: typedExports.orientationChangedEvent,
android: context,
newValue: newValue,
object: exports.android,
object: typedExports.android,
});
}
}
global.__onLiveSync = function () {
if (exports.android && exports.android.paused) {
if (typedExports.android && typedExports.android.paused) {
return;
}
@@ -370,7 +377,7 @@ global.__onLiveSync = function () {
fileResolver.clearCache();
// Reload app.css in case it was changed.
appModule.loadCss();
loadCss();
// Reload current page.
frame.reloadPage();