From adf77afbd468df8a3bce7368dfa38b98ad9c2f02 Mon Sep 17 00:00:00 2001
From: Rossen Hristov <rossen.hristov@telerik.com>
Date: Tue, 20 Sep 2016 17:01:05 +0300
Subject: [PATCH] Add two more sample pages for testing borders.

Related to #859
---
 .../css/all-non-uniform-border.css            |  6 ++++
 .../css/all-non-uniform-border.xml            | 29 +++++++++++++++++++
 .../ui-tests-app/css/all-uniform-border.css   |  6 ++++
 .../ui-tests-app/css/all-uniform-border.xml   | 29 +++++++++++++++++++
 apps/app/ui-tests-app/css/main-page.ts        |  2 ++
 .../ui/progress/progress.android.ts           | 15 ----------
 tns-core-modules/ui/progress/progress.ios.ts  |  2 ++
 .../ui/search-bar/search-bar.android.ts       |  2 ++
 .../ui/search-bar/search-bar.ios.ts           |  2 ++
 tns-core-modules/ui/slider/slider.android.ts  | 15 ----------
 tns-core-modules/ui/switch/switch.android.ts  | 15 ----------
 tns-core-modules/ui/switch/switch.ios.ts      |  1 -
 12 files changed, 78 insertions(+), 46 deletions(-)
 create mode 100644 apps/app/ui-tests-app/css/all-non-uniform-border.css
 create mode 100644 apps/app/ui-tests-app/css/all-non-uniform-border.xml
 create mode 100644 apps/app/ui-tests-app/css/all-uniform-border.css
 create mode 100644 apps/app/ui-tests-app/css/all-uniform-border.xml

