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

Layouts are now implemented natively for Android.

Browse Source
This commit is contained in:
hshristov
2015-07-16 01:22:16 +03:00
parent 5a06731daa
commit 0ad198165c
45 changed files with 1727 additions and 1187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

161
ui/scroll-view/scroll-view.android.ts
View File

@@ -1,5 +1,4 @@
import dependencyObservable = require("ui/core/dependency-observable");
import view = require("ui/core/view");
import definition = require("ui/scroll-view");
import contentView = require("ui/content-view");
import common = require("ui/scroll-view/scroll-view-common");
@@ -8,97 +7,12 @@ import enums = require("ui/enums");
global.moduleMerge(common, exports);
var OWNER = "_owner";
var STATE = "_scrollViewState";
common.orientationProperty.metadata.onValueChanged = function scrollViewOrientationChanged(data: dependencyObservable.PropertyChangeData) {
(<ScrollView>data.object)._onOrientationChanged(data.oldValue, data.newValue);
}
interface ScrollViewState {
scrollX: number;
scrollY: number;
}
function onMeasureScrollView(widthMeasureSpec: number, heightMeasureSpec: number) {
var owner: view.View = this.owner;
owner.onMeasure(widthMeasureSpec, heightMeasureSpec);
this.setMeasuredDimension(owner.getMeasuredWidth(), owner.getMeasuredHeight());
}
function onLayoutScrollView(changed: boolean, left: number, top: number, right: number, bottom: number) {
var owner: view.View = this.owner;
owner.onLayout(left, top, right, bottom);
// Restore scroll state on the first layout after native instance is recreated.
var state: ScrollViewState = owner[STATE];
if (state) {
this.scrollTo(state.scrollX, state.scrollY);
delete owner[STATE];
}
}
function onSaveInstanceStateNative(): android.os.Parcelable {
var state: ScrollViewState = {
scrollX: this.getScrollX(),
scrollY: this.getScrollY()
}
this.owner[STATE] = state;
return this.super.onSaveInstanceState();
}
class NativeVerticalScrollView extends android.widget.ScrollView {
constructor(ctx) {
super(ctx);
return global.__native(this);
}
get owner() {
return this[OWNER];
}
public onMeasure(widthMeasureSpec: number, heightMeasureSpec: number) {
onMeasureScrollView.apply(this, [widthMeasureSpec, heightMeasureSpec]);
}
public onLayout(changed: boolean, left: number, top: number, right: number, bottom: number) {
onLayoutScrollView.apply(this, [changed, left, top, right, bottom]);
}
public onSaveInstanceState() {
onSaveInstanceStateNative.apply(this, []);
}
};
class NativeHorizontalScrollView extends android.widget.HorizontalScrollView {
constructor(ctx) {
super(ctx);
return global.__native(this);
}
get owner() {
return this[OWNER];
}
public onMeasure(widthMeasureSpec: number, heightMeasureSpec: number) {
onMeasureScrollView.apply(this, [widthMeasureSpec, heightMeasureSpec]);
}
public onLayout(changed: boolean, left: number, top: number, right: number, bottom: number) {
onLayoutScrollView.apply(this, [changed, left, top, right, bottom]);
}
public onSaveInstanceState() {
onSaveInstanceStateNative.apply(this, []);
}
};
export class ScrollView extends contentView.ContentView implements definition.ScrollView {
private _android: android.widget.FrameLayout;
private _contentMeasuredWidth: number = 0;
private _contentMeasuredHeight: number = 0;
private _scrollableLength: number = 0;
private _android: org.nativescript.widgets.VerticalScrollView | org.nativescript.widgets.HorizontalScrollView;
private _androidViewId: number;
get android(): android.view.ViewGroup {
@@ -137,7 +51,7 @@ export class ScrollView extends contentView.ContentView implements definition.Sc
return 0;
}
return this._scrollableLength;
return this._android.getScrollableLength();
}
get scrollableHeight(): number {
@@ -145,19 +59,18 @@ export class ScrollView extends contentView.ContentView implements definition.Sc
return 0;
}
return this._scrollableLength;
return this._android.getScrollableLength();
}
public scrollToVerticalOffset(value: number, animated: boolean) {
if (this._android && this.orientation === enums.Orientation.vertical) {
value *= utils.layout.getDisplayDensity();
var scrollView: android.widget.ScrollView = (<android.widget.ScrollView>this._android);
if (animated) {
scrollView.smoothScrollTo(0, value);
this._android.smoothScrollTo(0, value);
}
else {
scrollView.scrollTo(0, value);
this._android.scrollTo(0, value);
}
}
}
@@ -166,30 +79,28 @@ export class ScrollView extends contentView.ContentView implements definition.Sc
if (this._android && this.orientation === enums.Orientation.horizontal) {
value *= utils.layout.getDisplayDensity();
var scrollView: android.widget.HorizontalScrollView = (<android.widget.HorizontalScrollView>this._android);
if (animated) {
scrollView.smoothScrollTo(value, 0);
this._android.smoothScrollTo(value, 0);
}
else {
scrollView.scrollTo(value, 0);
this._android.scrollTo(value, 0);
}
}
}
public _createUI() {
if (this.orientation === enums.Orientation.horizontal) {
this._android = new NativeHorizontalScrollView(this._context);
this._android = new org.nativescript.widgets.HorizontalScrollView(this._context);
}
else {
this._android = new NativeVerticalScrollView(this._context);
this._android = new org.nativescript.widgets.VerticalScrollView(this._context);
}
if (!this._androidViewId) {
this._androidViewId = android.view.View.generateViewId();
}
this._android.setId(this._androidViewId);
this._android[OWNER] = this;
this._android.setId(this._androidViewId);
}
public _onOrientationChanged(oldValue: string, newValue: string) {
@@ -205,56 +116,4 @@ export class ScrollView extends contentView.ContentView implements definition.Sc
}
}
}
public onMeasure(widthMeasureSpec: number, heightMeasureSpec: number): void {
// Don't call measure because it will measure content twice.
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 density = utils.layout.getDisplayDensity();
var child = this.content
if (!child) {
this._scrollableLength = 0;
this._contentMeasuredWidth = this.minWidth * density;
this._contentMeasuredHeight = this.minHeight * density;
}
else {
var childSize: { measuredWidth: number; measuredHeight: number };
if (this.orientation === enums.Orientation.vertical) {
childSize = view.View.measureChild(this, child, widthMeasureSpec, utils.layout.makeMeasureSpec(0, utils.layout.UNSPECIFIED));
}
else {
childSize = view.View.measureChild(this, child, utils.layout.makeMeasureSpec(0, utils.layout.UNSPECIFIED), heightMeasureSpec);
}
this._contentMeasuredWidth = Math.max(childSize.measuredWidth, this.minWidth * density);
this._contentMeasuredHeight = Math.max(childSize.measuredHeight, this.minHeight * density);
}
var widthAndState = view.View.resolveSizeAndState(this._contentMeasuredWidth, width, widthMode, 0);
var heightAndState = view.View.resolveSizeAndState(this._contentMeasuredHeight, height, heightMode, 0);
this.setMeasuredDimension(widthAndState, heightAndState);
}
public onLayout(left: number, top: number, right: number, bottom: number): void {
var width = (right - left);
var height = (bottom - top);
if (this.orientation === enums.Orientation.horizontal) {
this._scrollableLength = this._contentMeasuredWidth - width;
view.View.layoutChild(this, this.content, 0, 0, Math.max(this._contentMeasuredWidth, width), height);
}
else {
this._scrollableLength = this._contentMeasuredHeight - height;
view.View.layoutChild(this, this.content, 0, 0, width, Math.max(this._contentMeasuredHeight, height));
}
this._scrollableLength /= utils.layout.getDisplayDensity();
this._scrollableLength = Math.max(0, this._scrollableLength);
}
}