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

Merge pull request #3348 from NativeScript/fixed-switch

Browse Source 
Fixed Switch
This commit is contained in:
Rossen Hristov
2016-12-22 17:05:58 +02:00
committed by GitHub
parent a276db4c38 f303a74570
commit 9d712cfaf6
3 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tns-core-modules/ui/switch/switch-common.ts
View File

@@ -1 +1,11 @@
 import { Switch as SwitchDefinition } from "ui/switch";
import { View, Property, booleanConverter } from "ui/core/view";
export * from "ui/core/view";
export class SwitchBase extends View implements SwitchDefinition {
public checked: boolean;
}
export const checkedProperty = new Property<SwitchBase, boolean>({ name: "checked", defaultValue: false, valueConverter: booleanConverter });
checkedProperty.register(SwitchBase);

14
tns-core-modules/ui/switch/switch.android.ts
View File

@@ -1,7 +1,8 @@
import { Switch as SwitchDefinition } from "ui/switch"; import {
import { View, Color, Property, colorProperty, backgroundColorProperty, backgroundInternalProperty, booleanConverter } from "ui/core/view"; SwitchBase, Color, colorProperty, backgroundColorProperty, backgroundInternalProperty, checkedProperty
} from "./switch-common";
export * from "ui/core/view"; export * from "./switch-common";
@Interfaces([android.widget.CompoundButton.OnCheckedChangeListener]) @Interfaces([android.widget.CompoundButton.OnCheckedChangeListener])
class CheckedChangeListener extends java.lang.Object implements android.widget.CompoundButton.OnCheckedChangeListener { class CheckedChangeListener extends java.lang.Object implements android.widget.CompoundButton.OnCheckedChangeListener {
@@ -18,7 +19,7 @@ class CheckedChangeListener extends java.lang.Object implements android.widget.C
} }
} }
export class Switch extends View implements SwitchDefinition { export class Switch extends SwitchBase {
private _android: android.widget.Switch; private _android: android.widget.Switch;
private listener: android.widget.CompoundButton.OnCheckedChangeListener; private listener: android.widget.CompoundButton.OnCheckedChangeListener;
public checked: boolean; public checked: boolean;
@@ -68,7 +69,4 @@ export class Switch extends View implements SwitchDefinition {
set [backgroundInternalProperty.native](value: any) { set [backgroundInternalProperty.native](value: any) {
// //
} }
} }
export const checkedProperty = new Property<Switch, boolean>({ name: "checked", defaultValue: false, valueConverter: booleanConverter });
checkedProperty.register(Switch);

16
tns-core-modules/ui/switch/switch.ios.ts
View File

@@ -1,7 +1,8 @@
import { Switch as SwitchDefinition } from "ui/switch"; import {
import { View, layout, Color, Property, colorProperty, backgroundColorProperty, backgroundInternalProperty, booleanConverter } from "ui/core/view"; SwitchBase, layout, Color, colorProperty, backgroundColorProperty, backgroundInternalProperty, checkedProperty
} from "./switch-common";
export * from "ui/core/view"; export * from "./switch-common";
class SwitchChangeHandlerImpl extends NSObject { class SwitchChangeHandlerImpl extends NSObject {
@@ -25,7 +26,7 @@ class SwitchChangeHandlerImpl extends NSObject {
}; };
} }
export class Switch extends View implements SwitchDefinition { export class Switch extends SwitchBase {
private _ios: UISwitch; private _ios: UISwitch;
private _handler: NSObject; private _handler: NSObject;
@@ -37,8 +38,6 @@ export class Switch extends View implements SwitchDefinition {
this._ios.addTargetActionForControlEvents(this._handler, "valueChanged", UIControlEvents.ValueChanged); this._ios.addTargetActionForControlEvents(this._handler, "valueChanged", UIControlEvents.ValueChanged);
} }
public checked: boolean;
get ios(): UISwitch { get ios(): UISwitch {
return this._ios; return this._ios;
} }
@@ -81,7 +80,4 @@ export class Switch extends View implements SwitchDefinition {
set [backgroundInternalProperty.native](value: any) { set [backgroundInternalProperty.native](value: any) {
// //
} }
} }
export const checkedProperty = new Property<Switch, boolean>({ name: "checked", defaultValue: false, valueConverter: booleanConverter });
checkedProperty.register(Switch);