From 073563506a810dc4ce58a7229c9ef2bbfa5255a8 Mon Sep 17 00:00:00 2001
From: Nathan Walker <walkerrunpdx@gmail.com>
Date: Mon, 23 Jun 2025 10:18:47 -0700
Subject: [PATCH] feat: ios 26 early look

---
 apps/toolbox/src/pages/datepicker.xml            |  2 +-
 apps/toolbox/src/pages/switch.xml                |  2 +-
 .../tab-view/tab-view-bottom-position-page.xml   | 16 ++++++++--------
 apps/ui/src/tab-view/tab-view-icon-page.ts       | 14 +++++++-------
 packages/core/ui/tab-view/index.ios.ts           | 14 +++++++-------
 tools/assets/App_Resources/iOS/build.xcconfig    |  1 +
 6 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/apps/toolbox/src/pages/datepicker.xml b/apps/toolbox/src/pages/datepicker.xml
index 552183b43..a31f9b09c 100644
--- a/apps/toolbox/src/pages/datepicker.xml
+++ b/apps/toolbox/src/pages/datepicker.xml
@@ -14,7 +14,7 @@ year="{{displayDate?.year}}"
       <DatePicker class="v-center text-center" width="{{ showTime ? 220 : 300}}" height="{{ showTime ? 100 : 250}}" minDate="{{minDate}}" maxDate="{{maxDate}}" showTime="{{ showTime }}" iosPreferredDatePickerStyle="{{showTime ? 2 : 1}}" dateChange="{{ dateChange }}" />
       <GridLayout rows="auto" columns="auto,*">
         <Switch checked="true" col="0" checkedChange="{{checkedChange}}" />
-        <Label text="Show Time" col="1" class="m-l-10" />
+        <Label text="Show Time" col="1" marginLeft="35" />
       </GridLayout>
       <GridLayout rows="auto,auto" columns="">
           <Label text="Time Picker standalone:" row="0" col="0" class="m-t-10" />
diff --git a/apps/toolbox/src/pages/switch.xml b/apps/toolbox/src/pages/switch.xml
index b1b45feb6..492f6dd06 100644
--- a/apps/toolbox/src/pages/switch.xml
+++ b/apps/toolbox/src/pages/switch.xml
@@ -6,7 +6,7 @@
 
     <GridLayout class="switch-demo-page">   
       <ScrollView>
-          <StackLayout ios:padding="20" visionos:padding="40">
+          <StackLayout ios:paddingLeft="20" ios:paddingRight="40" visionos:padding="40">
 
             <GridLayout columns="*, auto" marginTop="24">
                 <Label text="Default + Checked + Enabled" />
diff --git a/apps/ui/src/tab-view/tab-view-bottom-position-page.xml b/apps/ui/src/tab-view/tab-view-bottom-position-page.xml
index fea48b1f2..86359a437 100644
--- a/apps/ui/src/tab-view/tab-view-bottom-position-page.xml
+++ b/apps/ui/src/tab-view/tab-view-bottom-position-page.xml
@@ -1,17 +1,17 @@
-<Page>
-  <TabView androidTabsPosition="bottom">
+<Page  backgroundColor="black">
+  <TabView androidTabsPosition="bottom" backgroundColor="black" tabBackgroundColor="black">
     <TabView.items>
-      <TabViewItem title="First">
+      <TabViewItem title="First" iconSource="res://add_to_fav">
         <TabViewItem.view>
-          <GridLayout>
-            <Label text="First View" verticalAlignment="center" horizontalAlignment="center"/>
+          <GridLayout backgroundColor="black">
+            <Label text="First Tab" verticalAlignment="center" horizontalAlignment="center" color="white"/>
           </GridLayout>
         </TabViewItem.view>
       </TabViewItem>
-      <TabViewItem title="Second">
+      <TabViewItem title="Second" iconSource="res://add_to_fav">
         <TabViewItem.view>
-          <GridLayout>
-            <Label text="Second View" verticalAlignment="center" horizontalAlignment="center"/>
+          <GridLayout backgroundColor="black">
+            <Label text="Second Tab" verticalAlignment="center" horizontalAlignment="center" color="white"/>
           </GridLayout>
         </TabViewItem.view>
       </TabViewItem>
