From 98134c5be9bd6dadcfabdd867cf6887e3f6bd29d Mon Sep 17 00:00:00 2001
From: xianyi <thefangyi@gmail.com>
Date: Tue, 13 Jan 2026 09:46:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=BB=E9=A2=98=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=AF=BC=E8=88=AA=E6=A0=8F=E5=92=8C=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/(tabs)/_layout.tsx                   |  1 +
 app/_layout.tsx                          | 31 +++++++++++++++++++++---
 components/ui/tab-bar-background.ios.tsx | 10 +++++---
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/app/(tabs)/_layout.tsx b/app/(tabs)/_layout.tsx
index 6a5a436..514ad17 100644
--- a/app/(tabs)/_layout.tsx
+++ b/app/(tabs)/_layout.tsx
@@ -17,6 +17,7 @@ export default function TabLayout() {
     <Tabs
       screenOptions={{
         tabBarActiveTintColor: Colors[theme].tint,
+        tabBarInactiveTintColor: Colors[theme].tabIconDefault,
         headerShown: false,
         tabBarButton: HapticTab,
         tabBarBackground: TabBarBackground,
diff --git a/app/_layout.tsx b/app/_layout.tsx
index 3c9d5bf..49eaa5b 100644
--- a/app/_layout.tsx
+++ b/app/_layout.tsx
@@ -7,6 +7,7 @@ import { Stack } from "expo-router";
 import { StatusBar } from "expo-status-bar";
 import "react-native-reanimated";
 
+import { Colors } from "@/constants/theme";
 import { ThemeProvider } from "@/context/ThemeContext";
 import { useColorScheme } from "@/hooks/use-color-scheme";
 import "@/i18n"; // Initialize i18n
@@ -25,11 +26,35 @@ export default function RootLayout() {
 
 function RootLayoutNav() {
   const colorScheme = useColorScheme();
+  const isDark = colorScheme === "dark";
+
+  // Custom navigation theme to ensure proper colors
+  const navigationTheme = isDark
+    ? {
+        ...DarkTheme,
+        colors: {
+          ...DarkTheme.colors,
+          background: Colors.dark.background,
+          card: Colors.dark.background,
+          text: Colors.dark.text,
+          border: Colors.dark.background,
+          notification: Colors.dark.tint,
+        },
+      }
+    : {
+        ...DefaultTheme,
+        colors: {
+          ...DefaultTheme.colors,
+          background: Colors.light.background,
+          card: Colors.light.background,
+          text: Colors.light.text,
+          border: Colors.light.background,
+          notification: Colors.light.tint,
+        },
+      };
 
   return (
-    <NavigationThemeProvider
-      value={colorScheme === "dark" ? DarkTheme : DefaultTheme}
-    >
+    <NavigationThemeProvider value={navigationTheme}>
       <Stack>
         <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
         <Stack.Screen
diff --git a/components/ui/tab-bar-background.ios.tsx b/components/ui/tab-bar-background.ios.tsx
index a0b6f70..2ae72b8 100644
--- a/components/ui/tab-bar-background.ios.tsx
+++ b/components/ui/tab-bar-background.ios.tsx
@@ -3,12 +3,16 @@ import { BlurView } from "expo-blur";
 import { StyleSheet } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
+import { useTheme } from "@/context/ThemeContext";
+
 export default function BlurTabBarBackground() {
+  const { theme } = useTheme();
+  const isDark = theme === "dark";
+
   return (
     <BlurView
-      // System chrome material automatically adapts to the system's theme
-      // and matches the native tab bar appearance on iOS.
-      tint="systemChromeMaterial"
+      // Use theme-specific tint to ensure proper background color
+      tint={isDark ? "dark" : "light"}
       intensity={100}
       style={StyleSheet.absoluteFill}
     />