From 36fd83365c76e5573f532f6fc4534039221e4155 Mon Sep 17 00:00:00 2001 From: Rossen Hristov Date: Mon, 20 Jun 2016 12:11:39 +0300 Subject: [PATCH] Fix tslint errors --- .../ui/button/button-tests-native.android.ts | 1 - .../ui/label/label-tests-native.android.ts | 1 - tests/app/ui/label/label-tests.ts | 1 - .../text-field-tests-native.android.ts | 1 - .../text-view-tests-native.android.ts | 1 - tests/app/ui/view/view-tests.android.ts | 1 - .../ui/styling/background.android.ts | 64 ------------------- 7 files changed, 70 deletions(-) diff --git a/tests/app/ui/button/button-tests-native.android.ts b/tests/app/ui/button/button-tests-native.android.ts index 078380fa4..4709b4b43 100644 --- a/tests/app/ui/button/button-tests-native.android.ts +++ b/tests/app/ui/button/button-tests-native.android.ts @@ -2,7 +2,6 @@ import colorModule = require("color"); import utilsModule = require("utils/utils"); import enums = require("ui/enums"); -import background = require("ui/styling/background"); export function getNativeText(button: buttonModule.Button): string { return button.android.getText(); diff --git a/tests/app/ui/label/label-tests-native.android.ts b/tests/app/ui/label/label-tests-native.android.ts index 23f4f2239..e20f41a89 100644 --- a/tests/app/ui/label/label-tests-native.android.ts +++ b/tests/app/ui/label/label-tests-native.android.ts @@ -1,7 +1,6 @@ import labelModule = require("ui/label"); import enums = require("ui/enums"); import colorModule = require("color"); -import background = require("ui/styling/background"); export function getNativeTextAlignment(label: labelModule.Label): string { var gravity = label.android.getGravity(); diff --git a/tests/app/ui/label/label-tests.ts b/tests/app/ui/label/label-tests.ts index e83cb1e5e..09e4bfbf7 100644 --- a/tests/app/ui/label/label-tests.ts +++ b/tests/app/ui/label/label-tests.ts @@ -15,7 +15,6 @@ import textBase = require("ui/text-base"); import enums = require("ui/enums"); import labelTestsNative = require("./label-tests-native"); import fs = require("file-system"); -import background = require("ui/styling/background"); import {StackLayout} from "ui/layouts/stack-layout"; import {GridLayout} from "ui/layouts/grid-layout"; diff --git a/tests/app/ui/text-field/text-field-tests-native.android.ts b/tests/app/ui/text-field/text-field-tests-native.android.ts index f61286b80..09e33b9e8 100644 --- a/tests/app/ui/text-field/text-field-tests-native.android.ts +++ b/tests/app/ui/text-field/text-field-tests-native.android.ts @@ -2,7 +2,6 @@ import colorModule = require("color"); import utilsModule = require("utils/utils"); import enums = require("ui/enums"); -import background = require("ui/styling/background"); export function getNativeText(textField: textFieldModule.TextField): string { return textField.android.getText().toString(); diff --git a/tests/app/ui/text-view/text-view-tests-native.android.ts b/tests/app/ui/text-view/text-view-tests-native.android.ts index d53e3bd99..a287a2ecd 100644 --- a/tests/app/ui/text-view/text-view-tests-native.android.ts +++ b/tests/app/ui/text-view/text-view-tests-native.android.ts @@ -2,7 +2,6 @@ import colorModule = require("color"); import utilsModule = require("utils/utils"); import enums = require("ui/enums"); -import background = require("ui/styling/background"); export function getNativeText(textView: textViewModule.TextView): string { return textView.android.getText().toString(); diff --git a/tests/app/ui/view/view-tests.android.ts b/tests/app/ui/view/view-tests.android.ts index 13e7cb1e1..9b639a1a4 100644 --- a/tests/app/ui/view/view-tests.android.ts +++ b/tests/app/ui/view/view-tests.android.ts @@ -6,7 +6,6 @@ import button = require("ui/button"); import types = require("utils/types"); import stack = require("ui/layouts/stack-layout"); import labelModule = require("ui/label"); -import background = require("ui/styling/background"); import frame = require("ui/frame"); import trace = require("trace"); // enable the trace, it is disabled by default diff --git a/tns-core-modules/ui/styling/background.android.ts b/tns-core-modules/ui/styling/background.android.ts index d67b39ea7..92d5dee98 100644 --- a/tns-core-modules/ui/styling/background.android.ts +++ b/tns-core-modules/ui/styling/background.android.ts @@ -1,6 +1,5 @@ import utils = require("utils/utils"); import common = require("./background-common"); -import definition = require("ui/styling/background"); import view = require("ui/core/view"); import types = require("utils/types"); import * as styleModule from "./style"; @@ -139,67 +138,4 @@ function createNativeCSSValueArray(css: string): any{ ); } return nativeArray; -} - -function drawClipPath(clipPath: string, canvas: android.graphics.Canvas, paint: android.graphics.Paint, bounds: android.graphics.RectF) { - var functionName = clipPath.substring(0, clipPath.indexOf("(")); - var value = clipPath.replace(`${functionName}(`, "").replace(")", ""); - - if (functionName === "rect") { - var arr = value.split(/[\s]+/); - - var top = common.cssValueToDevicePixels(arr[0], bounds.top); - var left = common.cssValueToDevicePixels(arr[1], bounds.left); - var bottom = common.cssValueToDevicePixels(arr[2], bounds.bottom); - var right = common.cssValueToDevicePixels(arr[3], bounds.right); - - canvas.drawRect(left, top, right, bottom, paint); - - } else if (functionName === "circle") { - var arr = value.split(/[\s]+/); - - var radius = common.cssValueToDevicePixels(arr[0], (bounds.width() > bounds.height() ? bounds.height() : bounds.width()) / 2); - var y = common.cssValueToDevicePixels(arr[2], bounds.height()); - var x = common.cssValueToDevicePixels(arr[3], bounds.width()); - - canvas.drawCircle(x, y, radius, paint); - - } else if (functionName === "ellipse") { - var arr = value.split(/[\s]+/); - - var rX = common.cssValueToDevicePixels(arr[0], bounds.right); - var rY = common.cssValueToDevicePixels(arr[1], bounds.bottom); - var cX = common.cssValueToDevicePixels(arr[3], bounds.right); - var cY = common.cssValueToDevicePixels(arr[4], bounds.bottom); - - var left = cX - rX; - var top = cY - rY; - var right = (rX * 2) + left; - var bottom = (rY * 2) + top; - - canvas.drawOval(new android.graphics.RectF(left, top, right, bottom), paint); - - } else if (functionName === "polygon") { - var path = new android.graphics.Path(); - var firstPoint: view.Point; - var arr = value.split(/[,]+/); - for (let i = 0; i < arr.length; i++) { - let xy = arr[i].trim().split(/[\s]+/); - let point: view.Point = { - x: common.cssValueToDevicePixels(xy[0], bounds.width()), - y: common.cssValueToDevicePixels(xy[1], bounds.height()) - }; - - if (!firstPoint) { - firstPoint = point; - path.moveTo(point.x, point.y); - } - - path.lineTo(point.x, point.y); - } - - path.lineTo(firstPoint.x, firstPoint.y); - - canvas.drawPath(path, paint); - } } \ No newline at end of file