Merge pull request #1230 from NativeScript/trifonov/use-appcompat-activity

Use AppCompatActivity instead of Activity

Author: vtrifonov

test-app/app/src/debug/java/com/tns/ErrorReport.java

@@ -22,7 +22,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;

test-app/app/src/main/assets/app/MyActivity.js

@@ -13,7 +13,7 @@
 	}
 	
 	@JavaProxy("com.tns.NativeScriptActivity")
-	class MyActivity extends android.app.Activity
+	class MyActivity extends android.support.v7.app.AppCompatActivity
 	{
 		onCreate(bundle: android.os.Bundle) 
 		{
@@ -61,4 +61,4 @@ var MyActivity = (function (_super) {
         JavaProxy("com.tns.NativeScriptActivity")
     ], MyActivity);
     return MyActivity;
-})(android.app.Activity);
+})(android.support.v7.app.AppCompatActivity);

test-app/build-tools/jsparser/tests/cases/decorated_double_assignment_ts/app/myCustomActivity.android.ts

@@ -1,7 +1,7 @@
 import Bundle = android.os.Bundle;
 
 @JavaProxy('org.nativescript.MyCustomActivity')
-export class TestActivity extends android.app.Activity {
+export class TestActivity extends android.support.v7.app.AppCompatActivity {
     static readonly TEST1: string = "my_test";
     public onCreate(savedInstanceState?: Bundle): void {
         super.onCreate(savedInstanceState);

test-app/build-tools/jsparser/tests/cases/decorated_double_assignment_ts/app/myCustomActivity_ts.android.js

@@ -16,5 +16,5 @@ var TestActivity = (function (_super) {
         JavaProxy('org.nativescript.MyCustomActivity')
     ], TestActivity);
     return TestActivity;
-}(android.app.Activity));
+}(android.support.v7.app.AppCompatActivity));
 exports.TestActivity = TestActivity;

test-app/build-tools/static-binding-generator/src/main/java/org/nativescript/staticbindinggenerator/Generator.java

@@ -13,6 +13,7 @@
 import java.nio.file.Paths;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -747,15 +748,17 @@ private boolean isApplicationClass(JavaClass clazz, Map<String, JavaClass> class
     private boolean isActivityClass(JavaClass clazz, Map<String, JavaClass> classes) throws ClassNotFoundException {
         boolean isActivityClass = false;
 
-        String activityClassname = "android.app.Activity";
+        List<String> activityClassNames = Arrays.asList("android.app.Activity", "android.support.v7.app.AppCompatActivity", "androidx.appcompat.app.AppCompatActivity");
 
         JavaClass currentClass = clazz;
         while (true) {
             String currentClassname = currentClass.getClassName();
 
-            isActivityClass = currentClassname.equals(activityClassname);
-            if (isActivityClass) {
-                break;
+            for (String activityClassName: activityClassNames) {
+                isActivityClass = currentClassname.equals(activityClassName);
+                if (isActivityClass) {
+                    return true;
+                }
             }
 
             if (currentClassname.endsWith("java.lang.Object")) {