Skip to content
This repository was archived by the owner on Aug 7, 2021. It is now read-only.

fix: migrate demo apps to android x #931

Merged
merged 1 commit into from
Jun 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions demo/AngularApp/app/activity.android.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import {setActivityCallbacks, AndroidActivityCallbacks} from "tns-core-modules/ui/frame";
import { setActivityCallbacks, AndroidActivityCallbacks } from "tns-core-modules/ui/frame";

@JavaProxy("org.myApp.MainActivity")
class Activity extends android.support.v7.app.AppCompatActivity {
class Activity extends androidx.appcompat.app.AppCompatActivity {
public isNativeScriptActivity: boolean;
private _callbacks: AndroidActivityCallbacks;

protected onCreate(savedInstanceState: any): void { // android.os.Bundle
// Set isNativeScriptActivity in onCreate (as done in the original NativeScript activity code).
// The JS constructor might not be called because the activity is created from Android.
this.isNativeScriptActivity = true;

if (!this._callbacks) {
setActivityCallbacks(this);
}
Expand Down
1 change: 1 addition & 0 deletions demo/AngularApp/app/application.d.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
declare const android: any;
declare const androidx: any;
4 changes: 2 additions & 2 deletions demo/JavaScriptApp/app/activity.android.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const frame = require("ui/frame");

const superProto = android.support.v7.app.AppCompatActivity.prototype;
android.support.v7.app.AppCompatActivity.extend("org.myApp.MainActivity", {
const superProto = androidx.appcompat.app.AppCompatActivity.prototype;
androidx.appcompat.app.AppCompatActivity.extend("org.myApp.MainActivity", {
onCreate: function(savedInstanceState) {
// Set isNativeScriptActivity in onCreate.
// The JS constructor might not be called because the activity is created from Android.
Expand Down
2 changes: 1 addition & 1 deletion demo/TypeScriptApp/app/activity.android.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {setActivityCallbacks, AndroidActivityCallbacks} from "ui/frame";

@JavaProxy("org.myApp.MainActivity")
class Activity extends android.support.v7.app.AppCompatActivity {
class Activity extends androidx.appcompat.app.AppCompatActivity {
public isNativeScriptActivity: boolean;
private _callbacks: AndroidActivityCallbacks;
protected onCreate(savedInstanceState: any): void { // android.os.Bundle
Expand Down
1 change: 1 addition & 0 deletions demo/TypeScriptApp/app/application.d.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
declare const android: any;
declare const androidx: any;
3 changes: 3 additions & 0 deletions demo/TypeScriptApp/nsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"useLegacyWorkflow": false
}