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

fix padding on text-view & text-field (#3758)

Browse Source 
* fix padding on text-view & text-field
text-base is now snapshotable
view.android is now snapshotable

* createNativeView returns the nativeView for android
Fix image tests
Implement test for image loaded from res://
EffectivePaddings updated when nativeView have some from its native theme
This commit is contained in:
Hristo Hristov
2017-03-09 16:09:53 +02:00
committed by GitHub
parent a4809fed16
commit 1d49f5f3c3
42 changed files with 269 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/app/app/app.ts
View File

@@ -86,7 +86,8 @@ application.on(application.lowMemoryEvent, function (args: application.Applicati
application.on(application.uncaughtErrorEvent, function (args: application.UnhandledErrorEventData) {
console.log("NativeScriptError: " + args.error);
console.log(args.error.stack);
console.log((<any>args.error).nativeException);
console.log((<any>args.error).stackTrace);
});
// Android activity events

93
tests/app/ui/image/image-tests.ts
View File

@@ -16,10 +16,9 @@ import * as ImageSourceModule from "image-source";
import * as ViewModule from "ui/core/view";
import * as helper from "../helper";
import * as ObservableModule from "data/observable";
import * as fs from "file-system";
import * as color from "color";
const imagePath = fs.path.join(__dirname, "../../logo.png");
const imagePath = "~/logo.png";
if (isAndroid) {
const imageModule = require("ui/image");
@@ -33,19 +32,16 @@ export const test_Image_Members = function () {
TKUnit.assert(image.isLoading === false, "Image.isLoading is default value should be false.");
};
/* TODO: We need a way to programmatically add an image to resources and then load it from, otherwise we do not know if there is such resource in the target native app.
export const test_settingImageSource = function () {
export const test_setting_src_to_resource = function () {
// >> img-create
const image = new ImageModule.Image();
image.imageSource = ImageSourceModule.fromResource("logo");
image.src = "res://icon";
// << img-create
const testFunc = function (views: Array<ViewModule.View>) {
const testImage = <ImageModule.Image> views[0];
const desiredSize = testImage._measureNativeView(new geometry.Size(100, 100));
const width = desiredSize.width;
const height = desiredSize.height;
const testFunc = function (views: Array<ViewModule.View>) {
TKUnit.waitUntilReady(() => image.isLayoutValid);
const width = image.getMeasuredWidth();
const height = image.getMeasuredHeight();
TKUnit.assert(width > 0, "Width should be greater than 0.");
TKUnit.assert(height > 0, "Height should be greater than 0.");
@@ -53,7 +49,6 @@ export const test_settingImageSource = function () {
helper.buildUIAndRunTest(image, testFunc);
}
*/
const IMAGE_LOADED_EVENT = "isLoadingChange";
@@ -105,7 +100,7 @@ export const test_SettingImageSrcToURL_async = function (done) {
runImageTestAsync(image, image.src, done);
};
export const test_SettingImageSrcToFileWithinApp_sync = function () {
export const test_SettingImageSrcToFileWithinApp_sync = function () {
// >> img-create-local
const image = new ImageModule.Image();
image.src = "~/logo.png";
@@ -174,7 +169,6 @@ export const __test_SettingImageSrcTwiceMustNotMismatch = function (done) {
export const test_SettingStretch_AspectFit = function () {
// >> img-set-stretch
const image = new ImageModule.Image();
image.imageSource = ImageSourceModule.fromFile(imagePath);
// There are 4 modes of stretching none, fill, aspectFill, aspectFit
// The default value is aspectFit.
// Image stretch can be set by using ImageModule.stretch enum.
@@ -182,17 +176,10 @@ export const test_SettingStretch_AspectFit = function () {
// << img-set-stretch
const testFunc = function (views: Array<ViewModule.View>) {
const testImage = <ImageModule.Image>views[0];
if (image.android) {
const actualScaleType = testImage.android.getScaleType();
const expectedScaleType = android.widget.ImageView.ScaleType.FIT_CENTER;
TKUnit.assertEqual(actualScaleType, expectedScaleType, "actualScaleType");
}
else if (image.ios) {
const actualContentMode = testImage.ios.contentMode;
const expectedContentMode = UIViewContentMode.ScaleAspectFit;
TKUnit.assertEqual(actualContentMode, expectedContentMode, "actualContentMode");
TKUnit.assertEqual(image.android.getScaleType(), android.widget.ImageView.ScaleType.FIT_CENTER);
} else if (image.ios) {
TKUnit.assertEqual(image.ios.contentMode, UIViewContentMode.ScaleAspectFit);
}
};
@@ -201,20 +188,11 @@ export const test_SettingStretch_AspectFit = function () {
export const test_SettingStretch_Default = function () {
const image = new ImageModule.Image();
image.imageSource = ImageSourceModule.fromFile(imagePath);
const testFunc = function (views: Array<ViewModule.View>) {
const testImage = <ImageModule.Image>views[0];
if (image.android) {
const actualScaleType = testImage.android.getScaleType();
const expectedScaleType = android.widget.ImageView.ScaleType.FIT_CENTER;
TKUnit.assert(actualScaleType === expectedScaleType, "Expected: " + expectedScaleType + ", Actual: " + actualScaleType);
}
else if (image.ios) {
const actualContentMode = testImage.ios.contentMode;
const expectedContentMode = UIViewContentMode.ScaleAspectFit;
TKUnit.assert(actualContentMode === expectedContentMode, "Expected: " + expectedContentMode + ", Actual: " + actualContentMode);
TKUnit.assertEqual(image.android.getScaleType(), android.widget.ImageView.ScaleType.FIT_CENTER);
} else if (image.ios) {
TKUnit.assertEqual(image.ios.contentMode, UIViewContentMode.ScaleAspectFit);
}
};
@@ -223,21 +201,13 @@ export const test_SettingStretch_Default = function () {
export const test_SettingStretch_AspectFill = function () {
const image = new ImageModule.Image();
image.imageSource = ImageSourceModule.fromFile(imagePath);
image.stretch = "aspectFill";
const testFunc = function (views: Array<ViewModule.View>) {
const testImage = <ImageModule.Image>views[0];
if (image.android) {
const actualScaleType = testImage.android.getScaleType();
const expectedScaleType = android.widget.ImageView.ScaleType.CENTER_CROP;
TKUnit.assert(actualScaleType === expectedScaleType, "Expected: " + expectedScaleType + ", Actual: " + actualScaleType);
}
else if (image.ios) {
const actualContentMode = testImage.ios.contentMode;
const expectedContentMode = UIViewContentMode.ScaleAspectFill;
TKUnit.assert(actualContentMode === expectedContentMode, "Expected: " + expectedContentMode + ", Actual: " + actualContentMode);
TKUnit.assertEqual(image.android.getScaleType(), android.widget.ImageView.ScaleType.CENTER_CROP);
} else if (image.ios) {
TKUnit.assertEqual(image.ios.contentMode, UIViewContentMode.ScaleAspectFill);
}
};
@@ -246,21 +216,14 @@ export const test_SettingStretch_AspectFill = function () {
export const test_SettingStretch_Fill = function () {
const image = new ImageModule.Image();
image.imageSource = ImageSourceModule.fromFile(imagePath);
image.stretch = "fill";
const testFunc = function (views: Array<ViewModule.View>) {
const testImage = <ImageModule.Image>views[0];
if (image.android) {
const actualScaleType = testImage.android.getScaleType();
const expectedScaleType = android.widget.ImageView.ScaleType.FIT_XY;
TKUnit.assert(actualScaleType === expectedScaleType, "Expected: " + expectedScaleType + ", Actual: " + actualScaleType);
}
else if (image.ios) {
const actualContentMode = testImage.ios.contentMode;
const expectedContentMode = UIViewContentMode.ScaleToFill;
TKUnit.assert(actualContentMode === expectedContentMode, "Expected: " + expectedContentMode + ", Actual: " + actualContentMode);
TKUnit.assertEqual(image.android.getScaleType(), android.widget.ImageView.ScaleType.FIT_XY);
} else if (image.ios) {
TKUnit.assertEqual(image.ios.contentMode, UIViewContentMode.ScaleToFill);
}
};
@@ -269,21 +232,13 @@ export const test_SettingStretch_Fill = function () {
export const test_SettingStretch_none = function () {
const image = new ImageModule.Image();
image.imageSource = ImageSourceModule.fromFile(imagePath);
image.stretch = "none";
const testFunc = function (views: Array<ViewModule.View>) {
const testImage = <ImageModule.Image>views[0];
if (image.android) {
const actualScaleType = testImage.android.getScaleType();
const expectedScaleType = android.widget.ImageView.ScaleType.MATRIX;
TKUnit.assert(actualScaleType === expectedScaleType, "Expected: " + expectedScaleType + ", Actual: " + actualScaleType);
}
else if (image.ios) {
const actualContentMode = testImage.ios.contentMode;
const expectedContentMode = UIViewContentMode.TopLeft;
TKUnit.assert(actualContentMode === expectedContentMode, "Expected: " + expectedContentMode + ", Actual: " + actualContentMode);
TKUnit.assertEqual(image.android.getScaleType(), android.widget.ImageView.ScaleType.MATRIX);
} else if (image.ios) {
TKUnit.assertEqual(image.ios.contentMode, UIViewContentMode.TopLeft);
}
};
@@ -375,7 +330,7 @@ export const test_DimensionsAreRoundedAfterScale = function () {
export const test_tintColor = function () {
const colorRed = new color.Color("red");
const image = new ImageModule.Image();
image.imageSource = ImageSourceModule.fromFile(imagePath);
image.src = imagePath;
const testFunc = function (views: Array<ViewModule.View>) {
const testImage = <ImageModule.Image>views[0];

3
tests/app/ui/layouts/layout-helper.android.ts
View File

@@ -87,6 +87,7 @@ export class MyButton extends Button implements def.MyButton {
public _createNativeView() {
this._layout = new NativeButton(this._context, this);
return this._layout;
}
public measureCount: number = 0;
@@ -140,6 +141,7 @@ export class MyStackLayout extends StackLayout implements def.MyStackLayout {
public _createNativeView() {
this._layout = new NativeStackLayout(this._context, this);
return this._layout;
}
public measureCount: number = 0;
@@ -193,6 +195,7 @@ export class MyGridLayout extends GridLayout implements def.MyGridLayout {
public _createNativeView() {
this._layout = new NativeGridLayout(this._context, this);
return this._layout;
}
public measureCount: number = 0;