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

Merge pull request #267 from NativeScript/hhristov/ios-issues

Browse Source 
Fix iOS transition issue
This commit is contained in:
Hristo Hristov
2015-04-08 12:41:23 +03:00
parent d2160f7aa8 5cce9e206b
commit 0f5e107205
9 changed files with 99 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/tests/ui/helper.ts
View File

@ -194,7 +194,6 @@ export function navigateToModule(moduleName: string) {
frame.topmost().navigate({ moduleName: moduleName, animated: false });
TKUnit.waitUntilReady(() => { return frame.topmost().currentPage !== currentPage; });
TKUnit.assert(frame.topmost().currentPage.isLoaded, "Current page should be loaded!");
TKUnit.assert(!currentPage.isLoaded, "Previous page should be unloaded!");
}
export function goBack(): void {

2
apps/tests/ui/image/image-tests.ts
View File

@ -248,4 +248,4 @@ export var test_SettingStretch_none = function () {
}
helper.buildUIAndRunTest(image, testFunc);
}
}

18
apps/tests/ui/label/label-tests.ts
View File

@ -87,6 +87,24 @@ export var test_Set_Text_Native = function () {
helper.buildUIAndRunTest(label, test);
}
export var test_measuredWidth_is_not_clipped = function () {
var label = new LabelModule.Label();
label.horizontalAlignment = "left";
label.text = "i";
label.fontSize = 9;
var test = function (views: Array<view.View>) {
TKUnit.waitUntilReady(() => { return label.isLayoutValid; });
var expectedValue = 3;
var measuredWidth = label.getMeasuredWidth();
TKUnit.assertEqual(measuredWidth, expectedValue, "measuredWidth should not be rounded down.");
}
helper.buildUIAndRunTest(label, test);
}
export var test_Set_TextWrap_TNS = function () {
// <snippet module="ui/label" title="Label">
// ### How to turn on text wrapping for a label

4
ui/core/view-common.ts
View File

@ -476,7 +476,7 @@ export class View extends proxy.ProxyObject implements definition.View {
case utils.layout.AT_MOST:
if (specSize < size) {
result = Math.round(specSize) | utils.layout.MEASURED_STATE_TOO_SMALL;
result = Math.round(specSize + 0.499) | utils.layout.MEASURED_STATE_TOO_SMALL;
}
break;
@ -485,7 +485,7 @@ export class View extends proxy.ProxyObject implements definition.View {
break;
}
return Math.round(result) | (childMeasuredState & utils.layout.MEASURED_STATE_MASK);
return Math.round(result + 0.499) | (childMeasuredState & utils.layout.MEASURED_STATE_MASK);
}
public static layoutChild(parent: View, child: View, left: number, top: number, right: number, bottom: number): void {

2
ui/frame/frame.android.ts
View File

@ -182,7 +182,7 @@ class PageFragmentBody extends android.app.Fragment {
return true;
}
super.onOptionsItemSelected(item);
return super.onOptionsItemSelected(item);
}
}

70
ui/frame/frame.ios.ts
View File

