From cfe19f1c176adaaba75d4a669c0de2c40a08e0f8 Mon Sep 17 00:00:00 2001 From: Nedyalko Nikolov Date: Wed, 16 Sep 2015 15:05:14 +0300 Subject: [PATCH] Added some checks according to changed iOS9 API. --- apps/tests/ui/list-view/list-view-tests.ts | 14 ++++++++++++-- ui/tab-view/tab-view.ios.ts | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/apps/tests/ui/list-view/list-view-tests.ts b/apps/tests/ui/list-view/list-view-tests.ts index 6a744d647..a9e6d8cd7 100644 --- a/apps/tests/ui/list-view/list-view-tests.ts +++ b/apps/tests/ui/list-view/list-view-tests.ts @@ -675,7 +675,12 @@ function getTextFromNativeElementAt(listView: listViewModule.ListView, index: nu return (nativeElement).getText() + ""; } else if (listView.ios) { - return listView.ios.visibleCells()[index].contentView.subviews[0].text + ""; + if (utils.ios.MajorVersion <= 8) { + return listView.ios.visibleCells()[index].contentView.subviews[0].text + ""; + } + else if (utils.ios.MajorVersion > 8) { + return listView.ios.visibleCells[index].contentView.subviews[0].text + ""; + } } } @@ -684,7 +689,12 @@ function getNativeViewCount(listView: listViewModule.ListView): number { return listView.android.getChildCount(); } else if (listView.ios) { - return listView.ios.visibleCells().count; + if (utils.ios.MajorVersion <= 8) { + return listView.ios.visibleCells().count; + } + else if (utils.ios.MajorVersion > 8) { + return (listView.ios.visibleCells).count; + } } else { throw new Error("Cannot get native view count"); diff --git a/ui/tab-view/tab-view.ios.ts b/ui/tab-view/tab-view.ios.ts index 68ea83848..6f33a09a5 100644 --- a/ui/tab-view/tab-view.ios.ts +++ b/ui/tab-view/tab-view.ios.ts @@ -82,7 +82,12 @@ export class TabViewItem extends common.TabViewItem { var icon = this._parent._getIcon(this.iconSource); var tabBarItem = UITabBarItem.alloc().initWithTitleImageTag((this.title || ""), icon, this._parent.items.indexOf(this)); if (!icon) { - tabBarItem.setTitlePositionAdjustment({ horizontal: 0, vertical: -20 }); + if (utils.ios.MajorVersion <= 8) { + tabBarItem.setTitlePositionAdjustment({ horizontal: 0, vertical: -20 }); + } + else if (utils.ios.MajorVersion > 8) { + (tabBarItem).titlePositionAdjustment = { horizontal: 0, vertical: -20 }; + } } this._controller.tabBarItem = tabBarItem; } @@ -184,7 +189,12 @@ export class TabView extends common.TabView { var tabBarItem = UITabBarItem.alloc().initWithTitleImageTag((item.title || ""), icon, i); if (!icon) { - tabBarItem.setTitlePositionAdjustment({ horizontal: 0, vertical: -20 }); + if (utils.ios.MajorVersion <= 8) { + tabBarItem.setTitlePositionAdjustment({ horizontal: 0, vertical: -20 }); + } + else if (utils.ios.MajorVersion > 8) { + (tabBarItem).titlePositionAdjustment = { horizontal: 0, vertical: -20 }; + } } newController.tabBarItem = tabBarItem; newControllers.addObject(newController);