diff --git a/apps/app/ui-tests-app/css/all-non-uniform-border.css b/apps/app/ui-tests-app/css/all-non-uniform-border.css
new file mode 100644
index 000000000..686b78eaa
--- /dev/null
+++ b/apps/app/ui-tests-app/css/all-non-uniform-border.css
@@ -0,0 +1,6 @@
+.s0 {
+    border-width: 1 2 5 10; border-color: red green blue yellow;
+    width: 100;
+    height: 100;
+    font-size: 10;
+}
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/css/all-non-uniform-border.xml b/apps/app/ui-tests-app/css/all-non-uniform-border.xml
new file mode 100644
index 000000000..4fa204ff7
--- /dev/null
+++ b/apps/app/ui-tests-app/css/all-non-uniform-border.xml
@@ -0,0 +1,29 @@
+<Page>
+    <GridLayout rows="*,*,*,*,*,*" columns="*,*,*">
+        <Button class="s0" row="0" col="0" text="Button"/>
+        <Label class="s0" row="0" col="1" text="Label"/>
+        <TextField class="s0" row="0" col="2" text="TextField"/>
+        <TextView class="s0" row="1" col="0" text="TextView"/>
+        <SearchBar class="s0" row="1" col="1" text="SearchBar"/>
+        <Switch class="s0" row="1" col="2" checked="true"/>
+        <Slider class="s0" row="2" col="0" minValue="0" maxValue="100" value="50"/>
+        <Progress class="s0" row="2" col="1" maxValue="100" value="50"/>
+        <ActivityIndicator class="s0" row="2" col="2" busy="true"/>
+        <Image class="s0" row="3" col="0" src="~/ui-tests-app/image-view/gravatar.png" stretch="fill"/>
+        <ListView class="s0" row="3" col="1" items="ListView"/>
+        <HtmlView class="s0" row="3" col="2" html="<h1>HtmlView</h1>"/>
+        <WebView class="s0" row="4" col="0" src="https://www.nativescript.org/"/>
+        <SegmentedBar class="s0" row="4" col="1">
+            <SegmentedBar.items>
+                <SegmentedBarItem title="SB 1" />
+                <SegmentedBarItem title="SB 2" />
+            </SegmentedBar.items>
+        </SegmentedBar> 
+        <DatePicker class="s0" row="4" col="2" year="1980" month="2" day="9"/>
+        <TimePicker class="s0" row="5" col="0" hour="5" minute="30"/>
+        <ListPicker class="s0" row="5" col="1" items="123"/>
+        <ScrollView class="s0" row="5" col="2">
+            <Label text="ScrollView" width="160" height="160" style.backgroundColor="gray"/>
+        </ScrollView>
+    </GridLayout>
+</Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/css/all-uniform-border.css b/apps/app/ui-tests-app/css/all-uniform-border.css
new file mode 100644
index 000000000..80a348e33
--- /dev/null
+++ b/apps/app/ui-tests-app/css/all-uniform-border.css
@@ -0,0 +1,6 @@
+.s0 {
+    border-width: 5; border-color: red; border-radius: 5;
+    width: 100;
+    height: 100;
+    font-size: 10;
+}
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/css/all-uniform-border.xml b/apps/app/ui-tests-app/css/all-uniform-border.xml
new file mode 100644
index 000000000..4fa204ff7
--- /dev/null
+++ b/apps/app/ui-tests-app/css/all-uniform-border.xml
@@ -0,0 +1,29 @@
+<Page>
+    <GridLayout rows="*,*,*,*,*,*" columns="*,*,*">
+        <Button class="s0" row="0" col="0" text="Button"/>
+        <Label class="s0" row="0" col="1" text="Label"/>
+        <TextField class="s0" row="0" col="2" text="TextField"/>
+        <TextView class="s0" row="1" col="0" text="TextView"/>
+        <SearchBar class="s0" row="1" col="1" text="SearchBar"/>
+        <Switch class="s0" row="1" col="2" checked="true"/>
+        <Slider class="s0" row="2" col="0" minValue="0" maxValue="100" value="50"/>
+        <Progress class="s0" row="2" col="1" maxValue="100" value="50"/>
+        <ActivityIndicator class="s0" row="2" col="2" busy="true"/>
+        <Image class="s0" row="3" col="0" src="~/ui-tests-app/image-view/gravatar.png" stretch="fill"/>
+        <ListView class="s0" row="3" col="1" items="ListView"/>
+        <HtmlView class="s0" row="3" col="2" html="<h1>HtmlView</h1>"/>
+        <WebView class="s0" row="4" col="0" src="https://www.nativescript.org/"/>
+        <SegmentedBar class="s0" row="4" col="1">
+            <SegmentedBar.items>
+                <SegmentedBarItem title="SB 1" />
+                <SegmentedBarItem title="SB 2" />
+            </SegmentedBar.items>
+        </SegmentedBar> 
+        <DatePicker class="s0" row="4" col="2" year="1980" month="2" day="9"/>
+        <TimePicker class="s0" row="5" col="0" hour="5" minute="30"/>
+        <ListPicker class="s0" row="5" col="1" items="123"/>
+        <ScrollView class="s0" row="5" col="2">
+            <Label text="ScrollView" width="160" height="160" style.backgroundColor="gray"/>
+        </ScrollView>
+    </GridLayout>
+</Page>
\ No newline at end of file
diff --git a/apps/app/ui-tests-app/css/main-page.ts b/apps/app/ui-tests-app/css/main-page.ts
index 9442ebfc0..20c6db6d6 100644
--- a/apps/app/ui-tests-app/css/main-page.ts
+++ b/apps/app/ui-tests-app/css/main-page.ts
@@ -34,6 +34,8 @@ export function pageLoaded(args: EventData) {
     examples.set("image-border", "css/image-border");
     examples.set("layouts-border-overlap", "css/layouts-border-overlap");
     examples.set("measure-tests", "css/measure-tests");
+    examples.set("all-uniform-border", "css/all-uniform-border");
+    examples.set("all-non-uniform-border", "css/all-non-uniform-border");
     //examples.set("border-playground", "css/border-playground");
 
     let viewModel = new SubMianPageViewModel(wrapLayout, examples);
diff --git a/tns-core-modules/ui/progress/progress.android.ts b/tns-core-modules/ui/progress/progress.android.ts
index 6a98e14c3..a2c1efb42 100644
--- a/tns-core-modules/ui/progress/progress.android.ts
+++ b/tns-core-modules/ui/progress/progress.android.ts
@@ -78,21 +78,6 @@ export class ProgressStyler implements style.Styler {
             ProgressStyler.setBackgroundAndBorderProperty,
             ProgressStyler.resetBackgroundAndBorderProperty), "Progress");
 
