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

Polish the Android implementation. Rework the iOS approach to use another mechanism.

Browse Source
This commit is contained in:
atanasovg
2015-09-02 16:13:02 +03:00
parent 45d12ce565
commit 1fd27182a6
2 changed files with 54 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,10 +13,10 @@ var OWNER = "_owner";
var HIDDEN = "_hidden"; var HIDDEN = "_hidden";
var INTENT_EXTRA = "com.tns.activity"; var INTENT_EXTRA = "com.tns.activity";
var ANDROID_FRAME = "android_frame"; var ANDROID_FRAME = "android_frame";
var BACKSTAK_TAG = "_backstackTag"; var BACKSTACK_TAG = "_backstackTag";
var NAV_DEPTH = "_navDepth"; var NAV_DEPTH = "_navDepth";
var navDepth = 0; var navDepth = -1;
class PageFragmentBody extends android.app.Fragment { class PageFragmentBody extends android.app.Fragment {
public frame: Frame; public frame: Frame;
@ -226,18 +226,19 @@ export class Frame extends frameCommon.Frame {
return; return;
} }
navDepth++;
var manager = activity.getFragmentManager(); var manager = activity.getFragmentManager();
var fragmentTransaction = manager.beginTransaction(); var fragmentTransaction = manager.beginTransaction();
var newFragmentTag = "fragment" + navDepth; var newFragmentTag = "fragment" + navDepth;
var newFragment = new PageFragmentBody(this, backstackEntry); var newFragment = new PageFragmentBody(this, backstackEntry);
backstackEntry[BACKSTAK_TAG] = newFragmentTag; backstackEntry[BACKSTACK_TAG] = newFragmentTag;
backstackEntry[NAV_DEPTH] = navDepth; backstackEntry[NAV_DEPTH] = navDepth;
// remember the fragment tag at page level so that we can retrieve the fragment associated with a Page instance // remember the fragment tag at page level so that we can retrieve the fragment associated with a Page instance
backstackEntry.resolvedPage[TAG] = newFragmentTag; backstackEntry.resolvedPage[TAG] = newFragmentTag;
navDepth++;
trace.write("Frame<" + this._domId + ">.fragmentTransaction PUSH depth = " + navDepth, trace.categories.Navigation); trace.write("Frame<" + this._domId + ">.fragmentTransaction PUSH depth = " + navDepth, trace.categories.Navigation);
if (this._isFirstNavigation) { if (this._isFirstNavigation) {
@ -265,8 +266,10 @@ export class Frame extends frameCommon.Frame {
} }
if (this.backStack.length > 0) { if (this.backStack.length > 0) {
fragmentTransaction.addToBackStack(newFragmentTag); // We add each entry in the backstack to avoid the "Stack corrupted" mismatch
trace.write("fragmentTransaction.addToBackStack(" + newFragmentTag + ");", trace.categories.NativeLifecycle); var backstackTag = this._currentEntry[BACKSTACK_TAG];
fragmentTransaction.addToBackStack(backstackTag);
trace.write("fragmentTransaction.addToBackStack(" + backstackTag + ");", trace.categories.NativeLifecycle);
} }
} }
@ -297,7 +300,7 @@ export class Frame extends frameCommon.Frame {
if (manager.getBackStackEntryCount() > 0) { if (manager.getBackStackEntryCount() > 0) {
// pop all other fragments up until the named one // pop all other fragments up until the named one
// this handles cases where user may navigate to an inner page without adding it on the backstack // this handles cases where user may navigate to an inner page without adding it on the backstack
manager.popBackStack(<string>backstackEntry[BACKSTAK_TAG], android.app.FragmentManager.POP_BACK_STACK_INCLUSIVE); manager.popBackStack(backstackEntry[BACKSTACK_TAG], android.app.FragmentManager.POP_BACK_STACK_INCLUSIVE);
} }
} }

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

