Skip to content

Commit 173cde8

Browse files
hdeshevhdeshev
committed
Pull the Owned android helper interface to utils/utils.
In a @Private block.
1 parent 9fbcf5f commit 173cde8

File tree

8 files changed

+25
-37
lines changed

8 files changed

+25
-37
lines changed

‎ui/button/button.android.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
import common = require("ui/button/button-common");
2+
import utils = require("utils/utils")
23

34
global.moduleMerge(common, exports);
45

5-
interface Owned {
6-
owner: any;
7-
}
8-
96
export class Button extends common.Button {
107
private _android: android.widget.Button;
118
private _isPressed: boolean;
@@ -27,7 +24,7 @@ export class Button extends common.Button {
2724
this._android = new android.widget.Button(this._context);
2825

2926
this._android.setOnClickListener(new android.view.View.OnClickListener(
30-
<Owned & android.view.View.IOnClickListener>{
27+
<utils.Owned & android.view.View.IOnClickListener>{
3128
get owner() {
3229
return that.get();
3330
},

‎ui/date-picker/date-picker.android.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import dependencyObservable = require("ui/core/dependency-observable");
33
import proxy = require("ui/core/proxy");
44
import types = require("utils/types");
5+
import utils = require("utils/utils")
56

67
function onYearPropertyChanged(data: dependencyObservable.PropertyChangeData) {
78
var picker = <DatePicker>data.object;
@@ -65,10 +66,6 @@ function onMinDatePropertyChanged(data: dependencyObservable.PropertyChangeData)
6566

6667
global.moduleMerge(common, exports);
6768

68-
interface Owned {
69-
owner: any;
70-
}
71-
7269
export class DatePicker extends common.DatePicker {
7370
private _android: android.widget.DatePicker;
7471
public _listener: android.widget.DatePicker.OnDateChangedListener;
@@ -83,7 +80,7 @@ export class DatePicker extends common.DatePicker {
8380
var that = new WeakRef(this);
8481

8582
this._listener = new android.widget.DatePicker.OnDateChangedListener(
86-
<Owned & android.widget.DatePicker.IOnDateChangedListener>{
83+
<utils.Owned & android.widget.DatePicker.IOnDateChangedListener>{
8784
get owner() {
8885
return that.get();
8986
},

‎ui/list-picker/list-picker.android.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
import common = require("ui/list-picker/list-picker-common");
22
import dependencyObservable = require("ui/core/dependency-observable");
33
import types = require("utils/types");
4+
import utils = require("utils/utils")
45

56
global.moduleMerge(common, exports);
67

7-
interface Owned {
8-
owner: any;
9-
}
10-
118
export class ListPicker extends common.ListPicker {
129
private _android: android.widget.NumberPicker;
1310
private _valueChangedListener: android.widget.NumberPicker.OnValueChangeListener;
@@ -33,7 +30,7 @@ export class ListPicker extends common.ListPicker {
3330
var that = new WeakRef(this);
3431

3532
this._formatter = new android.widget.NumberPicker.Formatter(
36-
<Owned & android.widget.NumberPicker.IFormatter>{
33+
<utils.Owned & android.widget.NumberPicker.IFormatter>{
3734
get owner(): ListPicker {
3835
return that.get();
3936
},
@@ -48,7 +45,7 @@ export class ListPicker extends common.ListPicker {
4845
});
4946
this._android.setFormatter(this._formatter);
5047

51-
this._valueChangedListener = new android.widget.NumberPicker.OnValueChangeListener(<Owned & android.widget.NumberPicker.IOnValueChangeListener>{
48+
this._valueChangedListener = new android.widget.NumberPicker.OnValueChangeListener(<utils.Owned & android.widget.NumberPicker.IOnValueChangeListener>{
5249
get owner() {
5350
return that.get();
5451
},

‎ui/list-view/list-view.android.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import proxy = require("ui/core/proxy");
77
import dependencyObservable = require("ui/core/dependency-observable");
88
import color = require("color");
99
import definition = require("ui/list-view");
10+
import utils = require("utils/utils")
1011

1112
var ITEMLOADING = common.ListView.itemLoadingEvent;
1213
var LOADMOREITEMS = common.ListView.loadMoreItemsEvent;
@@ -27,10 +28,6 @@ function onSeparatorColorPropertyChanged(data: dependencyObservable.PropertyChan
2728
}
2829
}
2930

30-
interface Owned {
31-
owner: any;
32-
}
33-
3431
// register the setNativeValue callbacks
3532
(<proxy.PropertyMetadata>common.ListView.separatorColorProperty.metadata).onSetNativeValue = onSeparatorColorPropertyChanged;
3633

@@ -54,7 +51,7 @@ export class ListView extends common.ListView {
5451
var that = new WeakRef(this);
5552

5653
// TODO: This causes many marshalling calls, rewrite in Java and generate bindings
57-
this.android.setOnScrollListener(new android.widget.AbsListView.OnScrollListener(<Owned & android.widget.AbsListView.IOnScrollListener>{
54+
this.android.setOnScrollListener(new android.widget.AbsListView.OnScrollListener(<utils.Owned & android.widget.AbsListView.IOnScrollListener>{
5855
onScrollStateChanged: function (view: android.widget.AbsListView, scrollState: number) {
5956
var owner: ListView = this.owner;
6057
if (!owner) {

‎ui/search-bar/search-bar.android.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import dependencyObservable = require("ui/core/dependency-observable");
33
import proxy = require("ui/core/proxy");
44
import color = require("color");
55
import types = require("utils/types");
6+
import utils = require("utils/utils")
67

78
var SEARCHTEXT = "searchText";
89
var QUERY = "query";
@@ -92,10 +93,6 @@ function _changeSearchViewHintColor(bar: android.widget.SearchView, color: numbe
9293

9394
global.moduleMerge(common, exports);
9495

95-
interface Owned {
96-
owner: any;
97-
}
98-
9996
export class SearchBar extends common.SearchBar {
10097
private _android: android.widget.SearchView;
10198

@@ -105,7 +102,7 @@ export class SearchBar extends common.SearchBar {
105102
this._android.setIconified(false);
106103

107104
var that = new WeakRef(this);
108-
this._android.setOnQueryTextListener(new android.widget.SearchView.OnQueryTextListener(<Owned & android.widget.SearchView.IOnQueryTextListener>{
105+
this._android.setOnQueryTextListener(new android.widget.SearchView.OnQueryTextListener(<utils.Owned & android.widget.SearchView.IOnQueryTextListener>{
109106
get owner() {
110107
return that.get();
111108
},
@@ -136,7 +133,7 @@ export class SearchBar extends common.SearchBar {
136133
}
137134
}));
138135

139-
this._android.setOnCloseListener(new android.widget.SearchView.OnCloseListener(<Owned & android.widget.SearchView.IOnCloseListener>{
136+
this._android.setOnCloseListener(new android.widget.SearchView.OnCloseListener(<utils.Owned & android.widget.SearchView.IOnCloseListener>{
140137
get owner() {
141138
return that.get();
142139
},

‎ui/switch/switch.android.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import common = require("ui/switch/switch-common");
22
import dependencyObservable = require("ui/core/dependency-observable");
33
import proxy = require("ui/core/proxy");
4+
import utils = require("utils/utils")
45

56
function onCheckedPropertyChanged(data: dependencyObservable.PropertyChangeData) {
67
var swtch = <Switch>data.object;
@@ -16,10 +17,6 @@ function onCheckedPropertyChanged(data: dependencyObservable.PropertyChangeData)
1617

1718
global.moduleMerge(common, exports);
1819

19-
interface Owned {
20-
owner: any;
21-
}
22-
2320
export class Switch extends common.Switch {
2421
private _android: android.widget.Switch;
2522

@@ -32,7 +29,7 @@ export class Switch extends common.Switch {
3229

3330
var that = new WeakRef(this);
3431

35-
this._android.setOnCheckedChangeListener(new android.widget.CompoundButton.OnCheckedChangeListener(<Owned & android.widget.CompoundButton.IOnCheckedChangeListener>{
32+
this._android.setOnCheckedChangeListener(new android.widget.CompoundButton.OnCheckedChangeListener(<utils.Owned & android.widget.CompoundButton.IOnCheckedChangeListener>{
3633
get owner() {
3734
return that.get();
3835
},

‎ui/time-picker/time-picker.android.ts‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import common = require("ui/time-picker/time-picker-common");
22
import dependencyObservable = require("ui/core/dependency-observable");
33
import proxy = require("ui/core/proxy");
4+
import utils = require("utils/utils")
45

56
function onHourPropertyChanged(data: dependencyObservable.PropertyChangeData) {
67
var picker = <TimePicker>data.object;
@@ -18,10 +19,6 @@ function onMinutePropertyChanged(data: dependencyObservable.PropertyChangeData)
1819

1920
global.moduleMerge(common, exports);
2021

21-
interface Owned {
22-
owner: any;
23-
}
24-
2522
export class TimePicker extends common.TimePicker {
2623
private _android: android.widget.TimePicker;
2724
private _listener: android.widget.TimePicker.OnTimeChangedListener;
@@ -37,7 +34,7 @@ export class TimePicker extends common.TimePicker {
3734
var that = new WeakRef(this);
3835

3936
this._listener = new android.widget.TimePicker.OnTimeChangedListener(
40-
<Owned & android.widget.TimePicker.IOnTimeChangedListener>{
37+
<utils.Owned & android.widget.TimePicker.IOnTimeChangedListener>{
4138
get owner() {
4239
return that.get();
4340
},

‎utils/utils.d.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@
33

44
export var RESOURCE_PREFIX: string;
55

6+
//@private
7+
/**
8+
* Used by various android event listener implementations
9+
*/
10+
interface Owned {
11+
owner: any;
12+
}
13+
//@endprivate
14+
615
/**
716
* Utility module related to layout.
817
*/

0 commit comments

Comments
 (0)