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

Commit 1699b94

Browse files
Merge pull request #931 from NativeScript/tachev/androidx
fix: migrate demo apps to android x
2 parents daa04fb + c2d6684 commit 1699b94

File tree

6 files changed

+11
-6
lines changed

6 files changed

+11
-6
lines changed

demo/AngularApp/app/activity.android.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import {setActivityCallbacks, AndroidActivityCallbacks} from "tns-core-modules/ui/frame";
1+
import { setActivityCallbacks, AndroidActivityCallbacks } from "tns-core-modules/ui/frame";
22

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

88
protected onCreate(savedInstanceState: any): void { // android.os.Bundle
99
// Set isNativeScriptActivity in onCreate (as done in the original NativeScript activity code).
1010
// The JS constructor might not be called because the activity is created from Android.
1111
this.isNativeScriptActivity = true;
12-
12+
1313
if (!this._callbacks) {
1414
setActivityCallbacks(this);
1515
}

demo/AngularApp/app/application.d.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
declare const android: any;
2+
declare const androidx: any;

demo/JavaScriptApp/app/activity.android.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const frame = require("ui/frame");
22

3-
const superProto = android.support.v7.app.AppCompatActivity.prototype;
4-
android.support.v7.app.AppCompatActivity.extend("org.myApp.MainActivity", {
3+
const superProto = androidx.appcompat.app.AppCompatActivity.prototype;
4+
androidx.appcompat.app.AppCompatActivity.extend("org.myApp.MainActivity", {
55
onCreate: function(savedInstanceState) {
66
// Set isNativeScriptActivity in onCreate.
77
// The JS constructor might not be called because the activity is created from Android.

demo/TypeScriptApp/app/activity.android.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {setActivityCallbacks, AndroidActivityCallbacks} from "ui/frame";
22

33
@JavaProxy("org.myApp.MainActivity")
4-
class Activity extends android.support.v7.app.AppCompatActivity {
4+
class Activity extends androidx.appcompat.app.AppCompatActivity {
55
public isNativeScriptActivity: boolean;
66
private _callbacks: AndroidActivityCallbacks;
77
protected onCreate(savedInstanceState: any): void { // android.os.Bundle
+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
declare const android: any;
2+
declare const androidx: any;

demo/TypeScriptApp/nsconfig.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"useLegacyWorkflow": false
3+
}

0 commit comments

Comments
 (0)