-        style.registerHandler(style.borderTopColorProperty, style.ignorePropertyHandler, "Progress");
-        style.registerHandler(style.borderRightColorProperty, style.ignorePropertyHandler, "Progress");
-        style.registerHandler(style.borderBottomColorProperty, style.ignorePropertyHandler, "Progress");
-        style.registerHandler(style.borderLeftColorProperty, style.ignorePropertyHandler, "Progress");
-
-        style.registerHandler(style.borderTopWidthProperty, style.ignorePropertyHandler, "Progress");
-        style.registerHandler(style.borderRightWidthProperty, style.ignorePropertyHandler, "Progress");
-        style.registerHandler(style.borderBottomWidthProperty, style.ignorePropertyHandler, "Progress");
-        style.registerHandler(style.borderLeftWidthProperty, style.ignorePropertyHandler, "Progress");
-        
-        style.registerHandler(style.borderTopLeftRadiusProperty, style.ignorePropertyHandler, "Progress");
-        style.registerHandler(style.borderTopRightRadiusProperty, style.ignorePropertyHandler, "Progress");
-        style.registerHandler(style.borderBottomRightRadiusProperty, style.ignorePropertyHandler, "Progress");
-        style.registerHandler(style.borderBottomLeftRadiusProperty, style.ignorePropertyHandler, "Progress");
-        
         style.registerHandler(style.backgroundInternalProperty, style.ignorePropertyHandler, "Progress");
     }
 }
diff --git a/tns-core-modules/ui/progress/progress.ios.ts b/tns-core-modules/ui/progress/progress.ios.ts
index 2e4e07755..07e576abb 100644
--- a/tns-core-modules/ui/progress/progress.ios.ts
+++ b/tns-core-modules/ui/progress/progress.ios.ts
@@ -76,6 +76,8 @@ export class ProgressStyler implements style.Styler {
             ProgressStyler.setBackgroundColorProperty,
             ProgressStyler.resetBackgroundColorProperty,
             ProgressStyler.getBackgroundColorProperty), "Progress");
+
+        style.registerHandler(style.backgroundInternalProperty, style.ignorePropertyHandler, "Progress");
     }
 }
 
diff --git a/tns-core-modules/ui/search-bar/search-bar.android.ts b/tns-core-modules/ui/search-bar/search-bar.android.ts
index 4abbada43..401efbbaf 100644
--- a/tns-core-modules/ui/search-bar/search-bar.android.ts
+++ b/tns-core-modules/ui/search-bar/search-bar.android.ts
@@ -278,6 +278,8 @@ export class SearchBarStyler implements style.Styler {
             SearchBarStyler.setFontInternalProperty,
             SearchBarStyler.resetFontInternalProperty,
             SearchBarStyler.getNativeFontInternalValue), "SearchBar");
+
+        style.registerHandler(style.backgroundInternalProperty, style.ignorePropertyHandler, "SearchBar");
     }
 
     private static _getSearchViewTextView(bar: android.widget.SearchView): android.widget.TextView {
diff --git a/tns-core-modules/ui/search-bar/search-bar.ios.ts b/tns-core-modules/ui/search-bar/search-bar.ios.ts
index 6a4b80cd8..3fef83fe9 100644
--- a/tns-core-modules/ui/search-bar/search-bar.ios.ts
+++ b/tns-core-modules/ui/search-bar/search-bar.ios.ts
@@ -239,6 +239,8 @@ export class SearchBarStyler implements style.Styler {
             SearchBarStyler.setFontInternalProperty,
             SearchBarStyler.resetFontInternalProperty,
             SearchBarStyler.getNativeFontInternalValue), "SearchBar");
+
+        style.registerHandler(style.backgroundInternalProperty, style.ignorePropertyHandler, "SearchBar");
     }
 }
 
diff --git a/tns-core-modules/ui/slider/slider.android.ts b/tns-core-modules/ui/slider/slider.android.ts
index fecd5a3d9..12c047d87 100644
--- a/tns-core-modules/ui/slider/slider.android.ts
+++ b/tns-core-modules/ui/slider/slider.android.ts
@@ -127,21 +127,6 @@ export class SliderStyler implements style.Styler {
             SliderStyler.setBackgroundAndBorderProperty,
             SliderStyler.resetBackgroundAndBorderProperty), "Slider");
 
