Merge pull request #3754 from NativeScript/fix-ios-action-bar-reset

Alexander Vakrilov · web-flow · commit 9ac9e5ab53f4 · 2017-03-09T09:42:54.000+02:00
Fix: Action-bar bg-color in ios not resetting
diff --git a/apps/app/ui-tests-app/page/page-status-bar-css.xml b/apps/app/ui-tests-app/page/page-status-bar-css.xml
@@ -16,19 +16,19 @@
             <Button text="22" tap="applyTapOnStyledActionBar" tag="status-bar-style: dark;" style.fontSize="8" width="40" height="40"  automationText="dark-abb-ruby" />
 
             <!-- status-bar-style - page - background -->
-            <Button text="51" tap="applyTap" tag="status-bar-style: light;background-color: #E0115F;" style.fontSize="8" width="40" height="40"  automationText="light-bckg-ruby" />
+            <Button text="51" tap="applyTap" tag="status-bar-style: light; background-color: #E0115F;" style.fontSize="8" width="40" height="40"  automationText="light-bckg-ruby" />
             <Button text="52" tap="applyTap" tag="status-bar-style: dark; background-color: #E0115F;" style.fontSize="8" width="40" height="40"  automationText="dark-bckg-ruby" />
 
             <!-- status-bar-style - page - and - action-bar - background -->
             <Button text="61" tap="applyTapOnStyledActionBar" tag="status-bar-style: light;background-color: #E0115F;" style.fontSize="8" width="40" height="40"  automationText="light-bckg-yellow-abbckg-ruby" />
-            <Button text="62" tap="applyTapOnStyledActionBar" tag="status-bar-style: dark; ;background-color: #E0115F;" style.fontSize="8" width="40" height="40"  automationText="dark-bckg-yellow-abbckg-ruby" />
+            <Button text="62" tap="applyTapOnStyledActionBar" tag="status-bar-style: dark;background-color: #E0115F;" style.fontSize="8" width="40" height="40"  automationText="dark-bckg-yellow-abbckg-ruby" />
 
             <!-- status-bar-style - action-bar - hidden - and - backgroundSpanUnderStatusBar -->
             <Button text="71" tap="applyTapWithSpan" tag="status-bar-style: light;background-color: yellow" style.fontSize="8" width="40" height="40"  automationText="dark-bckg-yellow-bckgsusb-true" />
-            <Button text="72" tap="applyTapOnStyledActionBarAndSpan" tag="status-bar-style: light;background-color: yellow;" style.fontSize="8" width="40" height="40" automationText="light-bckg-yellow-abbck-ruby-bckgsusb-true" />
+            <Button text="72" tap="applyTapOnStyledActionBarAndSpan" tag="status-bar-style: light; background-color: yellow;" style.fontSize="8" width="40" height="40" automationText="light-bckg-yellow-abbck-ruby-bckgsusb-true" />
 
             <Button text="73" tap="applyTapWithSpan" tag="status-bar-style: dark;background-color: yellow;" style.fontSize="8" width="40" height="40"  automationText="light-ab-hidden-bckgsusb-true" />
-            <Button text="74" tap="applyTapWithActionBarHiddenAndSpan" tag="status-bar-style: dark;background-color: yellow;" style.fontSize="8" width="40" height="40"  automationText="dark-ab-hidden-bckgsusb-true" />
+            <Button text="74" tap="applyTapWithActionBarHiddenAndSpan" tag="status-bar-style: dark; background-color: yellow;" style.fontSize="8" width="40" height="40"  automationText="dark-ab-hidden-bckgsusb-true" />
 
         </WrapLayout>
 
diff --git a/tns-core-modules/ui/action-bar/action-bar.ios.ts b/tns-core-modules/ui/action-bar/action-bar.ios.ts
@@ -323,15 +323,13 @@ export class ActionBar extends ActionBarBase {
     }
 
     get [backgroundColorProperty.native](): UIColor {
-        let navBar = this.navBar;
-        if (navBar) {
-            return navBar.barTintColor;
-        }
+        // This getter is never called.
+        // CssAnimationProperty use default value form their constructor.
         return null;
     }
     set [backgroundColorProperty.native](value: UIColor | Color) {
         let navBar = this.navBar;
-        if (navBar && value) {
+        if (navBar) {
             let color = value instanceof Color ? value.ios : value;
             navBar.barTintColor = color;
         }

Original file line number	Diff line number	Diff line change
`@@ -323,15 +323,13 @@ export class ActionBar extends ActionBarBase {`
`323`	`323`	`}`
`324`	`324`
`325`	`325`	`get [backgroundColorProperty.native](): UIColor {`
`326`		`- let navBar = this.navBar;`
`327`		`- if (navBar) {`
`328`		`- return navBar.barTintColor;`
`329`		`- }`
	`326`	`+ // This getter is never called.`
	`327`	`+ // CssAnimationProperty use default value form their constructor.`
`330`	`328`	`return null;`
`331`	`329`	`}`
`332`	`330`	`set [backgroundColorProperty.native](value: UIColor \| Color) {`
`333`	`331`	`let navBar = this.navBar;`
`334`		`- if (navBar && value) {`
	`332`	`+ if (navBar) {`
`335`	`333`	`let color = value instanceof Color ? value.ios : value;`
`336`	`334`	`navBar.barTintColor = color;`
`337`	`335`	`}`