Skip to content
This repository was archived by the owner on Aug 7, 2021. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit e4131c6

Browse files
committedNov 5, 2018
extended activity related code updated
1 parent 5dbdbdc commit e4131c6

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed
 

‎demo/AngularApp/app/activity.android.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@ import {setActivityCallbacks, AndroidActivityCallbacks} from "ui/frame";
22

33
@JavaProxy("org.myApp.MainActivity")
44
class Activity extends android.support.v7.app.AppCompatActivity {
5+
public isNativeScriptActivity: boolean;
56
private _callbacks: AndroidActivityCallbacks;
67

78
protected onCreate(savedInstanceState: any): void { // android.os.Bundle
9+
// Set isNativeScriptActivity in onCreate (as done in the original NativeScript activity code).
10+
// The JS constructor might not be called because the activity is created from Android.
11+
this.isNativeScriptActivity = true;
12+
813
if (!this._callbacks) {
914
setActivityCallbacks(this);
1015
}

‎demo/JavaScriptApp/app/activity.android.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ const frame = require("ui/frame");
33
const superProto = android.support.v7.app.AppCompatActivity.prototype;
44
android.support.v7.app.AppCompatActivity.extend("org.myApp.MainActivity", {
55
onCreate: function(savedInstanceState) {
6+
// Set isNativeScriptActivity in onCreate.
7+
// The JS constructor might not be called because the activity is created from Android.
8+
this.isNativeScriptActivity = true;
9+
610
if(!this._callbacks) {
711
frame.setActivityCallbacks(this);
812
}

‎demo/TypeScriptApp/app/activity.android.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@ import {setActivityCallbacks, AndroidActivityCallbacks} from "ui/frame";
22

33
@JavaProxy("org.myApp.MainActivity")
44
class Activity extends android.support.v7.app.AppCompatActivity {
5+
public isNativeScriptActivity: boolean;
56
private _callbacks: AndroidActivityCallbacks;
6-
7+
78
protected onCreate(savedInstanceState: any): void { // android.os.Bundle
9+
// Set isNativeScriptActivity in onCreate (as done in the original NativeScript activity code).
10+
// The JS constructor might not be called because the activity is created from Android.
11+
this.isNativeScriptActivity = true;
12+
813
if (!this._callbacks) {
914
setActivityCallbacks(this);
1015
}

0 commit comments

Comments
 (0)
This repository has been archived.