From afb0edb20b73682c0bf967adfbbe9dda7a07cc4e Mon Sep 17 00:00:00 2001
From: xianyi <thefangyi@gmail.com>
Date: Wed, 21 Jan 2026 11:58:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=95=E9=83=A8=E5=AE=89=E5=85=A8=E8=B7=9D?=
 =?UTF-8?q?=E7=A6=BB&=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/(tabs)/index.tsx             |  7 ++++++-
 app/profile.tsx                  | 20 +++++++++++++++-----
 components/matches-by-league.tsx |  7 ++++++-
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/app/(tabs)/index.tsx b/app/(tabs)/index.tsx
index 03ef8f2..0c7cf9d 100644
--- a/app/(tabs)/index.tsx
+++ b/app/(tabs)/index.tsx
@@ -29,11 +29,13 @@ import {
   TouchableOpacity,
   View,
 } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 export default function HomeScreen() {
   const router = useRouter();
   const { theme } = useTheme();
   const { t } = useTranslation();
+  const insets = useSafeAreaInsets();
   const isDark = theme === "dark";
   const iconColor = isDark ? Colors.dark.icon : Colors.light.icon;
   const filterBg = isDark ? "#2C2C2E" : "#F2F2F7";
@@ -625,7 +627,10 @@ export default function HomeScreen() {
               </View>
             ) : null
           }
-          contentContainerStyle={styles.listContent}
+          contentContainerStyle={[
+            styles.listContent,
+            { paddingBottom: 80 + insets.bottom },
+          ]}
           ListEmptyComponent={
             <View style={styles.center}>
               <ThemedText>{t("home.no_matches")}</ThemedText>
diff --git a/app/profile.tsx b/app/profile.tsx
index d2d8af6..0ca3719 100644
--- a/app/profile.tsx
+++ b/app/profile.tsx
@@ -12,9 +12,11 @@ import {
   TouchableOpacity,
   View,
 } from "react-native";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 import { ThemedText } from "@/components/themed-text";
 import { IconSymbol } from "@/components/ui/icon-symbol";
+import { Colors } from "@/constants/theme";
 import { useAppState } from "@/context/AppStateContext";
 import { useTheme } from "@/context/ThemeContext";
 import { changeLanguage, SUPPORTED_LANGUAGES } from "@/i18n";
@@ -37,6 +39,7 @@ const BOOKMAKERS = [
 export default function ProfileScreen() {
   const { theme, toggleTheme, setTheme, isSystemTheme, useSystemTheme } =
     useTheme();
+  const insets = useSafeAreaInsets();
   const {
     state,
     updateOddsSettings,
@@ -215,7 +218,7 @@ export default function ProfileScreen() {
           headerBackTitle: t("settings.back"),
           // Ensure header matches theme to avoid white flash
           headerStyle: {
-            backgroundColor: isDark ? "#000" : "#f2f2f7",
+            backgroundColor: isDark ? Colors.dark.background : "#f2f2f7",
           },
           headerTintColor: textColor,
           headerShadowVisible: false,
@@ -223,14 +226,17 @@ export default function ProfileScreen() {
           presentation: "card",
           animation: "slide_from_right",
           // Set the scene/content background to match theme during transition
-          contentStyle: { backgroundColor: isDark ? "#000" : "#f2f2f7" },
+          contentStyle: {
+            backgroundColor: isDark ? Colors.dark.background : "#f2f2f7",
+          },
         }}
       />
       <ScrollView
         style={[
           styles.container,
-          { backgroundColor: isDark ? "#000" : "#f2f2f7" },
+          { backgroundColor: isDark ? Colors.dark.background : "#f2f2f7" },
         ]}
+        contentContainerStyle={{ paddingBottom: 80 + insets.bottom }}
       >
         <View
           style={[
@@ -343,7 +349,11 @@ export default function ProfileScreen() {
                 <ThemedText>{t("settings.language")}</ThemedText>
               </View>
               <View style={{ flexDirection: "row", alignItems: "center" }}>
-                <ThemedText style={{ color: subTextColor, marginRight: 4 }}>
+                <ThemedText
+                  numberOfLines={1}
+                  ellipsizeMode="tail"
+                  style={{ color: subTextColor, marginRight: 4, maxWidth: 140 }}
+                >
                   {getCurrentLanguageName()}
                 </ThemedText>
                 <IconSymbol
@@ -798,7 +808,7 @@ const styles = StyleSheet.create({
   },
   button: {
     paddingHorizontal: 10,
-    paddingVertical: 5,
+    paddingVertical: 0,
   },
   googleButton: {
     width: "100%",
diff --git a/components/matches-by-league.tsx b/components/matches-by-league.tsx
index 30c0210..168a723 100644
--- a/components/matches-by-league.tsx
+++ b/components/matches-by-league.tsx
@@ -21,6 +21,7 @@ import Animated, {
   useSharedValue,
   withTiming,
 } from "react-native-reanimated";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 // 开启 Android 上的 LayoutAnimation
 if (
@@ -45,6 +46,7 @@ export function MatchesByLeague({
   onFavoriteToggle,
   enableCollapsible = true,
 }: MatchesByLeagueProps) {
+  const insets = useSafeAreaInsets();
   const { theme } = useTheme();
   const isDark = theme === "dark";
 
@@ -184,7 +186,10 @@ export function MatchesByLeague({
         styles.container,
         { backgroundColor: isDark ? Colors.dark.background : "#FFFFFF" },
       ]}
-      contentContainerStyle={{ paddingBottom: 40, paddingTop: 8 }}
+      contentContainerStyle={{
+        paddingBottom: 80 + insets.bottom,
+        paddingTop: 8,
+      }}
     >
       {leagues.map((league) => {
         const isCollapsed = collapsed[league.key] !== false;