diff --git a/CrossPlatformModules.csproj b/CrossPlatformModules.csproj
index 3f6a20a01..1e8e0aeef 100644
--- a/CrossPlatformModules.csproj
+++ b/CrossPlatformModules.csproj
@@ -377,6 +377,9 @@
trace.d.ts
+
+ border.d.ts
+
repeater.d.ts
@@ -774,15 +777,6 @@
switch.d.ts
-
- border.d.ts
-
-
- border.d.ts
-
-
- border.d.ts
-
activity-indicator.d.ts
@@ -1680,7 +1674,7 @@
False
-
+
\ No newline at end of file
diff --git a/ui/border/border.android.ts b/ui/border/border.android.ts
deleted file mode 100644
index ab3d128ef..000000000
--- a/ui/border/border.android.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import borderCommon = require("ui/border/border-common");
-import proxy = require("ui/core/proxy");
-import dependencyObservable = require("ui/core/dependency-observable");
-import utils = require("utils/utils");
-
-// merge the exports of the common file with the exports of this file
-declare var exports;
-require("utils/module-merge").merge(borderCommon, exports);
-
-function onBorderPropertyChanged(data: dependencyObservable.PropertyChangeData) {
- var border = data.object;
- border._updateAndroidBorder();
-}
-
-(borderCommon.Border.cornerRadiusProperty.metadata).onSetNativeValue = onBorderPropertyChanged;
-(borderCommon.Border.borderWidthProperty.metadata).onSetNativeValue = onBorderPropertyChanged;
-(borderCommon.Border.borderColorProperty.metadata).onSetNativeValue = onBorderPropertyChanged;
-
-export class Border extends borderCommon.Border {
- public _updateAndroidBorder() {
- if (!this._nativeView) {
- return;
- }
-
- var nativeView = this._nativeView;
-
- var backgroundDrawable = nativeView.getBackground();
- if (!(backgroundDrawable instanceof android.graphics.drawable.GradientDrawable)) {
- backgroundDrawable = new android.graphics.drawable.GradientDrawable();
- nativeView.setBackgroundDrawable(backgroundDrawable);
- }
-
- var gd = backgroundDrawable;
- var density = utils.layout.getDisplayDensity();
- gd.setCornerRadius(this.cornerRadius * density);
-
- if (this.borderColor) {
- gd.setStroke(this.borderWidth * density, this.borderColor.android);
- }
- else {
- gd.setStroke(this.borderWidth * density, android.graphics.Color.TRANSPARENT);
- }
-
- if (this.backgroundColor) {
- gd.setColor(this.backgroundColor.android);
- }
- else {
- gd.setColor(android.graphics.Color.TRANSPARENT);
- }
- }
-}
diff --git a/ui/border/border.d.ts b/ui/border/border.d.ts
index 6f8770306..91988aabe 100644
--- a/ui/border/border.d.ts
+++ b/ui/border/border.d.ts
@@ -10,10 +10,6 @@ declare module "ui/border" {
* Represents a UI border component.
*/
export class Border extends contentView.ContentView {
- public static cornerRadiusProperty : dependencyObservable.Property;
- public static borderWidthProperty: dependencyObservable.Property;
- public static borderColorProperty: dependencyObservable.Property;
-
/**
* Gets or sets the corner radius of the border component.
*/
@@ -28,9 +24,5 @@ declare module "ui/border" {
* Gets or sets the border color of the border component.
*/
borderColor: color.Color;
-
- //@private
- _updateAndroidBorder();
- //@endprivate
}
}
\ No newline at end of file
diff --git a/ui/border/border.ios.ts b/ui/border/border.ios.ts
deleted file mode 100644
index e3064d920..000000000
--- a/ui/border/border.ios.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import borderCommon = require("ui/border/border-common");
-import dependencyObservable = require("ui/core/dependency-observable");
-import proxy = require("ui/core/proxy");
-import color = require("color");
-
-// merge the exports of the common file with the exports of this file
-declare var exports;
-require("utils/module-merge").merge(borderCommon, exports);
-
-function onCornerRadiusPropertyChanged(data: dependencyObservable.PropertyChangeData) {
- var view = data.object;
- if (!view._nativeView) {
- return;
- }
-
- if (view._nativeView instanceof UIView) {
- (view._nativeView).layer.cornerRadius = data.newValue;
- }
-}
-(borderCommon.Border.cornerRadiusProperty.metadata).onSetNativeValue = onCornerRadiusPropertyChanged;
-
-function onBorderWidthPropertyChanged(data: dependencyObservable.PropertyChangeData) {
- var view = data.object;
- if (!view._nativeView) {
- return;
- }
-
- if (view._nativeView instanceof UIView) {
- (view._nativeView).layer.borderWidth = data.newValue;
- }
-}
-(borderCommon.Border.borderWidthProperty.metadata).onSetNativeValue = onBorderWidthPropertyChanged;
-
-function onBorderColorPropertyChanged(data: dependencyObservable.PropertyChangeData) {
- var view = data.object;
- if (!view._nativeView) {
- return;
- }
-
- if (view._nativeView instanceof UIView && data.newValue instanceof color.Color) {
- (view._nativeView).layer.borderColor = (data.newValue).ios.CGColor;
- }
-}
-(borderCommon.Border.borderColorProperty.metadata).onSetNativeValue = onBorderColorPropertyChanged;
-
-export class Border extends borderCommon.Border {
- //
-}
\ No newline at end of file
diff --git a/ui/border/border-common.ts b/ui/border/border.ts
similarity index 54%
rename from ui/border/border-common.ts
rename to ui/border/border.ts
index c3d50a4a6..784c7a999 100644
--- a/ui/border/border-common.ts
+++ b/ui/border/border.ts
@@ -7,54 +7,13 @@ import types = require("utils/types");
import viewModule = require("ui/core/view");
import utils = require("utils/utils");
-var cornerRadiusProperty = new dependencyObservable.Property(
- "cornerRadius",
- "Border",
- new proxy.PropertyMetadata(0, dependencyObservable.PropertyMetadataSettings.AffectsStyle)
- );
-
-var borderWidthProperty = new dependencyObservable.Property(
- "borderWidth",
- "Border",
- new proxy.PropertyMetadata(0, dependencyObservable.PropertyMetadataSettings.AffectsStyle)
- );
-
-var borderColorProperty = new dependencyObservable.Property(
- "borderColor",
- "Border",
- new proxy.PropertyMetadata(undefined, dependencyObservable.PropertyMetadataSettings.AffectsStyle)
- );
-
@Deprecated
export class Border extends contentView.ContentView implements definition.Border {
-
- public static cornerRadiusProperty = cornerRadiusProperty;
- public static borderWidthProperty = borderWidthProperty;
- public static borderColorProperty = borderColorProperty;
-
get cornerRadius(): number {
- return this._getValue(Border.cornerRadiusProperty);
+ return this.borderRadius;
}
set cornerRadius(value: number) {
- this._setValue(Border.cornerRadiusProperty, value);
- }
-
- get borderWidth(): number {
- return this._getValue(Border.borderWidthProperty);
- }
- set borderWidth(value: number) {
- this._setValue(Border.borderWidthProperty, value);
- }
-
- get borderColor(): color.Color {
- return this._getValue(Border.borderColorProperty);
- }
- set borderColor(value: color.Color) {
- if (types.isString(value) || types.isNumber(value)) {
- this._setValue(Border.borderColorProperty, new color.Color(value));
- } else {
- this._setValue(Border.borderColorProperty, value);
- }
+ this.borderRadius = value;
}
public onMeasure(widthMeasureSpec: number, heightMeasureSpec: number): void {
@@ -82,8 +41,4 @@ export class Border extends contentView.ContentView implements definition.Border
var borderSize = this.borderWidth * density;
viewModule.View.layoutChild(this, this.content, borderSize, borderSize, right - left - borderSize, bottom - top - borderSize);
}
-
- public _updateAndroidBorder() {
- // This is android specific method.
- }
}
\ No newline at end of file
diff --git a/ui/enums/enums.d.ts b/ui/enums/enums.d.ts
index ef08a32cc..268302f8c 100644
--- a/ui/enums/enums.d.ts
+++ b/ui/enums/enums.d.ts
@@ -404,7 +404,7 @@
/**
- * Specifies nackground repeat.
+ * Specifies background repeat.
*/
export module BackgroundRepeat {
export var repeat: string;
diff --git a/ui/styling/stylers.android.ts b/ui/styling/stylers.android.ts
index 511f53aec..3d18fdbe4 100644
--- a/ui/styling/stylers.android.ts
+++ b/ui/styling/stylers.android.ts
@@ -371,25 +371,6 @@ export class SearchBarStyler implements definition.stylers.Styler {
}
}
-export class BorderStyler implements definition.stylers.Styler {
- //Background methods
- private static setBackgroundProperty(view: view.View, newValue: any) {
- var border = view;
- border._updateAndroidBorder();
- }
-
- private static resetBackgroundProperty(view: view.View, nativeValue: any) {
- var border = view;
- border._updateAndroidBorder();
- }
-
- public static registerHandlers() {
- style.registerHandler(style.backgroundColorProperty, new stylersCommon.StylePropertyChangedHandler(
- BorderStyler.setBackgroundProperty,
- BorderStyler.resetBackgroundProperty), "Border");
- }
-}
-
// Register all styler at the end.
export function _registerDefaultStylers() {
style.registerNoStylingClass("Frame");
@@ -398,5 +379,4 @@ export function _registerDefaultStylers() {
ActivityIndicatorStyler.registerHandlers();
SegmentedBarStyler.registerHandlers();
SearchBarStyler.registerHandlers();
- BorderStyler.registerHandlers();
}