mirror of
https://github.com/NativeScript/NativeScript.git
synced 2025-08-20 15:34:26 +08:00
Pull the Owned android helper interface to utils/utils.
In a @private block.
This commit is contained in:

committed by
Vladimir Enchev

parent
13deafec79
commit
d4827a34d9
@ -1,11 +1,8 @@
|
|||||||
import common = require("ui/button/button-common");
|
import common = require("ui/button/button-common");
|
||||||
|
import utils = require("utils/utils")
|
||||||
|
|
||||||
global.moduleMerge(common, exports);
|
global.moduleMerge(common, exports);
|
||||||
|
|
||||||
interface Owned {
|
|
||||||
owner: any;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class Button extends common.Button {
|
export class Button extends common.Button {
|
||||||
private _android: android.widget.Button;
|
private _android: android.widget.Button;
|
||||||
private _isPressed: boolean;
|
private _isPressed: boolean;
|
||||||
@ -27,7 +24,7 @@ export class Button extends common.Button {
|
|||||||
this._android = new android.widget.Button(this._context);
|
this._android = new android.widget.Button(this._context);
|
||||||
|
|
||||||
this._android.setOnClickListener(new android.view.View.OnClickListener(
|
this._android.setOnClickListener(new android.view.View.OnClickListener(
|
||||||
<Owned & android.view.View.IOnClickListener>{
|
<utils.Owned & android.view.View.IOnClickListener>{
|
||||||
get owner() {
|
get owner() {
|
||||||
return that.get();
|
return that.get();
|
||||||
},
|
},
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
import dependencyObservable = require("ui/core/dependency-observable");
|
import dependencyObservable = require("ui/core/dependency-observable");
|
||||||
import proxy = require("ui/core/proxy");
|
import proxy = require("ui/core/proxy");
|
||||||
import types = require("utils/types");
|
import types = require("utils/types");
|
||||||
|
import utils = require("utils/utils")
|
||||||
|
|
||||||
function onYearPropertyChanged(data: dependencyObservable.PropertyChangeData) {
|
function onYearPropertyChanged(data: dependencyObservable.PropertyChangeData) {
|
||||||
var picker = <DatePicker>data.object;
|
var picker = <DatePicker>data.object;
|
||||||
@ -65,10 +66,6 @@ function onMinDatePropertyChanged(data: dependencyObservable.PropertyChangeData)
|
|||||||
|
|
||||||
global.moduleMerge(common, exports);
|
global.moduleMerge(common, exports);
|
||||||
|
|
||||||
interface Owned {
|
|
||||||
owner: any;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class DatePicker extends common.DatePicker {
|
export class DatePicker extends common.DatePicker {
|
||||||
private _android: android.widget.DatePicker;
|
private _android: android.widget.DatePicker;
|
||||||
public _listener: android.widget.DatePicker.OnDateChangedListener;
|
public _listener: android.widget.DatePicker.OnDateChangedListener;
|
||||||
@ -83,7 +80,7 @@ export class DatePicker extends common.DatePicker {
|
|||||||
var that = new WeakRef(this);
|
var that = new WeakRef(this);
|
||||||
|
|
||||||
this._listener = new android.widget.DatePicker.OnDateChangedListener(
|
this._listener = new android.widget.DatePicker.OnDateChangedListener(
|
||||||
<Owned & android.widget.DatePicker.IOnDateChangedListener>{
|
<utils.Owned & android.widget.DatePicker.IOnDateChangedListener>{
|
||||||
get owner() {
|
get owner() {
|
||||||
return that.get();
|
return that.get();
|
||||||
},
|
},
|
||||||
|
@ -1,13 +1,10 @@
|
|||||||
import common = require("ui/list-picker/list-picker-common");
|
import common = require("ui/list-picker/list-picker-common");
|
||||||
import dependencyObservable = require("ui/core/dependency-observable");
|
import dependencyObservable = require("ui/core/dependency-observable");
|
||||||
import types = require("utils/types");
|
import types = require("utils/types");
|
||||||
|
import utils = require("utils/utils")
|
||||||
|
|
||||||
global.moduleMerge(common, exports);
|
global.moduleMerge(common, exports);
|
||||||
|
|
||||||
interface Owned {
|
|
||||||
owner: any;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class ListPicker extends common.ListPicker {
|
export class ListPicker extends common.ListPicker {
|
||||||
private _android: android.widget.NumberPicker;
|
private _android: android.widget.NumberPicker;
|
||||||
private _valueChangedListener: android.widget.NumberPicker.OnValueChangeListener;
|
private _valueChangedListener: android.widget.NumberPicker.OnValueChangeListener;
|
||||||
@ -33,7 +30,7 @@ export class ListPicker extends common.ListPicker {
|
|||||||
var that = new WeakRef(this);
|
var that = new WeakRef(this);
|
||||||
|
|
||||||
this._formatter = new android.widget.NumberPicker.Formatter(
|
this._formatter = new android.widget.NumberPicker.Formatter(
|
||||||
<Owned & android.widget.NumberPicker.IFormatter>{
|
<utils.Owned & android.widget.NumberPicker.IFormatter>{
|
||||||
get owner(): ListPicker {
|
get owner(): ListPicker {
|
||||||
return that.get();
|
return that.get();
|
||||||
},
|
},
|
||||||
@ -48,7 +45,7 @@ export class ListPicker extends common.ListPicker {
|
|||||||
});
|
});
|
||||||
this._android.setFormatter(this._formatter);
|
this._android.setFormatter(this._formatter);
|
||||||
|
|
||||||
this._valueChangedListener = new android.widget.NumberPicker.OnValueChangeListener(<Owned & android.widget.NumberPicker.IOnValueChangeListener>{
|
this._valueChangedListener = new android.widget.NumberPicker.OnValueChangeListener(<utils.Owned & android.widget.NumberPicker.IOnValueChangeListener>{
|
||||||
get owner() {
|
get owner() {
|
||||||
return that.get();
|
return that.get();
|
||||||
},
|
},
|
||||||
|
@ -7,6 +7,7 @@ import proxy = require("ui/core/proxy");
|
|||||||
import dependencyObservable = require("ui/core/dependency-observable");
|
import dependencyObservable = require("ui/core/dependency-observable");
|
||||||
import color = require("color");
|
import color = require("color");
|
||||||
import definition = require("ui/list-view");
|
import definition = require("ui/list-view");
|
||||||
|
import utils = require("utils/utils")
|
||||||
|
|
||||||
var ITEMLOADING = common.ListView.itemLoadingEvent;
|
var ITEMLOADING = common.ListView.itemLoadingEvent;
|
||||||
var LOADMOREITEMS = common.ListView.loadMoreItemsEvent;
|
var LOADMOREITEMS = common.ListView.loadMoreItemsEvent;
|
||||||
@ -27,10 +28,6 @@ function onSeparatorColorPropertyChanged(data: dependencyObservable.PropertyChan
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
interface Owned {
|
|
||||||
owner: any;
|
|
||||||
}
|
|
||||||
|
|
||||||
// register the setNativeValue callbacks
|
// register the setNativeValue callbacks
|
||||||
(<proxy.PropertyMetadata>common.ListView.separatorColorProperty.metadata).onSetNativeValue = onSeparatorColorPropertyChanged;
|
(<proxy.PropertyMetadata>common.ListView.separatorColorProperty.metadata).onSetNativeValue = onSeparatorColorPropertyChanged;
|
||||||
|
|
||||||
@ -54,7 +51,7 @@ export class ListView extends common.ListView {
|
|||||||
var that = new WeakRef(this);
|
var that = new WeakRef(this);
|
||||||
|
|
||||||
// TODO: This causes many marshalling calls, rewrite in Java and generate bindings
|
// TODO: This causes many marshalling calls, rewrite in Java and generate bindings
|
||||||
this.android.setOnScrollListener(new android.widget.AbsListView.OnScrollListener(<Owned & android.widget.AbsListView.IOnScrollListener>{
|
this.android.setOnScrollListener(new android.widget.AbsListView.OnScrollListener(<utils.Owned & android.widget.AbsListView.IOnScrollListener>{
|
||||||
onScrollStateChanged: function (view: android.widget.AbsListView, scrollState: number) {
|
onScrollStateChanged: function (view: android.widget.AbsListView, scrollState: number) {
|
||||||
var owner: ListView = this.owner;
|
var owner: ListView = this.owner;
|
||||||
if (!owner) {
|
if (!owner) {
|
||||||
|
@ -3,6 +3,7 @@ import dependencyObservable = require("ui/core/dependency-observable");
|
|||||||
import proxy = require("ui/core/proxy");
|
import proxy = require("ui/core/proxy");
|
||||||
import color = require("color");
|
import color = require("color");
|
||||||
import types = require("utils/types");
|
import types = require("utils/types");
|
||||||
|
import utils = require("utils/utils")
|
||||||
|
|
||||||
var SEARCHTEXT = "searchText";
|
var SEARCHTEXT = "searchText";
|
||||||
var QUERY = "query";
|
var QUERY = "query";
|
||||||
@ -92,10 +93,6 @@ function _changeSearchViewHintColor(bar: android.widget.SearchView, color: numbe
|
|||||||
|
|
||||||
global.moduleMerge(common, exports);
|
global.moduleMerge(common, exports);
|
||||||
|
|
||||||
interface Owned {
|
|
||||||
owner: any;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class SearchBar extends common.SearchBar {
|
export class SearchBar extends common.SearchBar {
|
||||||
private _android: android.widget.SearchView;
|
private _android: android.widget.SearchView;
|
||||||
|
|
||||||
@ -105,7 +102,7 @@ export class SearchBar extends common.SearchBar {
|
|||||||
this._android.setIconified(false);
|
this._android.setIconified(false);
|
||||||
|
|
||||||
var that = new WeakRef(this);
|
var that = new WeakRef(this);
|
||||||
this._android.setOnQueryTextListener(new android.widget.SearchView.OnQueryTextListener(<Owned & android.widget.SearchView.IOnQueryTextListener>{
|
this._android.setOnQueryTextListener(new android.widget.SearchView.OnQueryTextListener(<utils.Owned & android.widget.SearchView.IOnQueryTextListener>{
|
||||||
get owner() {
|
get owner() {
|
||||||
return that.get();
|
return that.get();
|
||||||
},
|
},
|
||||||
@ -136,7 +133,7 @@ export class SearchBar extends common.SearchBar {
|
|||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
|
||||||
this._android.setOnCloseListener(new android.widget.SearchView.OnCloseListener(<Owned & android.widget.SearchView.IOnCloseListener>{
|
this._android.setOnCloseListener(new android.widget.SearchView.OnCloseListener(<utils.Owned & android.widget.SearchView.IOnCloseListener>{
|
||||||
get owner() {
|
get owner() {
|
||||||
return that.get();
|
return that.get();
|
||||||
},
|
},
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
import common = require("ui/switch/switch-common");
|
import common = require("ui/switch/switch-common");
|
||||||
import dependencyObservable = require("ui/core/dependency-observable");
|
import dependencyObservable = require("ui/core/dependency-observable");
|
||||||
import proxy = require("ui/core/proxy");
|
import proxy = require("ui/core/proxy");
|
||||||
|
import utils = require("utils/utils")
|
||||||
|
|
||||||
function onCheckedPropertyChanged(data: dependencyObservable.PropertyChangeData) {
|
function onCheckedPropertyChanged(data: dependencyObservable.PropertyChangeData) {
|
||||||
var swtch = <Switch>data.object;
|
var swtch = <Switch>data.object;
|
||||||
@ -16,10 +17,6 @@ function onCheckedPropertyChanged(data: dependencyObservable.PropertyChangeData)
|
|||||||
|
|
||||||
global.moduleMerge(common, exports);
|
global.moduleMerge(common, exports);
|
||||||
|
|
||||||
interface Owned {
|
|
||||||
owner: any;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class Switch extends common.Switch {
|
export class Switch extends common.Switch {
|
||||||
private _android: android.widget.Switch;
|
private _android: android.widget.Switch;
|
||||||
|
|
||||||
@ -32,7 +29,7 @@ export class Switch extends common.Switch {
|
|||||||
|
|
||||||
var that = new WeakRef(this);
|
var that = new WeakRef(this);
|
||||||
|
|
||||||
this._android.setOnCheckedChangeListener(new android.widget.CompoundButton.OnCheckedChangeListener(<Owned & android.widget.CompoundButton.IOnCheckedChangeListener>{
|
this._android.setOnCheckedChangeListener(new android.widget.CompoundButton.OnCheckedChangeListener(<utils.Owned & android.widget.CompoundButton.IOnCheckedChangeListener>{
|
||||||
get owner() {
|
get owner() {
|
||||||
return that.get();
|
return that.get();
|
||||||
},
|
},
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
import common = require("ui/time-picker/time-picker-common");
|
import common = require("ui/time-picker/time-picker-common");
|
||||||
import dependencyObservable = require("ui/core/dependency-observable");
|
import dependencyObservable = require("ui/core/dependency-observable");
|
||||||
import proxy = require("ui/core/proxy");
|
import proxy = require("ui/core/proxy");
|
||||||
|
import utils = require("utils/utils")
|
||||||
|
|
||||||
function onHourPropertyChanged(data: dependencyObservable.PropertyChangeData) {
|
function onHourPropertyChanged(data: dependencyObservable.PropertyChangeData) {
|
||||||
var picker = <TimePicker>data.object;
|
var picker = <TimePicker>data.object;
|
||||||
@ -18,10 +19,6 @@ function onMinutePropertyChanged(data: dependencyObservable.PropertyChangeData)
|
|||||||
|
|
||||||
global.moduleMerge(common, exports);
|
global.moduleMerge(common, exports);
|
||||||
|
|
||||||
interface Owned {
|
|
||||||
owner: any;
|
|
||||||
}
|
|
||||||
|
|
||||||
export class TimePicker extends common.TimePicker {
|
export class TimePicker extends common.TimePicker {
|
||||||
private _android: android.widget.TimePicker;
|
private _android: android.widget.TimePicker;
|
||||||
private _listener: android.widget.TimePicker.OnTimeChangedListener;
|
private _listener: android.widget.TimePicker.OnTimeChangedListener;
|
||||||
@ -37,7 +34,7 @@ export class TimePicker extends common.TimePicker {
|
|||||||
var that = new WeakRef(this);
|
var that = new WeakRef(this);
|
||||||
|
|
||||||
this._listener = new android.widget.TimePicker.OnTimeChangedListener(
|
this._listener = new android.widget.TimePicker.OnTimeChangedListener(
|
||||||
<Owned & android.widget.TimePicker.IOnTimeChangedListener>{
|
<utils.Owned & android.widget.TimePicker.IOnTimeChangedListener>{
|
||||||
get owner() {
|
get owner() {
|
||||||
return that.get();
|
return that.get();
|
||||||
},
|
},
|
||||||
|
9
utils/utils.d.ts
vendored
9
utils/utils.d.ts
vendored
@ -3,6 +3,15 @@
|
|||||||
|
|
||||||
export var RESOURCE_PREFIX: string;
|
export var RESOURCE_PREFIX: string;
|
||||||
|
|
||||||
|
//@private
|
||||||
|
/**
|
||||||
|
* Used by various android event listener implementations
|
||||||
|
*/
|
||||||
|
interface Owned {
|
||||||
|
owner: any;
|
||||||
|
}
|
||||||
|
//@endprivate
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Utility module related to layout.
|
* Utility module related to layout.
|
||||||
*/
|
*/
|
||||||
|
Reference in New Issue
Block a user