javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(segmented-bar-ios): add support for the new selectedSegmentTintColor property (#7880)

Browse Source
This commit is contained in:
Nikolay Tsonev
2019-10-02 16:49:20 +03:00
committed by Manol Donev
parent d479067afb
commit ca7c46da3c
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tns-core-modules/ui/segmented-bar/segmented-bar.ios.ts
View File

@@ -3,7 +3,7 @@ import {
SegmentedBarItemBase, SegmentedBarBase, selectedIndexProperty, itemsProperty, selectedBackgroundColorProperty, SegmentedBarItemBase, SegmentedBarBase, selectedIndexProperty, itemsProperty, selectedBackgroundColorProperty,
colorProperty, fontInternalProperty, Color colorProperty, fontInternalProperty, Color
} from "./segmented-bar-common"; } from "./segmented-bar-common";
import { ios as iosUtils } from "../../utils/utils";
export * from "./segmented-bar-common"; export * from "./segmented-bar-common";
export class SegmentedBarItem extends SegmentedBarItemBase { export class SegmentedBarItem extends SegmentedBarItemBase {
@@ -68,11 +68,19 @@ export class SegmentedBar extends SegmentedBarBase {
} }
[selectedBackgroundColorProperty.getDefault](): UIColor { [selectedBackgroundColorProperty.getDefault](): UIColor {
return this.ios.tintColor; const currentOsVersion = iosUtils.MajorVersion;
return currentOsVersion < 13 ? this.ios.tintColor : this.ios.selectedSegmentTintColor;
} }
[selectedBackgroundColorProperty.setNative](value: UIColor | Color) { [selectedBackgroundColorProperty.setNative](value: UIColor | Color) {
const currentOsVersion = iosUtils.MajorVersion;
let color = value instanceof Color ? value.ios : value; let color = value instanceof Color ? value.ios : value;
this.ios.tintColor = color; if (currentOsVersion < 13) {
this.ios.tintColor = color;
} else {
this.ios.selectedSegmentTintColor = color;
}
} }
[colorProperty.getDefault](): UIColor { [colorProperty.getDefault](): UIColor {