NativeScript · ADjenkov · Jun 10, 2019 · Mar 14, 2019 · Mar 14, 2019 · Mar 18, 2019
diff --git a/apps/app/App_Resources/Android/AndroidManifest.xml b/apps/app/App_Resources/Android/AndroidManifest.xml
@@ -29,7 +29,7 @@
 		<meta-data android:name="debugLayouts" android:value="true" />
 
 		<provider
-			android:name="android.support.v4.content.FileProvider"
+			android:name="androidx.core.content.FileProvider"
 			android:authorities="org.nativescript.apps.provider"
 			android:exported="false"
 			android:grantUriPermissions="true">

diff --git a/apps/app/App_Resources/Android/app.gradle b/apps/app/App_Resources/Android/app.gradle
@@ -14,3 +14,4 @@ android {
     additionalParameters "--no-version-vectors"  
   }  
 } 
+project.ext.useAndroidX=true
diff --git a/apps/app/perf-app/recycling/main-page.ts b/apps/app/perf-app/recycling/main-page.ts
@@ -29,8 +29,8 @@ export function navigatingTo(args) {
 
         application.android.on(application.AndroidApplication.activityRequestPermissionsEvent, handler);
 
-        if ((<any>android.support.v4.content.ContextCompat).checkSelfPermission(application.android.currentContext, (<any>android).Manifest.permission.WRITE_EXTERNAL_STORAGE) !== android.content.pm.PackageManager.PERMISSION_GRANTED) {
-            (<any>android.support.v4.app.ActivityCompat).requestPermissions(application.android.currentContext, [(<any>android).Manifest.permission.WRITE_EXTERNAL_STORAGE], 1234);
+        if ((<any>androidx.core.content.ContextCompat).checkSelfPermission(application.android.currentContext, (<any>android).Manifest.permission.WRITE_EXTERNAL_STORAGE) !== android.content.pm.PackageManager.PERMISSION_GRANTED) {
+            (<any>androidx.core.app.ActivityCompat).requestPermissions(application.android.currentContext, [(<any>android).Manifest.permission.WRITE_EXTERNAL_STORAGE], 1234);
         }
     } else {
         console.log("Permission for write to external storage GRANTED!")

diff --git a/apps/package.json b/apps/package.json
@@ -21,7 +21,7 @@
     "babylon": "6.8.3",
     "lazy": "1.0.11",
     "nativescript-dev-typescript": "next",
-    "tns-platform-declarations": "*",
+    "tns-platform-declarations": "androidx",
     "typescript": "^3.1.6"
   }
-}
+}
diff --git a/tests/app/App_Resources/Android/app.gradle b/tests/app/App_Resources/Android/app.gradle
@@ -13,3 +13,4 @@ android {
     additionalParameters "--no-version-vectors"  
   }  
 } 
