Skip to content

Commit 21da315

Browse files
NathanWalkerNathanWalker
committed
chore: Enums > CoreTypes
Cleanup type symbol usage by consolidating to manage in one spot. This makes them easier to use as well by providing a single rollup of all the common type symbol's used throughout core.
1 parent e62acba commit 21da315

106 files changed

Lines changed: 1112 additions & 1130 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/automated/src/name-resolvers-tests/qualifier-matcher-tests.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
import * as TKUnit from '../tk-unit';
2-
import { Enums } from '@nativescript/core';
2+
import { CoreTypes } from '@nativescript/core';
33
import { findMatch, PlatformContext } from '@nativescript/core/module-name-resolver/qualifier-matcher';
44

55
export const androidPhonePortraitContext: PlatformContext = {
66
width: 360,
77
height: 640,
8-
deviceType: Enums.DeviceType.Phone,
8+
deviceType: CoreTypes.DeviceType.Phone,
99
os: 'android',
1010
};
1111

1212
export const androidPhoneLandscapeContext: PlatformContext = {
1313
width: 640,
1414
height: 360,
15-
deviceType: Enums.DeviceType.Phone,
15+
deviceType: CoreTypes.DeviceType.Phone,
1616
os: 'android',
1717
};
1818

1919
export const androidTabletPortraitContext: PlatformContext = {
2020
width: 600,
2121
height: 960,
22-
deviceType: Enums.DeviceType.Tablet,
22+
deviceType: CoreTypes.DeviceType.Tablet,
2323
os: 'android',
2424
};
2525

2626
export const iPhonePortraitContext: PlatformContext = {
2727
width: 320,
2828
height: 480,
29-
deviceType: Enums.DeviceType.Phone,
29+
deviceType: CoreTypes.DeviceType.Phone,
3030
os: 'ios',
3131
};
3232

3333
export const iPhoneLandscapeContext: PlatformContext = {
3434
width: 480,
3535
height: 320,
36-
deviceType: Enums.DeviceType.Phone,
36+
deviceType: CoreTypes.DeviceType.Phone,
3737
os: 'ios',
3838
};
3939

‎apps/automated/src/navigation/transition-tests.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Trace } from '@nativescript/core';
44
import { Color } from '@nativescript/core/color';
55
import { NavigationEntry, NavigationTransition } from '@nativescript/core/ui/frame';
66
import { Page } from '@nativescript/core/ui/page';
7-
import { Enums } from '@nativescript/core';
7+
import { CoreTypes } from '@nativescript/core';
88
import { CustomTransition } from './custom-transition';
99

