Skip to content

Commit 9b9199e

Browse files
Support for JS Application\Activity
1 parent 7345f72 commit 9b9199e

File tree

6 files changed

+9
-190
lines changed

6 files changed

+9
-190
lines changed

demo/app/App_Resources/Android/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
android:label="@string/app_name"
2626
android:theme="@style/AppTheme" >
2727
<activity
28-
android:name="com.tns.NativeScriptActivity"
28+
android:name="org.myApp.MainActivity"
2929
android:label="@string/title_activity_kimera"
3030
android:configChanges="keyboardHidden|orientation|screenSize">
3131

demo/app/activity.android.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import {setActivityCallbacks, AndroidActivityCallbacks} from "ui/frame";
1+
import * as frame from "ui/frame";
22

33
@JavaProxy("org.myApp.MainActivity")
44
class Activity extends android.app.Activity {
5-
private _callbacks: AndroidActivityCallbacks;
5+
private _callbacks: frame.AndroidActivityCallbacks;
66

77
protected onCreate(savedInstanceState: android.os.Bundle): void {
88
if (!this._callbacks) {
9-
setActivityCallbacks(this);
9+
(<any>frame).setActivityCallbacks(this); //hack around the private issue https://github.com/NativeScript/NativeScript/issues/2526
1010
}
1111

1212
this._callbacks.onCreate(this, savedInstanceState, super.onCreate);

demo/app/application.android.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*import * as application from "application";
1+
import * as application from "application";
22

33
// the `JavaProxy` decorator specifies the package and the name for the native *.JAVA file generated.
44
@JavaProxy("org.myApp.Application")
@@ -41,4 +41,3 @@ class Application extends android.app.Application{
4141
// android.support.multidex.MultiDex.install(this);
4242
}
4343
}
44-
*/

demo/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"nativescript": {
33
"id": "org.nativescript.demo",
4-
"tns-android": {
5-
"version": "2.2.0"
6-
},
74
"tns-ios": {
85
"version": "2.2.1"
6+
},
7+
"tns-android": {
8+
"version": "2.2.0"
99
}
1010
},
1111
"dependencies": {
@@ -21,4 +21,4 @@
2121
"nativescript-dev-typescript": "^0.3.2",
2222
"typescript": "^1.8.10"
2323
}
24-
}
24+
}

plugin/platforms/android/NativeScriptActivity.java

-107
This file was deleted.

plugin/platforms/android/NativeScriptApplication.java

-73
This file was deleted.

0 commit comments

Comments
 (0)