@ -4,6 +4,8 @@ import trace = require("trace");
import imageSource = require("image-source");
import pages = require("ui/page");
import enums = require("ui/enums");
import utils = require("utils/utils");
import view = require("ui/core/view");
declare var exports;
require("utils/module-merge").merge(frameCommon, exports);
@ -15,7 +17,8 @@ var navDepth = 0;
export class Frame extends frameCommon.Frame {
private _ios: iOSFrame;
private _paramToNavigate: any;
public shouldSkipNativePop: boolean = false;
public _shouldSkipNativePop: boolean = false;
public _navigateToEntry: definition.BackstackEntry;
constructor() {
super();
@ -39,7 +42,7 @@ export class Frame extends frameCommon.Frame {
this._paramToNavigate = param;
}
}
public _navigateCore(backstackEntry: definition.BackstackEntry) {
var viewController = backstackEntry.resolvedPage.ios;
if (!viewController) {
@ -63,7 +66,7 @@ export class Frame extends frameCommon.Frame {
public _goBackCore(entry: definition.NavigationEntry) {
navDepth--;
trace.write("Frame<" + this._domId + ">.popViewControllerAnimated depth = " + navDepth, trace.categories.Navigation);
if (!this.shouldSkipNativePop) {
if (!this._shouldSkipNativePop) {
this._ios.controller.popViewControllerAnimated(this._getIsAnimatedNavigation(entry));
}
}
@ -109,6 +112,32 @@ export class Frame extends frameCommon.Frame {
}
}
public onMeasure(widthMeasureSpec: number, heightMeasureSpec: number): void {
var width = utils.layout.getMeasureSpecSize(widthMeasureSpec);
var widthMode = utils.layout.getMeasureSpecMode(widthMeasureSpec);
var height = utils.layout.getMeasureSpecSize(heightMeasureSpec);
var heightMode = utils.layout.getMeasureSpecMode(heightMeasureSpec);
var result = view.View.measureChild(this, this.currentPage, widthMeasureSpec, utils.layout.makeMeasureSpec(height - this.navigationBarHeight, heightMode));
if (this._navigateToEntry) {
view.View.measureChild(this, this._navigateToEntry.resolvedPage, widthMeasureSpec, utils.layout.makeMeasureSpec(height - this.navigationBarHeight, heightMode));
}
var widthAndState = view.View.resolveSizeAndState(result.measuredWidth, width, widthMode, 0);
var heightAndState = view.View.resolveSizeAndState(result.measuredHeight, height, heightMode, 0);
this.setMeasuredDimension(widthAndState, heightAndState);
}
public onLayout(left: number, top: number, right: number, bottom: number): void {
view.View.layoutChild(this, this.currentPage, 0, this.navigationBarHeight, right - left, bottom - top);
if (this._navigateToEntry) {
view.View.layoutChild(this, this._navigateToEntry.resolvedPage, 0, this.navigationBarHeight, right - left, bottom - top);
}
}
public layoutNativeView(left: number, top: number, right: number, bottom: number): void {
// We don't call super here because we set frame on our first subview.
// This is done because when rotated in iOS7 there is rotation applied on the first subview on the Window which is our frame.nativeView.view.
@ -196,6 +225,21 @@ class UINavigationControllerImpl extends UINavigationController implements UINav
this._owner._updateLayout();
}
public navigationControllerWillShowViewControllerAnimated(navigationController: UINavigationController, viewController: UIViewController, animated: boolean): void {
// In this method we need to layout the new page otherwise page will be shown empty and update after that which is bad UX.
var frame = this._owner;
var newEntry: definition.BackstackEntry = viewController[ENTRY];
var newPage = newEntry.resolvedPage;
if (!newPage.parent) {
frame._navigateToEntry = newEntry;
frame._addView(newPage);
frame.populateMenuItems(newPage);
}
else if (newPage.parent !== frame) {
throw new Error("Page is already shown on another frame.");
}
}
public navigationControllerDidShowViewControllerAnimated(navigationController: UINavigationController, viewController: UIViewController, animated: boolean): void {
var frame: Frame = this._owner;
@ -203,28 +247,30 @@ class UINavigationControllerImpl extends UINavigationController implements UINav
var currentEntry = backStack.length > 0 ? backStack[backStack.length - 1] : null;
var newEntry: definition.BackstackEntry = viewController[ENTRY];
if (newEntry === currentEntry && currentEntry) {
// This code check if navigation happened through UI (e.g. back button or swipe gesture).
// When calling goBack on frame isBack will be false.
var isBack: boolean = currentEntry && newEntry === currentEntry;
if (isBack) {
try {
frame.shouldSkipNativePop = true;
frame._shouldSkipNativePop = true;
frame.goBack();
}
finally {
frame.shouldSkipNativePop = false;
frame._shouldSkipNativePop = false;
}
}
var page = frame.currentPage;
if (page) {
if (page && !navigationController.viewControllers.containsObject(page.ios)) {
frame._removeView(page);
}
var newPage = newEntry.resolvedPage;
frame._navigateToEntry = null;
frame._currentEntry = newEntry;
frame._addView(newPage);
frame.populateMenuItems(newPage);
frame.updateNavigationBar();
var newPage = newEntry.resolvedPage;
// notify the page
newPage.onNavigatedTo(newEntry.entry.context);
frame._processNavigationQueue(newPage);

1
ui/image/image-common.ts
View File

@ -65,6 +65,7 @@ export class Image extends view.View implements definition.Image {
IMAGE,
new proxy.PropertyMetadata(
undefined,
// None on purpose. for iOS we trigger it manually if needed. Android layout handles it.
dependencyObservable.PropertyMetadataSettings.None
)
);

8
ui/image/image.d.ts vendored
View File

@ -10,8 +10,8 @@ declare module "ui/image" {
* Represents a class that provides functionality for loading and streching image(s).
*/
export class Image extends view.View {
public static urlProperty: dependencyObservable.Property;
public static sourceProperty: dependencyObservable.Property;
public static srcProperty: dependencyObservable.Property;
public static imageSourceProperty: dependencyObservable.Property;
public static isLoadingProperty: dependencyObservable.Property;
public static stretchProperty: dependencyObservable.Property;
@ -53,12 +53,12 @@ declare module "ui/image" {
/**
* Gets or sets the image source of the image.
*/
source: imageSource.ImageSource;
imageSource: imageSource.ImageSource;
/**
* Gets or sets the URL of the image.
*/
url: string;
src: string;
/**
* Gets or sets the image stretch mode. Possible values are contained in the [Stretch enumeration](../enums/Stretch/README.md).

27
ui/list-view/list-view.ios.ts
View File

@ -186,7 +186,7 @@ export class ListView extends common.ListView {
public refresh() {
this._ios.reloadData();
this.requestLayout();
this.requestLayout();
}
public getHeight(index: number): number {
@ -227,21 +227,22 @@ export class ListView extends common.ListView {
public _prepareCell(tableCell: UITableViewCell, indexPath: NSIndexPath): number {
var cell: any = tableCell;
if (!cell.view) {
cell.view = this._getItemTemplateContent(indexPath.row);
}
var args = notifyForItemAtIndex(this, cell, ITEMLOADING, indexPath);
var view = cell.view = args.view || this._getDefaultItemContent(indexPath.row);
if (view && !view.parent && view.ios) {
cell.contentView.addSubview(view.ios);
this._addView(view);
}
var cellHeight: number;
try {
this._preparingCell = true;
if (!cell.view) {
cell.view = this._getItemTemplateContent(indexPath.row);
}
var args = notifyForItemAtIndex(this, cell, ITEMLOADING, indexPath);
var view = cell.view = args.view || this._getDefaultItemContent(indexPath.row);
if (view && !view.parent && view.ios) {
cell.contentView.addSubview(view.ios);
this._addView(view);
}
this._prepareItem(view, indexPath.row);
cellHeight = this._layoutCell(view, indexPath);
}