Pickers fixes and tests

This commit is contained in:
vakrilov
2015-04-20 15:57:11 +03:00
parent ac318f1172
commit 3bc025633b
10 changed files with 219 additions and 40 deletions

View File

@@ -1,12 +1,13 @@
import common = require("ui/date-picker/date-picker-common");
import dependencyObservable = require("ui/core/dependency-observable");
import proxy = require("ui/core/proxy");
import types = require("utils/types");
function onYearPropertyChanged(data: dependencyObservable.PropertyChangeData) {
var picker = <DatePicker>data.object;
if (picker.android && picker.android.getYear() !== data.newValue) {
picker.android.updateDate(data.newValue, picker.android.getMonth(), picker.android.getDayOfMonth());
updateNativeDate(picker);
}
}
@@ -16,7 +17,7 @@ function onMonthPropertyChanged(data: dependencyObservable.PropertyChangeData) {
var picker = <DatePicker>data.object;
if (picker.android && picker.android.getMonth() !== (data.newValue - 1)) {
picker.android.updateDate(picker.android.getYear(), data.newValue - 1, picker.android.getDayOfMonth());
updateNativeDate(picker);
}
}
@@ -26,12 +27,20 @@ function onDayPropertyChanged(data: dependencyObservable.PropertyChangeData) {
var picker = <DatePicker>data.object;
if (picker.android && picker.android.getDayOfMonth !== data.newValue) {
picker.android.updateDate(picker.android.getYear(), picker.android.getMonth(), data.newValue);
updateNativeDate(picker);
}
}
(<proxy.PropertyMetadata>common.DatePicker.dayProperty.metadata).onSetNativeValue = onDayPropertyChanged;
function updateNativeDate(picker: DatePicker) {
var year = types.isNumber(picker.year) ? picker.year : picker.android.getYear();
var month = types.isNumber(picker.month) ? (picker.month - 1) : picker.android.getMonth();
var day = types.isNumber(picker.day) ? picker.day : picker.android.getDayOfMonth();
picker.android.updateDate(year, month, day);
}
function onMaxDatePropertyChanged(data: dependencyObservable.PropertyChangeData) {
var picker = <DatePicker>data.object;
@@ -89,7 +98,7 @@ export class DatePicker extends common.DatePicker {
if (day !== this.owner.day) {
this.owner._onPropertyChangedFromNative(common.DatePicker.dayProperty, day);
}
}
}
}
});

View File

@@ -4,20 +4,14 @@ import proxy = require("ui/core/proxy");
function onHourPropertyChanged(data: dependencyObservable.PropertyChangeData) {
var picker = <TimePicker>data.object;
if (picker.android) {
picker.android.setCurrentHour(new java.lang.Integer(data.newValue));
}
picker._setNativeHourSilently(data.newValue);
}
(<proxy.PropertyMetadata>common.TimePicker.hourProperty.metadata).onSetNativeValue = onHourPropertyChanged;
function onMinutePropertyChanged(data: dependencyObservable.PropertyChangeData) {
var picker = <TimePicker>data.object;
if (picker.android) {
picker.android.setCurrentMinute(new java.lang.Integer(data.newValue));
}
picker._setNativeMinuteSilently(data.newValue);
}
(<proxy.PropertyMetadata>common.TimePicker.minuteProperty.metadata).onSetNativeValue = onMinutePropertyChanged;
@@ -29,6 +23,7 @@ require("utils/module-merge").merge(common, exports);
export class TimePicker extends common.TimePicker {
private _android: android.widget.TimePicker;
private _listener: android.widget.TimePicker.OnTimeChangedListener;
private _isSettingTime: boolean = false;
get android(): android.widget.TimePicker {
return this._android;
@@ -45,12 +40,12 @@ export class TimePicker extends common.TimePicker {
},
onTimeChanged: function (picker: android.widget.TimePicker, hour: number, minute: number) {
if (this.owner) {
if (this.owner && !this.owner._isSettingTime) {
if (hour !== this.owner.hour) {
this.owner._onPropertyChangedFromNative(common.TimePicker.hourProperty, hour);
}
if (minute !== this.owner.minute) {
this.owner._onPropertyChangedFromNative(common.TimePicker.minuteProperty, minute);
}
@@ -59,4 +54,32 @@ export class TimePicker extends common.TimePicker {
});
this._android.setOnTimeChangedListener(this._listener);
}
public _setNativeHourSilently(newValue: number) {
if (!this.android) {
return;
}
this._isSettingTime = true;
try {
this.android.setCurrentHour(new java.lang.Integer(newValue));
}
finally {
this._isSettingTime = false;
}
}
public _setNativeMinuteSilently(newValue: number) {
if (!this.android) {
return;
}
this._isSettingTime = true;
try {
this.android.setCurrentMinute(new java.lang.Integer(newValue));
}
finally {
this._isSettingTime = false;
}
}
}