From c2d6684e7d59467d6b4726cb7ad47aa8e6190ef0 Mon Sep 17 00:00:00 2001
From: DimitarTachev <nevermindd7@gmail.com>
Date: Tue, 11 Jun 2019 14:27:53 +0300
Subject: [PATCH] fix: migrate demo apps to android x

---
 demo/AngularApp/app/activity.android.ts    | 6 +++---
 demo/AngularApp/app/application.d.ts       | 1 +
 demo/JavaScriptApp/app/activity.android.js | 4 ++--
 demo/TypeScriptApp/app/activity.android.ts | 2 +-
 demo/TypeScriptApp/app/application.d.ts    | 1 +
 demo/TypeScriptApp/nsconfig.json           | 3 +++
 6 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 demo/TypeScriptApp/nsconfig.json

diff --git a/demo/AngularApp/app/activity.android.ts b/demo/AngularApp/app/activity.android.ts
index 7b86ae14..b24857a8 100644
--- a/demo/AngularApp/app/activity.android.ts
+++ b/demo/AngularApp/app/activity.android.ts
@@ -1,7 +1,7 @@
-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;
 
@@ -9,7 +9,7 @@ class Activity extends android.support.v7.app.AppCompatActivity {
         // 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);
         }
diff --git a/demo/AngularApp/app/application.d.ts b/demo/AngularApp/app/application.d.ts
index 3cb28cfd..a5e42f2c 100644
--- a/demo/AngularApp/app/application.d.ts
+++ b/demo/AngularApp/app/application.d.ts
@@ -1 +1,2 @@
 declare const android: any;
+declare const androidx: any;
diff --git a/demo/JavaScriptApp/app/activity.android.js b/demo/JavaScriptApp/app/activity.android.js
index e4e91d8b..14120ab4 100644
--- a/demo/JavaScriptApp/app/activity.android.js
+++ b/demo/JavaScriptApp/app/activity.android.js
@@ -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.
diff --git a/demo/TypeScriptApp/app/activity.android.ts b/demo/TypeScriptApp/app/activity.android.ts
index 5f11bfa4..2bbd6398 100644
--- a/demo/TypeScriptApp/app/activity.android.ts
+++ b/demo/TypeScriptApp/app/activity.android.ts
@@ -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
diff --git a/demo/TypeScriptApp/app/application.d.ts b/demo/TypeScriptApp/app/application.d.ts
index 3cb28cfd..a5e42f2c 100644
--- a/demo/TypeScriptApp/app/application.d.ts
+++ b/demo/TypeScriptApp/app/application.d.ts
@@ -1 +1,2 @@
 declare const android: any;
+declare const androidx: any;
diff --git a/demo/TypeScriptApp/nsconfig.json b/demo/TypeScriptApp/nsconfig.json
new file mode 100644
index 00000000..a6d75472
--- /dev/null
+++ b/demo/TypeScriptApp/nsconfig.json
@@ -0,0 +1,3 @@
+{
+	"useLegacyWorkflow": false
+}
\ No newline at end of file