feat: 同步dev分支并保留当前修改

src/screens/profile/NotificationSettingsScreen.tsx

@@ -11,7 +11,7 @@ import {
   Switch,
   ScrollView,
 } from 'react-native';
-import { SafeAreaView } from 'react-native-safe-area-context';
+import { SafeAreaView, useSafeAreaInsets } from 'react-native-safe-area-context';
 import { MaterialCommunityIcons } from '@expo/vector-icons';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { colors, spacing, fontSizes, borderRadius } from '../../theme';
@@ -34,7 +34,11 @@ export const NotificationSettingsScreen: React.FC = () => {
   const [vibrationEnabled, setVibrationEnabledState] = useState(true);
   const [pushEnabled, setPushEnabled] = useState(true);
   const [soundEnabled, setSoundEnabled] = useState(true);
-  const { isWideScreen } = useResponsive();
+  const { isWideScreen, isMobile } = useResponsive();
+  const insets = useSafeAreaInsets();
+  
+  // 底部间距，避免被 TabBar 遮挡
+  const scrollBottomInset = isMobile ? 64 + 24 + insets.bottom + spacing.md : spacing.md;
 
   // 加载设置
   useEffect(() => {
@@ -150,12 +154,12 @@ export const NotificationSettingsScreen: React.FC = () => {
     <SafeAreaView style={styles.container} edges={['bottom']}>
       {isWideScreen ? (
         <ResponsiveContainer maxWidth={800}>
-          <ScrollView contentContainerStyle={styles.scrollContent}>
+          <ScrollView contentContainerStyle={[styles.scrollContent, { paddingBottom: scrollBottomInset }]}>
             {renderContent()}
           </ScrollView>
         </ResponsiveContainer>
       ) : (
-        <ScrollView contentContainerStyle={styles.scrollContent}>
+        <ScrollView contentContainerStyle={[styles.scrollContent, { paddingBottom: scrollBottomInset }]}>
           {renderContent()}
         </ScrollView>
       )}