+project.ext.useAndroidX=true
diff --git a/tests/app/ui/action-bar/action-bar-tests.android.ts b/tests/app/ui/action-bar/action-bar-tests.android.ts
@@ -11,7 +11,7 @@ export function test_actionItem_visibility() {
     actionItem.text = "Test";
     const page = actionTestsCommon.createPageAndNavigate();
     page.actionBar.actionItems.addItem(actionItem);
-    const toolbar = <android.support.v7.widget.Toolbar>page.actionBar.nativeViewProtected;
+    const toolbar = <androidx.appcompat.widget.Toolbar>page.actionBar.nativeViewProtected;
     const menu = toolbar.getMenu();
 
     TKUnit.assertTrue(menu.hasVisibleItems(), "Visibility does not work");
@@ -25,7 +25,7 @@ export function test_navigationButton_visibility() {
     const page = actionTestsCommon.createPageAndNavigate();
     page.actionBar.navigationButton = actionItem;
 
-    const toolbar = <android.support.v7.widget.Toolbar>page.actionBar.nativeViewProtected;
+    const toolbar = <androidx.appcompat.widget.Toolbar>page.actionBar.nativeViewProtected;
 
     TKUnit.assertNotNull(toolbar.getNavigationIcon(), "Visibility does not work");
     actionItem.visibility = Visibility.collapse;
@@ -40,7 +40,7 @@ export function test_navigationButton_contentDecription() {
     const page = actionTestsCommon.createPageAndNavigate();
     page.actionBar.navigationButton = actionItem;
 
-    const toolbar = <android.support.v7.widget.Toolbar>page.actionBar.nativeViewProtected;
+    const toolbar = <androidx.appcompat.widget.Toolbar>page.actionBar.nativeViewProtected;
 
     TKUnit.assertEqual(toolbar.getNavigationContentDescription(), actionItemText, "Navigation Button should have an content decription");
 }

diff --git a/tests/app/ui/tab-view/tab-view-navigation-tests.ts b/tests/app/ui/tab-view/tab-view-navigation-tests.ts
@@ -191,7 +191,7 @@ function tabViewIsFullyLoaded(tabView: TabView): boolean {
     }
 
     if (tabView.android) {
-        var viewPager: android.support.v4.view.ViewPager = (<any>tabView)._viewPager;
+        var viewPager: androidx.viewpager.widget.ViewPager = (<any>tabView)._viewPager;
         if (viewPager.getChildCount() === 0) {
             return false;
         }
@@ -265,7 +265,7 @@ export function testLoadedAndUnloadedAreFired_WhenNavigatingAwayAndBack() {
 
 function _clickTheFirstButtonInTheListViewNatively(tabView: TabView) {
     if (tabView.android) {
-        var viewPager: android.support.v4.view.ViewPager = (<any>tabView)._viewPager;
+        var viewPager: androidx.viewpager.widget.ViewPager = (<any>tabView)._viewPager;
         var androidListView = <android.widget.ListView>viewPager.getChildAt(0);
         var stackLayout = <org.nativescript.widgets.StackLayout>androidListView.getChildAt(0);
         var button = <android.widget.Button>stackLayout.getChildAt(0);

diff --git a/tests/app/ui/tab-view/tab-view-tests-native.android.ts b/tests/app/ui/tab-view/tab-view-tests-native.android.ts
@@ -1,19 +1,19 @@
 import { TabView } from "tns-core-modules/ui/tab-view";
 
 export function getNativeTabCount(tabView: TabView): number {
-    const pagerAdapter: android.support.v4.view.PagerAdapter = (<any>tabView)._pagerAdapter;
+    const pagerAdapter: androidx.viewpager.widget.PagerAdapter = (<any>tabView)._pagerAdapter;
     return pagerAdapter ? pagerAdapter.getCount() : 0;
 }
 
 export function selectNativeTab(tabView: TabView, index: number): void {
-    const viewPager: android.support.v4.view.ViewPager = (<any>tabView)._viewPager;
+    const viewPager: androidx.viewpager.widget.ViewPager = (<any>tabView)._viewPager;
     if (viewPager) {
         viewPager.setCurrentItem(index);
     }
 }
 
 export function getNativeSelectedIndex(tabView: TabView): number {
-    const viewPager: android.support.v4.view.ViewPager = (<any>tabView)._viewPager;
+    const viewPager: androidx.viewpager.widget.ViewPager = (<any>tabView)._viewPager;
     return viewPager ? viewPager.getCurrentItem() : -1;
 }
 

diff --git a/tests/app/ui/tab-view/tab-view-tests.ts b/tests/app/ui/tab-view/tab-view-tests.ts
@@ -59,7 +59,7 @@ export class TabViewTest extends UITest<tabViewModule.TabView> {
         }
 
         if (tabView.android) {
-            var viewPager: android.support.v4.view.ViewPager = (<any>tabView)._viewPager;
+            var viewPager: androidx.viewpager.widget.ViewPager = (<any>tabView)._viewPager;
             if (viewPager.getChildCount() === 0) {
                 return false;
             }

diff --git a/tns-core-modules-widgets/android/build.gradle b/tns-core-modules-widgets/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -23,3 +23,5 @@ allprojects {
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
+
+project.ext.useAndroidX=true
diff --git a/tns-core-modules-widgets/android/widgets/build.gradle b/tns-core-modules-widgets/android/widgets/build.gradle
@@ -24,6 +24,15 @@ def computeBuildToolsVersion() {
     }
 }
 
+def computeAndroidXVersion() {
+    if(project.hasProperty("androidxVersion")) {
+        return androidxVersion
+    }
+    else {
+        return "1.0.0"
+    }
+}
+
 def computeSupportVersion() {
     if(project.hasProperty("supportVersion")) {
         return supportVersion
@@ -62,7 +71,16 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:support-v4:' + computeSupportVersion()
+
+    if(project.hasProperty("useAndroidX")) {
+        println 'Using androix'
+        def androidxVersion = computeAndroidXVersion()
+        implementation 'androidx.viewpager:viewpager:' + androidxVersion
+        implementation 'androidx.fragment:fragment:' + androidxVersion
+    } else {
+        println 'Using support library'
+        implementation 'com.android.support:support-v4:' + computeSupportVersion()
+    }
 }
 
 task cleanBuildDir (type: Delete) {

diff --git a/...odules-widgets/android/widgets/src/main/java/org/nativescript/widgets/BorderDrawable.java b/...odules-widgets/android/widgets/src/main/java/org/nativescript/widgets/BorderDrawable.java
@@ -17,7 +17,7 @@
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.Shader;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.nativescript.widgets.image.BitmapOwner;
 import org.nativescript.widgets.image.Fetcher;

diff --git a/...modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/FlexboxLayout.java b/...modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/FlexboxLayout.java
@@ -20,9 +20,9 @@
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.IntDef;
-import android.support.annotation.NonNull;
-import android.support.v4.view.ViewCompat;
+import androidx.annotation.IntDef; 
+import androidx.annotation.NonNull; 
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.util.SparseIntArray;
 import android.view.View;

diff --git a/...-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/FragmentBase.java b/...-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/FragmentBase.java
@@ -1,7 +1,7 @@
 package org.nativescript.widgets;
 
 import android.animation.Animator;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment; 
 
 public abstract class FragmentBase extends Fragment {
 

diff --git a/...e-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/Image/Cache.java b/...e-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/Image/Cache.java
@@ -26,7 +26,7 @@
 import android.os.Build.VERSION_CODES;
 import android.os.Environment;
 import android.os.StatFs;
-import android.support.v4.util.LruCache;
+import android.util.LruCache;
 import android.util.Log;
 
 import java.io.File;

diff --git a/...ets/android/widgets/src/main/java/org/nativescript/widgets/SegmentedBarColorDrawable.java b/...ets/android/widgets/src/main/java/org/nativescript/widgets/SegmentedBarColorDrawable.java
@@ -2,7 +2,7 @@
 
 import android.graphics.Paint;
 import android.graphics.drawable.ColorDrawable;
-import android.support.annotation.ColorInt;
+import androidx.annotation.ColorInt;
 
 /**
  * Created by hhristov on 2/23/17.

diff --git a/...ore-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/TabLayout.java b/...ore-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/TabLayout.java
@@ -18,8 +18,8 @@
 
 import android.content.Context;
 import android.graphics.Typeface;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.SparseArray;

diff --git a/...-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/TabViewPager.java b/...-modules-widgets/android/widgets/src/main/java/org/nativescript/widgets/TabViewPager.java
@@ -4,7 +4,7 @@
 package org.nativescript.widgets;
 
 import android.content.Context;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.MotionEvent;

diff --git a/tns-core-modules/application/application.android.ts b/tns-core-modules/application/application.android.ts
@@ -44,8 +44,8 @@ export class AndroidApplication extends Observable implements AndroidApplication
     public paused: boolean;
     public nativeApp: android.app.Application;
     public context: android.content.Context;
-    public foregroundActivity: android.support.v7.app.AppCompatActivity;
-    public startActivity: android.support.v7.app.AppCompatActivity;
+    public foregroundActivity: androidx.appcompat.app.AppCompatActivity;
+    public startActivity: androidx.appcompat.app.AppCompatActivity;
     public packageName: string;
     // we are using these property to store the callbacks to avoid early GC collection which would trigger MarkReachableObjects
     private callbacks: any = {};
@@ -235,7 +235,7 @@ global.__onLiveSync = function __onLiveSync(context?: ModuleContext) {
 };
 
 function initLifecycleCallbacks() {
-    const setThemeOnLaunch = profile("setThemeOnLaunch", (activity: android.support.v7.app.AppCompatActivity) => {
+    const setThemeOnLaunch = profile("setThemeOnLaunch", (activity: androidx.appcompat.app.AppCompatActivity) => {
         // Set app theme after launch screen was used during startup
         const activityInfo = activity.getPackageManager().getActivityInfo(activity.getComponentName(), android.content.pm.PackageManager.GET_META_DATA);
         if (activityInfo.metaData) {
@@ -246,11 +246,11 @@ function initLifecycleCallbacks() {
         }
     });
 
-    const notifyActivityCreated = profile("notifyActivityCreated", function (activity: android.support.v7.app.AppCompatActivity, savedInstanceState: android.os.Bundle) {
+    const notifyActivityCreated = profile("notifyActivityCreated", function (activity: androidx.appcompat.app.AppCompatActivity, savedInstanceState: android.os.Bundle) {
         androidApp.notify(<AndroidActivityBundleEventData>{ eventName: ActivityCreated, object: androidApp, activity, bundle: savedInstanceState });
     });
 
-    const subscribeForGlobalLayout = profile("subscribeForGlobalLayout", function (activity: android.support.v7.app.AppCompatActivity) {
+    const subscribeForGlobalLayout = profile("subscribeForGlobalLayout", function (activity: androidx.appcompat.app.AppCompatActivity) {
         const rootView = activity.getWindow().getDecorView().getRootView();
         // store the listener not to trigger GC collection before collecting the method
         this.onGlobalLayoutListener = new android.view.ViewTreeObserver.OnGlobalLayoutListener({
@@ -264,7 +264,7 @@ function initLifecycleCallbacks() {
     });
 
     const lifecycleCallbacks = new android.app.Application.ActivityLifecycleCallbacks({
-        onActivityCreated: profile("onActivityCreated", function (activity: android.support.v7.app.AppCompatActivity, savedInstanceState: android.os.Bundle) {
+        onActivityCreated: profile("onActivityCreated", function (activity: androidx.appcompat.app.AppCompatActivity, savedInstanceState: android.os.Bundle) {
             setThemeOnLaunch(activity);
 
             if (!androidApp.startActivity) {
@@ -278,7 +278,7 @@ function initLifecycleCallbacks() {
             }
         }),
 
-        onActivityDestroyed: profile("onActivityDestroyed", function (activity: android.support.v7.app.AppCompatActivity) {
+        onActivityDestroyed: profile("onActivityDestroyed", function (activity: androidx.appcompat.app.AppCompatActivity) {
             if (activity === androidApp.foregroundActivity) {
                 androidApp.foregroundActivity = undefined;
             }
@@ -292,7 +292,7 @@ function initLifecycleCallbacks() {
             gc();
         }),
 
-        onActivityPaused: profile("onActivityPaused", function (activity: android.support.v7.app.AppCompatActivity) {
+        onActivityPaused: profile("onActivityPaused", function (activity: androidx.appcompat.app.AppCompatActivity) {
             if ((<any>activity).isNativeScriptActivity) {
                 androidApp.paused = true;
                 notify(<ApplicationEventData>{ eventName: suspendEvent, object: androidApp, android: activity });
@@ -301,21 +301,21 @@ function initLifecycleCallbacks() {
             androidApp.notify(<AndroidActivityEventData>{ eventName: ActivityPaused, object: androidApp, activity: activity });
         }),
 
-        onActivityResumed: profile("onActivityResumed", function (activity: android.support.v7.app.AppCompatActivity) {
+        onActivityResumed: profile("onActivityResumed", function (activity: androidx.appcompat.app.AppCompatActivity) {
             androidApp.foregroundActivity = activity;
 
             androidApp.notify(<AndroidActivityEventData>{ eventName: ActivityResumed, object: androidApp, activity: activity });
         }),
 
-        onActivitySaveInstanceState: profile("onActivitySaveInstanceState", function (activity: android.support.v7.app.AppCompatActivity, outState: android.os.Bundle) {
+        onActivitySaveInstanceState: profile("onActivitySaveInstanceState", function (activity: androidx.appcompat.app.AppCompatActivity, outState: android.os.Bundle) {
             androidApp.notify(<AndroidActivityBundleEventData>{ eventName: SaveActivityState, object: androidApp, activity: activity, bundle: outState });
         }),
 
-        onActivityStarted: profile("onActivityStarted", function (activity: android.support.v7.app.AppCompatActivity) {
+        onActivityStarted: profile("onActivityStarted", function (activity: androidx.appcompat.app.AppCompatActivity) {
             androidApp.notify(<AndroidActivityEventData>{ eventName: ActivityStarted, object: androidApp, activity: activity });
         }),
 
-        onActivityStopped: profile("onActivityStopped", function (activity: android.support.v7.app.AppCompatActivity) {
+        onActivityStopped: profile("onActivityStopped", function (activity: androidx.appcompat.app.AppCompatActivity) {
             androidApp.notify(<AndroidActivityEventData>{ eventName: ActivityStopped, object: androidApp, activity: activity });
         })
     });

diff --git a/tns-core-modules/application/application.d.ts b/tns-core-modules/application/application.d.ts
@@ -308,7 +308,7 @@ export interface AndroidActivityEventData {
     /**
      * The activity.
      */
-    activity: any /* android.support.v7.app.AppCompatActivity */;
+    activity: any /* androidx.appcompat.app.AppCompatActivity */;
 
     /**
      * The name of the event.
@@ -408,7 +408,7 @@ export class AndroidApplication extends Observable {
     /**
      * The currently active (loaded) [android Activity](http://developer.android.com/reference/android/app/Activity.html). This property is automatically updated upon Activity events.
      */
-    foregroundActivity: any /* android.support.v7.app.AppCompatActivity */;
+    foregroundActivity: any /* androidx.appcompat.app.AppCompatActivity */;
 
     /**
      * @deprecated use startActivity, foregroundActivity or context instead
@@ -418,7 +418,7 @@ export class AndroidApplication extends Observable {
     /**
      * The main (start) Activity for the application.
      */
-    startActivity: any /* android.support.v7.app.AppCompatActivity */;
+    startActivity: any /* androidx.appcompat.app.AppCompatActivity */;
 
     /**
      * The name of the application package.

diff --git a/tns-core-modules/package.json b/tns-core-modules/package.json
@@ -26,12 +26,12 @@
   "license": "Apache-2.0",
   "typings": "tns-core-modules.d.ts",
   "dependencies": {
-    "tns-core-modules-widgets": "next",
+    "tns-core-modules-widgets": "androidx",
     "tslib": "^1.9.3"
   },
   "devDependencies": {
     "@types/node": "~7.0.5",
-    "tns-platform-declarations": "*"
+    "tns-platform-declarations": "androidx"
   },
   "scripts": {
     "version": "conventional-changelog -p angular -i ../CHANGELOG.md -s && git add ../CHANGELOG.md"
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,3 +14,4 @@ android { @@
         additionalParameters "--no-version-vectors"
       }
     }
+    project.ext.useAndroidX=true