1010
function _testTransition(navigationTransition: NavigationTransition) {
@@ -51,7 +51,7 @@ export function test_Transitions() {
5151

5252
// Built-in transitions
5353
transitions.forEach((name) => {
54-
_testTransition({ name, duration: 20, curve: Enums.AnimationCurve.easeIn });
54+
_testTransition({ name, duration: 20, curve: CoreTypes.AnimationCurve.easeIn });
5555
});
5656

5757
// helper.navigateWithEntry({ create: mainPageFactory, clearHistory: true, animated: false });

‎apps/automated/src/pages/page7.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as pages from '@nativescript/core/ui/page';
22
import * as buttons from '@nativescript/core/ui/button';
3-
import { Enums } from '@nativescript/core';
3+
import { CoreTypes } from '@nativescript/core';
44

55
export function createPage() {
66
var page = new pages.Page();
@@ -10,7 +10,7 @@ export function createPage() {
1010
btn.height = 60;
1111
btn.text = 'test';
1212

13-
var vAligns: Enums.VerticalAlignmentType[] = ['stretch', 'top', 'middle', 'bottom'];
13+
var vAligns: CoreTypes.VerticalAlignmentType[] = ['stretch', 'top', 'middle', 'bottom'];
1414
//var hAligns = ["stretch", "left", "center", "right"];
1515
var count = 0;
1616
btn.on(buttons.Button.tapEvent, function () {

‎apps/automated/src/test-runner.ts‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -187,24 +187,6 @@ allTests['BUTTON'] = buttonTests;
187187
import * as labelTests from './ui/label/label-tests';
188188
allTests['LABEL'] = labelTests;
189189

190-
import * as bottomNavigationTests from './ui/bottom-navigation/bottom-navigation-tests';
191-
allTests['BOTTOM-NAVIGATION'] = bottomNavigationTests;
192-
193-
import * as bottomNavigationTestsNew from './ui/bottom-navigation/bottom-navigation-tests-new';
194-
allTests['BOTTOM-NAVIGATION-NEW'] = bottomNavigationTestsNew;
195-
196-
import * as bottomNavigationNavigationTests from './ui/bottom-navigation/bottom-navigation-navigation-tests';
197-
isIOS && (allTests['BOTTOM-NAVIGATION-NAVIGATION'] = bottomNavigationNavigationTests);
198-
199-
import * as tabsTests from './ui/tabs/tabs-tests';
200-
allTests['TABS'] = tabsTests;
201-
202-
import * as tabsTestsNew from './ui/tabs/tabs-tests-new';
203-
allTests['TABS-NEW'] = tabsTestsNew;
204-
205-
import * as tabsNavigationTests from './ui/tabs/tabs-navigation-tests';
206-
allTests['TABS-NAVIGATION'] = tabsNavigationTests;
207-
208190
import * as tabViewTests from './ui/tab-view/tab-view-tests';
209191
allTests['TAB-VIEW'] = tabViewTests;
210192

@@ -292,13 +274,6 @@ allTests['LIVESYNC'] = livesyncTests;
292274
import * as tabViewRootTests from './ui/tab-view/tab-view-root-tests';
293275
allTests['TAB-VIEW-ROOT'] = tabViewRootTests;
294276

295-
import * as bottomNavigationRootTests from './ui/bottom-navigation/bottom-navigation-root-tests';
296-
allTests['BOTTOM-NAVIGATION-ROOT'] = bottomNavigationRootTests;
297-
298-
// Reset root view didn't work with android tabs
299-
import * as tabsRootTests from './ui/tabs/tabs-root-tests';
300-
isIOS && (allTests['TABS-ROOT'] = tabsRootTests);
301-
302277
import * as resetRootViewTests from './ui/root-view/reset-root-view-tests';
303278
allTests['RESET-ROOT-VIEW'] = resetRootViewTests;
304279

‎apps/automated/src/ui/action-bar/action-bar-tests.android.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export function test_actionItem_visibility() {
1515
const menu = toolbar.getMenu();
1616

1717
TKUnit.assertTrue(menu.hasVisibleItems(), 'Visibility does not work');
18-
actionItem.visibility = Enums.Visibility.collapse;
18+
actionItem.visibility = CoreTypes.Visibility.collapse;
1919
TKUnit.assertFalse(menu.hasVisibleItems(), 'Visibility does not work');
2020
}
2121

@@ -28,7 +28,7 @@ export function test_navigationButton_visibility() {
2828
const toolbar = <androidx.appcompat.widget.Toolbar>page.actionBar.nativeViewProtected;
2929

3030
TKUnit.assertNotNull(toolbar.getNavigationIcon(), 'Visibility does not work');
31-
actionItem.visibility = Enums.Visibility.collapse;
31+
actionItem.visibility = CoreTypes.Visibility.collapse;
3232
TKUnit.assertNull(toolbar.getNavigationIcon(), 'Visibility does not work');
3333
}
3434

‎apps/automated/src/ui/action-bar/action-bar-tests.ios.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ export function test_actionItem_visibility() {
9595

9696
var leftBarButtonItemsCount = navigationItem.leftBarButtonItems ? navigationItem.leftBarButtonItems.count : 0;
9797
TKUnit.assertEqual(leftBarButtonItemsCount, 1, 'Visibility does not work');
98-
actionItem.visibility = Enums.Visibility.collapse;
98+
actionItem.visibility = CoreTypes.Visibility.collapse;
9999

100100
TKUnit.waitUntilReady(() => {
101101
leftBarButtonItemsCount = navigationItem.leftBarButtonItems ? navigationItem.leftBarButtonItems.count : 0;
@@ -118,7 +118,7 @@ export function test_navigationButton_visibility() {
118118
var navigationItem: UINavigationItem = viewController.navigationItem;
119119

120120
TKUnit.assertFalse(navigationItem.hidesBackButton, 'Visibility does not work');
121-
actionItem.visibility = Enums.Visibility.collapse;
121+
actionItem.visibility = CoreTypes.Visibility.collapse;
122122

123123
TKUnit.waitUntilReady(() => {
124124
return navigationItem.hidesBackButton;

‎apps/automated/src/ui/animation/animation-tests.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { AnimationPromise } from '@nativescript/core/ui/animation';
99

1010
// >> animation-require
1111
import * as animation from '@nativescript/core/ui/animation';
12-
import { PercentLengthType, PercentLength } from '@nativescript/core';
12+
import { CoreTypes, PercentLength } from '@nativescript/core';
1313
// << animation-require
1414

1515
function prepareTest(parentHeight?: number, parentWidth?: number): Label {
@@ -46,7 +46,7 @@ export function test_AnimatingProperties(done) {
4646
duration: 5,
4747
delay: 10,
4848
iterations: 3,
49-
curve: Enums.AnimationCurve.easeIn,
49+
curve: CoreTypes.AnimationCurve.easeIn,
5050
})
5151
.then(() => {
5252
//console.log("Animation finished.");
@@ -418,7 +418,7 @@ export function test_AnimateRotate(done) {
418418
});
419419
}
420420

421-
function animateExtentAndAssertExpected(along: 'height' | 'width', value: PercentLengthType, pixelExpected: PercentLengthType): Promise<void> {
421+
function animateExtentAndAssertExpected(along: 'height' | 'width', value: CoreTypes.PercentLengthType, pixelExpected: CoreTypes.PercentLengthType): Promise<void> {
422422
function pretty(val) {
423423
return JSON.stringify(val, null, 2);
424424
}
@@ -478,7 +478,7 @@ export function test_AnimateExtent_Should_AcceptStringPixelValues(done) {
478478
const expected = {
479479
unit: 'px',
480480
value: pair[1],
481-
} as PercentLengthType;
481+
} as CoreTypes.PercentLengthType;
482482
promise = promise.then(() => {
483483
return animateExtentAndAssertExpected('height', input, expected);
484484
});

‎apps/automated/src/ui/animation/css-animation-tests.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as TKUnit from '../../tk-unit';
22
import * as styleScope from '@nativescript/core/ui/styling/style-scope';
33
import * as keyframeAnimation from '@nativescript/core/ui/animation/keyframe-animation';
4-
import { Enums } from '@nativescript/core';
4+
import { CoreTypes } from '@nativescript/core';
55
import * as helper from '../../ui-helper';
66
import * as stackModule from '@nativescript/core/ui/layouts/stack-layout';
77
import * as labelModule from '@nativescript/core/ui/label';
@@ -37,7 +37,7 @@ export function test_ReadAnimationProperties() {
3737
let animation = createAnimationFromCSS(css, 'test');
3838
TKUnit.assertEqual(animation.name, 'first');
3939
TKUnit.assertEqual(animation.duration, 4000);
40-
TKUnit.assertEqual(animation.curve, Enums.AnimationCurve.easeIn);
40+
TKUnit.assertEqual(animation.curve, CoreTypes.AnimationCurve.easeIn);
4141
TKUnit.assertEqual(animation.delay, 1500);
4242
TKUnit.assertEqual(animation.iterations, 10);
4343
TKUnit.assertTrue(animation.isForwards);
@@ -48,22 +48,22 @@ export function test_ReadTheAnimationProperty() {
4848
let animation = createAnimationFromCSS('.test { animation: second 0.2s ease-out 1 2 }', 'test');
4949
TKUnit.assertEqual(animation.name, 'second');
5050
TKUnit.assertEqual(animation.duration, 200);
51-
TKUnit.assertEqual(animation.curve, Enums.AnimationCurve.easeOut);
51+
TKUnit.assertEqual(animation.curve, CoreTypes.AnimationCurve.easeOut);
5252
TKUnit.assertEqual(animation.delay, 1000);
5353
TKUnit.assertEqual(animation.iterations, 2);
5454
}
5555

5656
export function test_ReadAnimationCurve() {
5757
let animation = createAnimationFromCSS('.test { animation-timing-function: ease-in; }', 'test');
58-
TKUnit.assertEqual(animation.curve, Enums.AnimationCurve.easeIn);
58+
TKUnit.assertEqual(animation.curve, CoreTypes.AnimationCurve.easeIn);
5959
animation = createAnimationFromCSS('.test { animation-timing-function: ease-out; }', 'test');
60-
TKUnit.assertEqual(animation.curve, Enums.AnimationCurve.easeOut);
60+
TKUnit.assertEqual(animation.curve, CoreTypes.AnimationCurve.easeOut);
6161
animation = createAnimationFromCSS('.test { animation-timing-function: linear; }', 'test');
62-
TKUnit.assertEqual(animation.curve, Enums.AnimationCurve.linear);
62+
TKUnit.assertEqual(animation.curve, CoreTypes.AnimationCurve.linear);
6363
animation = createAnimationFromCSS('.test { animation-timing-function: ease-in-out; }', 'test');
64-
TKUnit.assertEqual(animation.curve, Enums.AnimationCurve.easeInOut);
64+
TKUnit.assertEqual(animation.curve, CoreTypes.AnimationCurve.easeInOut);
6565
animation = createAnimationFromCSS('.test { animation-timing-function: spring; }', 'test');
66-
TKUnit.assertEqual(animation.curve, Enums.AnimationCurve.spring);
66+
TKUnit.assertEqual(animation.curve, CoreTypes.AnimationCurve.spring);
6767
animation = createAnimationFromCSS('.test { animation-timing-function: cubic-bezier(0.1, 1.0, 0.5, 0.5); }', 'test');
6868
let curve = animation.curve;
6969
TKUnit.assert(curve.x1 === 0.1 && curve.y1 === 1.0 && curve.x2 === 0.5 && curve.y2 === 0.5);
@@ -389,8 +389,8 @@ export function test_ReadTwoAnimations() {
389389
scope.ensureSelectors();
390390
let selector = findSelectorInScope(scope, 'test');
391391
TKUnit.assertEqual(scope.getAnimations(selector.ruleset).length, 2);
392-
TKUnit.assertEqual(scope.getAnimations(selector.ruleset)[0].curve, Enums.AnimationCurve.easeOut);
393-
TKUnit.assertEqual(scope.getAnimations(selector.ruleset)[1].curve, Enums.AnimationCurve.easeIn);
392+
TKUnit.assertEqual(scope.getAnimations(selector.ruleset)[0].curve, CoreTypes.AnimationCurve.easeOut);
393+
TKUnit.assertEqual(scope.getAnimations(selector.ruleset)[1].curve, CoreTypes.AnimationCurve.easeIn);
394394
TKUnit.assertEqual(scope.getAnimations(selector.ruleset)[1].name, 'two');
395395
TKUnit.assertEqual(scope.getAnimations(selector.ruleset)[1].duration, 2000);
396396
}
@@ -401,12 +401,12 @@ export function test_AnimationCurveInKeyframes() {
401401
scope.ensureSelectors();
402402
let selector = findSelectorInScope(scope, 'test');
403403
let animation = scope.getAnimations(selector.ruleset)[0];
404-
TKUnit.assertEqual(animation.keyframes[0].curve, Enums.AnimationCurve.linear);
404+
TKUnit.assertEqual(animation.keyframes[0].curve, CoreTypes.AnimationCurve.linear);
405405
TKUnit.assertEqual(animation.keyframes[1].curve, undefined);
406406
TKUnit.assertEqual(animation.keyframes[1].curve, undefined);
407407
let realAnimation = keyframeAnimation.KeyframeAnimation.keyframeAnimationFromInfo(animation);
408-
TKUnit.assertEqual(realAnimation.animations[1].curve, Enums.AnimationCurve.linear);
409-
TKUnit.assertEqual(realAnimation.animations[2].curve, Enums.AnimationCurve.easeIn);
408+
TKUnit.assertEqual(realAnimation.animations[1].curve, CoreTypes.AnimationCurve.linear);
409+
TKUnit.assertEqual(realAnimation.animations[2].curve, CoreTypes.AnimationCurve.easeIn);
410410
}
411411

412412
function getTransformsValues(declarations) {

‎apps/automated/src/ui/button/button-tests-native.android.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ export function getNativeTextAlignment(button: Button): string {
3434
let gravity = button.android.getGravity();
3535

3636
if ((gravity & android.view.Gravity.HORIZONTAL_GRAVITY_MASK) === android.view.Gravity.LEFT) {
37-
return Enums.TextAlignment.left;
37+
return CoreTypes.TextAlignment.left;
3838
}
3939

4040
if ((gravity & android.view.Gravity.HORIZONTAL_GRAVITY_MASK) === android.view.Gravity.CENTER_HORIZONTAL) {
41-
return Enums.TextAlignment.center;
41+
return CoreTypes.TextAlignment.center;
4242
}
4343

4444
if ((gravity & android.view.Gravity.HORIZONTAL_GRAVITY_MASK) === android.view.Gravity.RIGHT) {
45-
return Enums.TextAlignment.right;
45+
return CoreTypes.TextAlignment.right;
4646
}
4747

4848
return 'unexpected value';

‎apps/automated/src/ui/button/button-tests-native.ios.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ export function getNativeBackgroundColor(button: buttonModule.Button): colorModu
2626
export function getNativeTextAlignment(button: buttonModule.Button): string {
2727
switch (button.ios.titleLabel.textAlignment) {
2828
case NSTextAlignment.Left:
29-
return Enums.TextAlignment.left;
29+
return CoreTypes.TextAlignment.left;
3030
case NSTextAlignment.Center:
31-
return Enums.TextAlignment.center;
31+
return CoreTypes.TextAlignment.center;
3232
case NSTextAlignment.Right:
33-
return Enums.TextAlignment.right;
33+
return CoreTypes.TextAlignment.right;
3434
default:
3535
return 'unexpected value';
3636
}

0 commit comments

Comments
 (0)