diff --git a/apps/ui/src/tab-view/tab-view-icon-page.ts b/apps/ui/src/tab-view/tab-view-icon-page.ts
index 323a5ff74..21ec06b5f 100644
--- a/apps/ui/src/tab-view/tab-view-icon-page.ts
+++ b/apps/ui/src/tab-view/tab-view-icon-page.ts
@@ -8,13 +8,13 @@ let iconModes = isIOS ? ['automatic', 'alwaysOriginal', 'alwaysTemplate', undefi
 export const onNavigate = updateButtons;
 
 export function onChangeRenderingMode(args: EventData) {
-	let tabView = (<Button>args.object).page.getViewById<TabView>('tab-view');
-	if (isIOS) {
-		tabView.iosIconRenderingMode = <'automatic' | 'alwaysOriginal' | 'alwaysTemplate'>iconModes[(iconModes.indexOf(tabView.iosIconRenderingMode) + 1) % iconModes.length];
-	} else {
-		tabView.androidIconRenderingMode = <'alwaysOriginal' | 'alwaysTemplate'>iconModes[(iconModes.indexOf(tabView.androidIconRenderingMode) + 1) % iconModes.length];
-	}
-	updateButtons(args);
+	// let tabView = (<Button>args.object).page.getViewById<TabView>('tab-view');
+	// if (isIOS) {
+	// 	tabView.iosIconRenderingMode = <'automatic' | 'alwaysOriginal' | 'alwaysTemplate'>iconModes[(iconModes.indexOf(tabView.iosIconRenderingMode) + 1) % iconModes.length];
+	// } else {
+	// 	tabView.androidIconRenderingMode = <'alwaysOriginal' | 'alwaysTemplate'>iconModes[(iconModes.indexOf(tabView.androidIconRenderingMode) + 1) % iconModes.length];
+	// }
+	// updateButtons(args);
 }
 
 function updateButtons(args) {
diff --git a/packages/core/ui/tab-view/index.ios.ts b/packages/core/ui/tab-view/index.ios.ts
index ece8ae096..feadb3ec8 100644
--- a/packages/core/ui/tab-view/index.ios.ts
+++ b/packages/core/ui/tab-view/index.ios.ts
@@ -189,7 +189,7 @@ function updateTitleAndIconPositions(tabItem: TabViewItem, tabBarItem: UITabBarI
 		if (isIconAboveTitle) {
 			tabBarItem.titlePositionAdjustment = {
 				horizontal: 0,
-				vertical: -20,
+				vertical: -8,
 			};
 		} else {
 			tabBarItem.titlePositionAdjustment = { horizontal: 0, vertical: 0 };
@@ -199,9 +199,9 @@ function updateTitleAndIconPositions(tabItem: TabViewItem, tabBarItem: UITabBarI
 	if (!tabItem.title) {
 		if (isIconAboveTitle) {
 			tabBarItem.imageInsets = new UIEdgeInsets({
-				top: 6,
+				top: 2,
 				left: 0,
-				bottom: -6,
+				bottom: -2,
 				right: 0,
 			});
 		} else {
@@ -552,10 +552,10 @@ export class TabView extends TabViewBase {
 	}
 
 	private _updateAppearance(tabBar: UITabBar, appearance: UITabBarAppearance) {
-		tabBar.standardAppearance = appearance;
-		if (SDK_VERSION >= 15) {
-			tabBar.scrollEdgeAppearance = appearance;
-		}
+		// tabBar.standardAppearance = appearance;
+		// if (SDK_VERSION >= 15) {
+		// 	tabBar.scrollEdgeAppearance = appearance;
+		// }
 	}
 
 	[selectedIndexProperty.setNative](value: number) {
diff --git a/tools/assets/App_Resources/iOS/build.xcconfig b/tools/assets/App_Resources/iOS/build.xcconfig
index 6735d049b..4f931ed2c 100644
--- a/tools/assets/App_Resources/iOS/build.xcconfig
+++ b/tools/assets/App_Resources/iOS/build.xcconfig
@@ -5,3 +5,4 @@
 // DEVELOPMENT_TEAM = YOUR_TEAM_ID;
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 IPHONEOS_DEPLOYMENT_TARGET = 17.0;
+FRAMEWORK_SEARCH_PATHS = $(inherited) $(SDKDIR)/System/Library/SubFrameworks
\ No newline at end of file