chore: cleanup

NathanWalker · NathanWalker · commit fac3b7f8ca3d · 2025-08-07T10:38:33.000-07:00
diff --git a/apps/toolbox/src/_app-platform.ios.css b/apps/toolbox/src/_app-platform.ios.css
@@ -93,7 +93,10 @@
 }
 
 .ns-ios-26 .action-bar {
-    /* Note: nativescript-theme-core auto adds background-color to actionbar */
-    /* doing so will cause iOS 26+ to not render titles when large title is enabled */
+    /**
+     * Note: nativescript-theme-core auto adds background-color to actionbar 
+     * doing so will cause iOS 26+ to not render titles when large title is enabled 
+     * We can now scope specific styling behavior for platform sdk versions
+     */
     background-color: transparent;
 }
diff --git a/packages/core/ui/switch/index.ios.ts b/packages/core/ui/switch/index.ios.ts
@@ -1,12 +1,10 @@
 import { SwitchBase, checkedProperty, offBackgroundColorProperty } from './switch-common';
 import { colorProperty, backgroundColorProperty, backgroundInternalProperty } from '../styling/style-properties';
 import { Color } from '../../color';
-import { iOSNativeHelper, layout } from '../../utils';
+import { SDK_VERSION } from '../../utils/constants';
 
 export * from './switch-common';
 
-const majorVersion = iOSNativeHelper.MajorVersion;
-
 @NativeClass
 class SwitchChangeHandlerImpl extends NSObject {
 	private _owner: WeakRef<Switch>;
@@ -30,7 +28,6 @@ class SwitchChangeHandlerImpl extends NSObject {
 	};
 }
 
-const zeroSize = { width: 0, height: 0 };
 export class Switch extends SwitchBase {
 	nativeViewProtected: UISwitch;
 	private _handler: NSObject;
@@ -48,11 +45,6 @@ export class Switch extends SwitchBase {
 		const nativeView = this.nativeViewProtected;
 		this._handler = SwitchChangeHandlerImpl.initWithOwner(new WeakRef(this));
 		nativeView.addTargetActionForControlEvents(this._handler, 'valueChanged', UIControlEvents.ValueChanged);
-
-		// Set proper dimensions based on actual native size (important for iOS 26+ switches)
-		const nativeSize = nativeView.sizeThatFits(zeroSize);
-		this.width = nativeSize.width;
-		this.height = nativeSize.height;
 	}
 
 	public disposeNativeView() {
@@ -78,7 +70,7 @@ export class Switch extends SwitchBase {
 		// only add :checked pseudo handling on supported iOS versions
 		// ios <13 works but causes glitchy animations when toggling
 		// so we decided to keep the old behavior on older versions.
-		if (majorVersion >= 13) {
+		if (SDK_VERSION >= 13) {
 			super._onCheckedPropertyChanged(newValue);
 
 			if (this.offBackgroundColor) {
@@ -96,18 +88,6 @@ export class Switch extends SwitchBase {
 		return this.nativeViewProtected;
 	}
 
-	public onMeasure(widthMeasureSpec: number, heightMeasureSpec: number): void {
-		// Get actual native size - iOS 26+ switches have different dimensions than the legacy 51x31
-		const nativeSize = this.nativeViewProtected.sizeThatFits(zeroSize);
-		this.width = nativeSize.width;
-		this.height = nativeSize.height;
-
-		// Use actual native dimensions instead of hardcoded fallback values
-		const widthAndState = Switch.resolveSizeAndState(layout.toDevicePixels(nativeSize.width), layout.toDevicePixels(nativeSize.width), layout.EXACTLY, 0);
-		const heightAndState = Switch.resolveSizeAndState(layout.toDevicePixels(nativeSize.height), layout.toDevicePixels(nativeSize.height), layout.EXACTLY, 0);
-		this.setMeasuredDimension(widthAndState, heightAndState);
-	}
-
 	[checkedProperty.getDefault](): boolean {
 		return false;
 	}
@@ -134,7 +114,7 @@ export class Switch extends SwitchBase {
 		return this.nativeViewProtected.onTintColor;
 	}
 	[backgroundColorProperty.setNative](value: UIColor | Color) {
-		if (majorVersion >= 13) {
+		if (SDK_VERSION >= 13) {
 			if (!this.offBackgroundColor || this.checked) {
 				this.setNativeBackgroundColor(value);
 			}
@@ -155,7 +135,7 @@ export class Switch extends SwitchBase {
 		return this.nativeViewProtected.backgroundColor;
 	}
 	[offBackgroundColorProperty.setNative](value: Color | UIColor) {
-		if (majorVersion >= 13) {
+		if (SDK_VERSION >= 13) {
 			if (!this.checked) {
 				this.setNativeBackgroundColor(value);
 			}

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,10 @@`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`.ns-ios-26 .action-bar {`
`96`		`- /* Note: nativescript-theme-core auto adds background-color to actionbar */`
`97`		`- /* doing so will cause iOS 26+ to not render titles when large title is enabled */`
	`96`	`+ /**`
	`97`	`+ * Note: nativescript-theme-core auto adds background-color to actionbar`
	`98`	`+ * doing so will cause iOS 26+ to not render titles when large title is enabled`
	`99`	`+ * We can now scope specific styling behavior for platform sdk versions`
	`100`	`+ */`
`98`	`101`	`background-color: transparent;`
`99`	`102`	`}`