javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(android): androidX support (#7039)

Browse Source 
* feat: migrate support library namespaces to androidX

* feat(tns-platform-declarations): update to androidX typings

* chore(tests): migrate test apps to AndroidX

* chore(tns-platform-declarations): update tsconfig to include androidx dts files

* update package.json to androidx

* chore(androidx): migrate forgotten support library namspaces

* feat(tns-core-modules-widgets): migrate to AndroidX namespaces

* chore(utils): update androidx namspace for getPaletteColor method

* chore(apps): update tns-platform-declarations package

* Update package.json
This commit is contained in:
Alexander Djenkov
2019-06-10 09:21:41 +03:00
committed by GitHub
parent 0a4b813430
commit c5db112b8d
60 changed files with 142022 additions and 126742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/app/App_Resources/Android/app.gradle
View File

@@ -13,3 +13,4 @@ android {
additionalParameters "--no-version-vectors"
}
}
project.ext.useAndroidX=true

6
tests/app/ui/action-bar/action-bar-tests.android.ts
View File

@@ -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");
}

4
tests/app/ui/tab-view/tab-view-navigation-tests.ts
View File

@@ -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);

6
tests/app/ui/tab-view/tab-view-tests-native.android.ts
View File

@@ -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;
}

2
tests/app/ui/tab-view/tab-view-tests.ts
View File

@@ -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;
}