From 2dbd1b19ead2955c4c8d3f1dd5822f7e95741efb Mon Sep 17 00:00:00 2001
From: Alexander Vakrilov <alexander.vakrilov@telerik.com>
Date: Tue, 1 Aug 2017 10:40:51 +0300
Subject: [PATCH] Fix: refresh flat property on change in IOS (#4628)

* Fix: refresh flat property on change in IOS

* Fix typos
---
 apps/app/ui-tests-app/action-bar/flat.ts      | 22 ++++++++++---------
 apps/app/ui-tests-app/action-bar/flat.xml     |  2 +-
 .../ui/action-bar/action-bar.ios.ts           |  9 +++++++-
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/apps/app/ui-tests-app/action-bar/flat.ts b/apps/app/ui-tests-app/action-bar/flat.ts
index 07b5e0e6b..5ca8b56c0 100644
--- a/apps/app/ui-tests-app/action-bar/flat.ts
+++ b/apps/app/ui-tests-app/action-bar/flat.ts
@@ -1,15 +1,17 @@
-import { Label } from "tns-core-modules/ui/Label";
-import { Page } from "tns-core-modules/ui/Page";
+import { Label } from "tns-core-modules/ui/label";
+import { Page } from "tns-core-modules/ui/page";
 
 export function onNavigateTo(args) {
-    const actionBar = (<Page>args.object).actionBar;
-    args.object.flatPropertyValue = <Label>args.object.getViewById("flatPropertyValue");
-    actionBar.flat = true;
-    args.object.flatPropertyValue.text = "Action bar flat property is set to: " + actionBar.flat;
+    updateText(args.object);
 }
 
 export function changeFlatPropertyValue(args) {
-    const actionBar = (<Page>args.object.page).actionBar;
-    actionBar.flat = !actionBar.flat;
-    args.object.page.flatPropertyValue.text = "Action bar flat property is set to: " + actionBar.flat;
-}
\ No newline at end of file
+    const page = <Page>args.object.page;
+    page.actionBar.flat = !page.actionBar.flat;
+    updateText(page);
+}
+
+function updateText(page: Page) {
+    const label = <Label>page.getViewById("flatPropertyValue");
+    label.text = "Action bar flat property is set to: " + page.actionBar.flat;
+}
diff --git a/apps/app/ui-tests-app/action-bar/flat.xml b/apps/app/ui-tests-app/action-bar/flat.xml
index 21220d00f..fd4dbd18b 100644
--- a/apps/app/ui-tests-app/action-bar/flat.xml
+++ b/apps/app/ui-tests-app/action-bar/flat.xml
@@ -1,6 +1,6 @@
 <Page navigatedTo="onNavigateTo" >
   <Page.actionBar>
-    <ActionBar title="Flat property" />
+    <ActionBar title="Flat property"/>
   </Page.actionBar>
   <StackLayout>
     <Button margin="30" text="change flat property" tap="changeFlatPropertyValue"/>
diff --git a/tns-core-modules/ui/action-bar/action-bar.ios.ts b/tns-core-modules/ui/action-bar/action-bar.ios.ts
index f7bebafc8..686600b3d 100644
--- a/tns-core-modules/ui/action-bar/action-bar.ios.ts
+++ b/tns-core-modules/ui/action-bar/action-bar.ios.ts
@@ -1,5 +1,5 @@
 import { IOSActionItemSettings, ActionItem as ActionItemDefinition } from ".";
-import { ActionItemBase, ActionBarBase, isVisible, View, colorProperty, backgroundColorProperty, backgroundInternalProperty, layout, Color } from "./action-bar-common";
+import { ActionItemBase, ActionBarBase, isVisible, View, colorProperty, backgroundColorProperty, backgroundInternalProperty, flatProperty, layout, Color } from "./action-bar-common";
 import { ImageSource, fromFileOrResource } from "../../image-source";
 
 export * from "./action-bar-common";
@@ -359,4 +359,11 @@ export class ActionBar extends ActionBarBase {
     }
     [backgroundInternalProperty.setNative](value: UIColor) { // tslint:disable-line
     }
+
+    [flatProperty.setNative](value: boolean) { // tslint:disable-line
+        let navBar = this.navBar;
+        if (navBar) {
+            this.updateFlatness(navBar);
+        }
+    }
 }
\ No newline at end of file