-        style.registerHandler(style.borderTopColorProperty, style.ignorePropertyHandler, "Slider");
-        style.registerHandler(style.borderRightColorProperty, style.ignorePropertyHandler, "Slider");
-        style.registerHandler(style.borderBottomColorProperty, style.ignorePropertyHandler, "Slider");
-        style.registerHandler(style.borderLeftColorProperty, style.ignorePropertyHandler, "Slider");
-
-        style.registerHandler(style.borderTopWidthProperty, style.ignorePropertyHandler, "Slider");
-        style.registerHandler(style.borderRightWidthProperty, style.ignorePropertyHandler, "Slider");
-        style.registerHandler(style.borderBottomWidthProperty, style.ignorePropertyHandler, "Slider");
-        style.registerHandler(style.borderLeftWidthProperty, style.ignorePropertyHandler, "Slider");
-        
-        style.registerHandler(style.borderTopLeftRadiusProperty, style.ignorePropertyHandler, "Slider");
-        style.registerHandler(style.borderTopRightRadiusProperty, style.ignorePropertyHandler, "Slider");
-        style.registerHandler(style.borderBottomRightRadiusProperty, style.ignorePropertyHandler, "Slider");
-        style.registerHandler(style.borderBottomLeftRadiusProperty, style.ignorePropertyHandler, "Slider");
-
         style.registerHandler(style.backgroundInternalProperty, style.ignorePropertyHandler, "Slider");
     }
 }
diff --git a/tns-core-modules/ui/switch/switch.android.ts b/tns-core-modules/ui/switch/switch.android.ts
index 0049e98ae..efbc13511 100644
--- a/tns-core-modules/ui/switch/switch.android.ts
+++ b/tns-core-modules/ui/switch/switch.android.ts
@@ -81,21 +81,6 @@ export class SwitchStyler implements style.Styler {
             SwitchStyler.setBackgroundAndBorderProperty,
             SwitchStyler.resetBackgroundAndBorderProperty), "Switch");
 
-        style.registerHandler(style.borderTopColorProperty, style.ignorePropertyHandler, "Switch");
-        style.registerHandler(style.borderRightColorProperty, style.ignorePropertyHandler, "Switch");
-        style.registerHandler(style.borderBottomColorProperty, style.ignorePropertyHandler, "Switch");
-        style.registerHandler(style.borderLeftColorProperty, style.ignorePropertyHandler, "Switch");
-
-        style.registerHandler(style.borderTopWidthProperty, style.ignorePropertyHandler, "Switch");
-        style.registerHandler(style.borderRightWidthProperty, style.ignorePropertyHandler, "Switch");
-        style.registerHandler(style.borderBottomWidthProperty, style.ignorePropertyHandler, "Switch");
-        style.registerHandler(style.borderLeftWidthProperty, style.ignorePropertyHandler, "Switch");
-        
-        style.registerHandler(style.borderTopLeftRadiusProperty, style.ignorePropertyHandler, "Switch");
-        style.registerHandler(style.borderTopRightRadiusProperty, style.ignorePropertyHandler, "Switch");
-        style.registerHandler(style.borderBottomRightRadiusProperty, style.ignorePropertyHandler, "Switch");
-        style.registerHandler(style.borderBottomLeftRadiusProperty, style.ignorePropertyHandler, "Switch");
-
         style.registerHandler(style.backgroundInternalProperty, style.ignorePropertyHandler, "Switch");
     }
 }
diff --git a/tns-core-modules/ui/switch/switch.ios.ts b/tns-core-modules/ui/switch/switch.ios.ts
index fcb9f5eee..959a52b8c 100644
--- a/tns-core-modules/ui/switch/switch.ios.ts
+++ b/tns-core-modules/ui/switch/switch.ios.ts
@@ -107,7 +107,6 @@ export class SwitchStyler implements style.Styler {
             SwitchStyler.resetBackgroundColorProperty,
             SwitchStyler.getBackgroundColorProperty), "Switch");
 
-        // Ignore the default backgroundInternalProperty handler
         style.registerHandler(style.backgroundInternalProperty, style.ignorePropertyHandler, "Switch");
     }
 }