@ -10,7 +10,6 @@ import types = require("utils/types");
global.moduleMerge(frameCommon, exports); global.moduleMerge(frameCommon, exports);
var ENTRY = "_entry"; var ENTRY = "_entry";
var PREV_ENTRY = "_prevEntry";
var NAV_DEPTH = "_navDepth"; var NAV_DEPTH = "_navDepth";
var navDepth = -1; var navDepth = -1;
@ -19,7 +18,6 @@ export class Frame extends frameCommon.Frame {
private _ios: iOSFrame; private _ios: iOSFrame;
private _paramToNavigate: any; private _paramToNavigate: any;
public _navigateToEntry: definition.BackstackEntry; public _navigateToEntry: definition.BackstackEntry;
public _goBackScheduled: boolean;
constructor() { constructor() {
super(); super();
@ -60,11 +58,33 @@ export class Frame extends frameCommon.Frame {
backstackEntry[NAV_DEPTH] = navDepth; backstackEntry[NAV_DEPTH] = navDepth;
viewController[ENTRY] = backstackEntry; viewController[ENTRY] = backstackEntry;
this._navigateToEntry = backstackEntry; this._navigateToEntry = backstackEntry;
trace.write("Frame<" + this._domId + ">.pushViewControllerAnimated depth = " + navDepth, trace.categories.Navigation);
this._updateActionBar(backstackEntry.resolvedPage); this._updateActionBar(backstackEntry.resolvedPage);
this._ios.controller.pushViewControllerAnimated(viewController, animated);
if (this._currentEntry && !this._isEntryBackstackVisible(this._currentEntry)) {
var newControllers = NSMutableArray.alloc().initWithArray(this._ios.controller.viewControllers);
if (newControllers.count === 0) {
throw new Error("Wrong controllers count.");
}
var newController: UIViewController = backstackEntry.resolvedPage.ios;
// the code below fixes a phantom animation that appears in this case
// TODO: investigate why the animation happens at first place before working around it
newController.navigationItem.hidesBackButton = this.backStack.length === 0;
// swap the top entry with the new one
newControllers.removeLastObject();
newControllers.addObject(newController);
// replace the controllers instead of pushing directly
this._ios.controller.setViewControllersAnimated(newControllers, animated);
}
else {
this._ios.controller.pushViewControllerAnimated(viewController, animated);
}
trace.write("Frame<" + this._domId + ">.pushViewControllerAnimated depth = " + navDepth, trace.categories.Navigation);
} }
public _goBackCore(backstackEntry: definition.BackstackEntry) { public _goBackCore(backstackEntry: definition.BackstackEntry) {
@ -74,21 +94,18 @@ export class Frame extends frameCommon.Frame {
var controller = backstackEntry.resolvedPage.ios; var controller = backstackEntry.resolvedPage.ios;
var animated = this._getIsAnimatedNavigation(backstackEntry.entry); var animated = this._getIsAnimatedNavigation(backstackEntry.entry);
this._navigateToEntry = backstackEntry; this._navigateToEntry = backstackEntry;
//this._updateActionBar(backstackEntry.resolvedPage);
this._updateActionBar(backstackEntry.resolvedPage);
this._ios.controller.popToViewControllerAnimated(controller, animated); this._ios.controller.popToViewControllerAnimated(controller, animated);
} }
public _updateActionBar(page?: pages.Page): void { public _updateActionBar(page?: pages.Page): void {
super._updateActionBar(page); super._updateActionBar(page);
var previousValue = !!this._ios.showNavigationBar;
var page = page || this.currentPage; var page = page || this.currentPage;
var newValue = this._getNavBarVisible(page); var newValue = this._getNavBarVisible(page);
this._ios.showNavigationBar = newValue; this._ios.showNavigationBar = newValue;
if (previousValue !== newValue) {
this.requestLayout();
}
} }
public _getNavBarVisible(page: pages.Page) { public _getNavBarVisible(page: pages.Page) {
@ -177,128 +194,20 @@ export class Frame extends frameCommon.Frame {
} }
} }
class UINavigationBarImpl extends UINavigationBar {
public static ObjCProtocols = [UINavigationBarDelegate];
static new(): UINavigationBarImpl {
return <UINavigationBarImpl>super.new();
}
private _originalDelegate: UINavigationBarDelegate;
get controller(): UINavigationControllerImpl {
return <UINavigationControllerImpl>this._originalDelegate;
}
get ownerFrame(): Frame {
return this.controller.owner;
}
get delegate() {
return this;
}
set delegate(value: UINavigationBarDelegate) {
this._originalDelegate = value;
(<any>this).super.delegate = this;
}
public setItemsAnimated(items: NSArray, animated: boolean) {
if (items) {
trace.write("updating navigation bar items stack; original items count: " + items.count, trace.categories.Navigation);
items = this.controller._getNavBarItems();
trace.write("updated navigation bar items stack; new items count: " + items.count, trace.categories.Navigation);
}
super.setItemsAnimated(items, animated);
}
public navigationBarShouldPopItem(navBar: UINavigationBar, item: UINavigationItem): boolean {
// should pop will be called only when the NavigationBar is visible and in the following cases:
// 1. The user has pressed the back button - we need to manually call 'goBack' on the Frame
// 2. The user has programmatically called goBack on the Frame - in this case the '_popScheduled' flag is set to true
if (!this.controller._popScheduled) {
this.ownerFrame.goBack();
}
return true;
}
public navigationBarShouldPushItem(navBar: UINavigationBar, item: UINavigationItem): boolean {
var entry = this.ownerFrame._navigateToEntry || this.ownerFrame._currentEntry;
if (!entry) {
return true;
}
var prevEntry: definition.BackstackEntry = entry[PREV_ENTRY];
if (!prevEntry) {
return true;
}
return this.ownerFrame._isEntryBackstackVisible(prevEntry);
}
//private _callBaseDelegateMethod() {
// //var controller = UINavigationController.alloc().init();
// //var methodSignature = controller.methodSignatureForSelector("navigationBar:shouldPopItem:");
// //if (methodSignature != null) {
// // var invocation = NSInvocation.invocationWithMethodSignature(methodSignature);
// // invocation.target = controller;
// // invocation.selector = "navigationBar:shouldPopItem:";
// // invocation.setArgumentAtIndex(new interop.Reference(UINavigationBar, UINavigationBar.alloc().init()), 2);
// // invocation.setArgumentAtIndex(new interop.Reference(UINavigationItem, UINavigationItem.alloc().init()), 3);
// // invocation.invoke();
// // var result = new interop.Reference(interop.types.bool, false);
// // invocation.getReturnValue(result);
// // console.log(result.value);
// //}
//}
}
class UINavigationControllerImpl extends UINavigationController implements UINavigationControllerDelegate { class UINavigationControllerImpl extends UINavigationController implements UINavigationControllerDelegate {
public static ObjCProtocols = [UINavigationControllerDelegate]; public static ObjCProtocols = [UINavigationControllerDelegate];
static new(): UINavigationControllerImpl { static new(): UINavigationControllerImpl {
return new UINavigationControllerImpl(UINavigationBarImpl.class(), null); return new UINavigationControllerImpl();
} }
private _owner: Frame; private _owner: Frame;
public _popScheduled;
public initWithOwner(owner: Frame): UINavigationControllerImpl { public initWithOwner(owner: Frame): UINavigationControllerImpl {
this._owner = owner; this._owner = owner;
return this; return this;
} }
public _getNavBarItems(): NSArray {
var frame = this._owner;
var backstack = frame.backStack;
var length = backstack.length;
var entry: definition.BackstackEntry;
var navItems = NSMutableArray.alloc().init();
for (let i = 0; i < length; i++) {
entry = backstack[i];
var controller: UIViewController = entry.resolvedPage.ios;
navItems.addObject(controller.navigationItem);
}
// add the top controller
entry = frame._navigateToEntry || frame._currentEntry;
if (entry) {
var topController = entry.resolvedPage.ios;
if (topController) {
navItems.addObject(topController.navigationItem);
}
}
return navItems;
}
get owner(): Frame { get owner(): Frame {
return this._owner; return this._owner;
} }
@ -314,43 +223,25 @@ class UINavigationControllerImpl extends UINavigationController implements UINav
this._owner._updateLayout(); this._owner._updateLayout();
} }
public popToViewControllerAnimated(controller: UIViewController, animated: boolean): NSArray { public popViewControllerAnimated(animated: boolean): UIViewController {
// our _goBackCore routine uses popToViewController, hence it is granted this method is called through the navbar back button click // this method is called when the Back button on the NavBar is pressed
this._popScheduled = true; // we are always using the other method - 'popToViewControllerAnimated', so it is safe to call goBack on the Frame here
return super.popToViewControllerAnimated(controller, animated); this._owner.goBack();
// skip the base implementation
return null;
} }
navigationControllerWillShowViewControllerAnimated(navigationController: UINavigationController, viewController: UIViewController, animated: boolean): void { 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. // 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) {
// if (!frame._currentEntry) {
// // First navigation
// frame._currentEntry = newEntry;
// }
// else {
// frame._navigateToEntry = newEntry;
// }
// frame._addView(newPage);
//}
//else if (newPage.parent !== frame) {
// throw new Error("Page is already shown on another frame.");
//}
//newPage.actionBar.update();
var currEntry = this._owner._currentEntry; var currEntry = this._owner._currentEntry;
if (currEntry) { if (currEntry) {
this._owner._removeView(currEntry.resolvedPage); this._owner._removeView(currEntry.resolvedPage);
//delete currEntry[PREV_ENTRY];
} }
var newEntry: definition.BackstackEntry = viewController[ENTRY]; var newEntry: definition.BackstackEntry = viewController[ENTRY];
var newPage = newEntry.resolvedPage; var newPage = newEntry.resolvedPage;
newEntry[PREV_ENTRY] = currEntry;
this._owner._currentEntry = newEntry; this._owner._currentEntry = newEntry;
this._owner._navigateToEntry = undefined; this._owner._navigateToEntry = undefined;
this._owner._addView(newEntry.resolvedPage); this._owner._addView(newEntry.resolvedPage);
@ -360,45 +251,9 @@ class UINavigationControllerImpl extends UINavigationController implements UINav
newPage.actionBar.update(); newPage.actionBar.update();
} }
navigationControllerDidShowViewControllerAnimated(navigationController: UINavigationController, viewController: UIViewController, animated: boolean): void { public navigationControllerDidShowViewControllerAnimated(navigationController: UINavigationController, viewController: UIViewController, animated: boolean): void {
this._popScheduled = false;
var entry: definition.BackstackEntry = viewController[ENTRY]; var entry: definition.BackstackEntry = viewController[ENTRY];
this._owner._processNavigationQueue(entry.resolvedPage); this._owner._processNavigationQueue(entry.resolvedPage);
//var frame: Frame = this._owner;
//var backStack = frame.backStack;
//var currentEntry = backStack.length > 0 ? backStack[backStack.length - 1] : null;
//var newEntry: definition.BackstackEntry = viewController[ENTRY];
//// 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.goBack();
// }
// finally {
// frame._shouldSkipNativePop = false;
// }
//}
//var page = frame.currentPage;
//if (page && !navigationController.viewControllers.containsObject(page.ios)) {
// frame._removeView(page);
//}
//frame._navigateToEntry = null;
//frame._currentEntry = newEntry;
//frame.updateNavigationBar();
//frame.ios.controller.navigationBar.backIndicatorImage
//var newPage = newEntry.resolvedPage;
//// notify the page
//newPage.onNavigatedTo();
//frame._processNavigationQueue(newPage);
} }
public supportedInterfaceOrientation(): number { public supportedInterfaceOrientation(): number {
@ -429,8 +284,13 @@ class iOSFrame implements definition.iOSFrame {
return this._showNavigationBar; return this._showNavigationBar;
} }
public set showNavigationBar(value: boolean) { public set showNavigationBar(value: boolean) {
var change = this._showNavigationBar !== value;
this._showNavigationBar = value; this._showNavigationBar = value;
this._controller.navigationBarHidden = !value; this._controller.navigationBarHidden = !value;
if (change) {
this._controller.owner.requestLayout();
}
} }
public get navBarVisibility(): string { public get navBarVisibility(): string {