Various stying improvements, sizing based on fontsize

sitefinitysteve · sitefinitysteve · commit 061a420334f5 · 2016-08-09T22:53:22.000-04:00
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,85 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch on iOS Device",
+            "type": "nativescript",
+            "platform": "ios",
+            "request": "launch",
+            "appRoot": "${workspaceRoot}",
+            "sourceMaps": true,
+            "diagnosticLogging": false,
+            "emulator": false
+        },
+        {
+            "name": "Attach on iOS Device",
+            "type": "nativescript",
+            "platform": "ios",
+            "request": "attach",
+            "appRoot": "${workspaceRoot}",
+            "sourceMaps": true,
+            "diagnosticLogging": false,
+            "emulator": false
+        },
+        {
+            "name": "Launch on iOS Emulator",
+            "type": "nativescript",
+            "platform": "ios",
+            "request": "launch",
+            "appRoot": "${workspaceRoot}",
+            "sourceMaps": true,
+            "diagnosticLogging": false,
+            "emulator": true
+        },
+        {
+            "name": "Attach on iOS Emulator",
+            "type": "nativescript",
+            "platform": "ios",
+            "request": "attach",
+            "appRoot": "${workspaceRoot}",
+            "sourceMaps": true,
+            "diagnosticLogging": false,
+            "emulator": true
+        },
+        {
+            "name": "Launch on Android Device",
+            "type": "nativescript",
+            "platform": "android",
+            "request": "launch",
+            "appRoot": "${workspaceRoot}",
+            "sourceMaps": true,
+            "diagnosticLogging": false,
+            "emulator": false
+        },
+        {
+            "name": "Launch on Android Emulator",
+            "type": "nativescript",
+            "platform": "android",
+            "request": "launch",
+            "appRoot": "${workspaceRoot}",
+            "sourceMaps": true,
+            "diagnosticLogging": false,
+            "emulator": true
+        },
+        {
+            "name": "Attach on Android Device",
+            "type": "nativescript",
+            "platform": "android",
+            "request": "attach",
+            "appRoot": "${workspaceRoot}",
+            "sourceMaps": true,
+            "diagnosticLogging": false,
+            "emulator": false
+        },
+        {
+            "name": "Attach on Android Emulator",
+            "type": "nativescript",
+            "platform": "android",
+            "request": "attach",
+            "appRoot": "${workspaceRoot}",
+            "sourceMaps": true,
+            "diagnosticLogging": false,
+            "emulator": true
+        }
+    ]
+}
diff --git a/app/App_Resources/iOS/Info.plist b/app/App_Resources/iOS/Info.plist
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIRequiresFullScreen</key>
+	<true/>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>
diff --git a/checkbox.android.ts b/checkbox.android.ts
@@ -13,7 +13,6 @@ declare var android: any;
 export class CheckBox extends View implements CheckBoxInterface {
     private _android: any; /// android.widget.CheckBox
     private _fillColor: string;
-    private _checkBoxSize: number;
 
     public static checkedProperty = new Property(
         "checked",
@@ -29,8 +28,6 @@ export class CheckBox extends View implements CheckBoxInterface {
 
     constructor() {
         super();
-
-        this._checkBoxSize = 21;
     }
 
     get android() {
@@ -67,14 +64,6 @@ export class CheckBox extends View implements CheckBoxInterface {
             this._android.setButtonTintList(android.content.res.ColorStateList.valueOf(new Color(this._fillColor).android));
     }
 
-    get checkboxSize(){
-        return this._checkBoxSize;
-    }
-
-    set checkBoxSize(size: number) {
-        this._checkBoxSize = size;
-    }
-
     //There is no difference between tint and fill on the android widget
     get tintColor() : string {
         return this.fillColor;
@@ -93,10 +82,13 @@ export class CheckBox extends View implements CheckBoxInterface {
             this._android.setText(this.text);
         }
 
-        //Set bound colors
+        
         if(this._android){
-            if(this.fillColor)
+            if(this.fillColor){
+                //Set bound colors
                 this._android.setButtonTintList(android.content.res.ColorStateList.valueOf(new Color(this._fillColor).android));
+            }
+
         }
 
         var that = new WeakRef(this);
diff --git a/checkbox.d.ts b/checkbox.d.ts
@@ -44,7 +44,7 @@ export interface CheckBoxInterface{
     checked: boolean;
     fillColor: string;
     tintColor: string;
-    checkBoxSize: number;
+    //checkBoxSize: number;
 
     toggle(): void;
 }
diff --git a/checkbox.ios.ts b/checkbox.ios.ts
@@ -30,7 +30,6 @@ export class CheckBox extends Button implements CheckBoxInterface {
   private _animationDuration: number;
   private _onAnimationType: number;
   private _offAnimationType: number;
-  private _checkBoxSize: number;
 
   constructor() {
     super();
@@ -42,9 +41,8 @@ export class CheckBox extends Button implements CheckBoxInterface {
     this._tintColor = "#0075ff";
     this._onAnimationType = 2;
     this._offAnimationType = 2;
-    this._checkBoxSize = 21;
-        
-    this._iosCheckbox = <BEMCheckBox>BEMCheckBox.alloc().initWithFrame(CGRectMake(0, 0, this._checkBoxSize, this._checkBoxSize));
+    
+    this._iosCheckbox = <BEMCheckBox>BEMCheckBox.alloc().initWithFrame(CGRectMake(0, 0, 21, 21));
     this._delegate = BEMCheckBoxDelegateImpl.initWithOwner(new WeakRef(this));
   }  
 
@@ -65,14 +63,6 @@ export class CheckBox extends Button implements CheckBoxInterface {
       this._iosCheckbox.onTintColor = new Color(color).ios;
   }
 
-  get checkboxSize(){
-    return this._checkBoxSize;
-  }
-
-  set checkBoxSize(size: number) {
-    this._checkBoxSize = size;
-  }
-
   /* NATIVE PROPERTIES */
   set checkedAnimated(value: boolean) {
     if (this._iosCheckbox)
@@ -152,10 +142,14 @@ export class CheckBox extends Button implements CheckBoxInterface {
   public onLoaded() {
     super.onLoaded();
 
+    var fontSize = this.style.fontSize;
     this._iosCheckbox.delegate = this._delegate;
-    this._iosCheckbox.frame = CGRectMake(0,0,this._checkBoxSize,this._checkBoxSize);
 
-    this.style.paddingLeft = this._checkBoxSize + 10;
+    //Positioning
+    this._iosCheckbox.frame = CGRectMake(0,0,fontSize,fontSize);
+    this._iosCheckbox.center = CGPointMake( this._iosCheckbox.center.x, (fontSize / 2) + 3);
+    
+    this.style.paddingLeft = fontSize + (fontSize > 20 ? 10 : 5);
     this.style.textAlignment = "left";
 
     this.ios.addSubview(this._iosCheckbox);
@@ -229,7 +223,7 @@ export class CheckBox extends Button implements CheckBoxInterface {
   }
 
   public _onCheckedPropertyChanged(data: PropertyChangeData) {
-    console.log("_onCheckedPropertyChanged");
+    console.log("_onCheckedPropertyChanged to " + data.newValue);
       debugger;
       if(this._iosCheckbox){
             this._iosCheckbox.setOnAnimated(data.newValue, true);
@@ -238,7 +232,7 @@ export class CheckBox extends Button implements CheckBoxInterface {
 }
 
 function onCheckedPropertyChanged(data: PropertyChangeData) {
-  console.log("onCheckedPropertyChanged");
+  console.log("onCheckedPropertyChanged to " + data.newValue);
   debugger;
     var checkbox = <CheckBox>data.object;
     checkbox._onCheckedPropertyChanged(data);
@@ -268,10 +262,9 @@ class BEMCheckBoxDelegateImpl extends NSObject implements BEMCheckBoxDelegate {
     }
 
     public didTapCheckBox(checkBox: BEMCheckBox): void {
-      debugger;
-      console.log("delegate check");
       let owner = this._owner.get();
         if (owner) {
+                console.log("delegate check " + checkBox.on);
             owner._onPropertyChangedFromNative(CheckBox.checkedProperty, checkBox.on);
         }
     }
diff --git a/demo/app/app.css b/demo/app/app.css
@@ -50,7 +50,7 @@ CheckBox{
     color: white;
     border-color: yellow;
     border-width: 1;
-    font-size: 20;
+    font-size: 15;
 }
 
 .demosection{
diff --git a/demo/app/main-page.xml b/demo/app/main-page.xml
@@ -8,7 +8,7 @@
     <Label text="Functions" class="title" />
     <StackLayout class="listitem">
       <GridLayout columns="*, auto" class="demosection">
-        <CheckBox:CheckBox id="toggleTest" col="0" text="toggle()" checked="false" checkBoxSize="30"  />
+        <CheckBox:CheckBox id="toggleTest" col="0" text="toggle()" checked="false"  />
         <Button col="1" text="GO" tap="onToggleTest" class="button" />  
       </GridLayout>
     </StackLayout>
diff --git a/platforms/ios/nativescriptcheckbox/app/App_Resources/iOS/Info.plist b/platforms/ios/nativescriptcheckbox/app/App_Resources/iOS/Info.plist
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIRequiresFullScreen</key>
+	<true/>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ export interface CheckBoxInterface{`
`44`	`44`	`checked: boolean;`
`45`	`45`	`fillColor: string;`
`46`	`46`	`tintColor: string;`
`47`		`- checkBoxSize: number;`
	`47`	`+ //checkBoxSize: number;`
`48`	`48`
`49`	`49`	`toggle(): void;`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ CheckBox{`
`50`	`50`	`color: white;`
`51`	`51`	`border-color: yellow;`
`52`	`52`	`border-width: 1;`
`53`		`- font-size: 20;`
	`53`	`+ font-size: 15;`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`.demosection{`