feat: Implement mobile tab navigation and enhance responsive layout for better user experience

This commit is contained in:
zimplexing
2025-08-06 22:00:29 +08:00
parent 7c7e8e0b97
commit 60c4e7420d
7 changed files with 174 additions and 36 deletions

View File

@@ -93,38 +93,35 @@ const CustomScrollView: React.FC<CustomScrollViewProps> = ({
const dynamicStyles = StyleSheet.create({
listContent: {
paddingBottom: responsiveConfig.spacing * 2,
paddingHorizontal: responsiveConfig.spacing / 2,
},
rowContainer: {
gridContainer: {
flexDirection: "row",
justifyContent: responsiveConfig.deviceType === 'mobile' ? "space-around" : "flex-start",
flexWrap: "wrap",
marginBottom: responsiveConfig.spacing / 2,
justifyContent: "space-evenly",
},
itemContainer: {
marginHorizontal: responsiveConfig.spacing / 2,
alignItems: "center",
width: responsiveConfig.cardWidth,
marginBottom: responsiveConfig.spacing,
},
});
return (
<ScrollView
contentContainerStyle={[commonStyles.gridContainer, dynamicStyles.listContent]}
contentContainerStyle={dynamicStyles.listContent}
onScroll={handleScroll}
scrollEventThrottle={16}
showsVerticalScrollIndicator={responsiveConfig.deviceType !== 'tv'}
>
{data.length > 0 ? (
<>
{/* Render content in a responsive grid layout */}
{Array.from({ length: Math.ceil(data.length / effectiveColumns) }).map((_, rowIndex) => (
<View key={rowIndex} style={dynamicStyles.rowContainer}>
{data.slice(rowIndex * effectiveColumns, (rowIndex + 1) * effectiveColumns).map((item, index) => (
<View key={index} style={dynamicStyles.itemContainer}>
{renderItem({ item, index: rowIndex * effectiveColumns + index })}
</View>
))}
</View>
))}
<View style={dynamicStyles.gridContainer}>
{data.map((item, index) => (
<View key={index} style={dynamicStyles.itemContainer}>
{renderItem({ item, index })}
</View>
))}
</View>
{renderFooter()}
</>
) : (

View File

@@ -179,7 +179,6 @@ const createMobileStyles = (cardWidth: number, cardHeight: number, spacing: numb
return StyleSheet.create({
wrapper: {
width: cardWidth,
marginHorizontal: spacing / 2,
marginBottom: spacing,
},
pressable: {

View File

@@ -0,0 +1,139 @@
import React, { useState } from 'react';
import { View, StyleSheet, TouchableOpacity, Text, Platform } from 'react-native';
import { useRouter, usePathname } from 'expo-router';
import { Home, Search, Heart, Settings, Tv } from 'lucide-react-native';
import { Colors } from '@/constants/Colors';
import { useResponsiveLayout } from '@/hooks/useResponsiveLayout';
import { DeviceUtils } from '@/utils/DeviceUtils';
interface TabItem {
key: string;
label: string;
icon: React.ComponentType<any>;
route: string;
}
const tabs: TabItem[] = [
{ key: 'home', label: '首页', icon: Home, route: '/' },
{ key: 'search', label: '搜索', icon: Search, route: '/search' },
{ key: 'live', label: '直播', icon: Tv, route: '/live' },
{ key: 'favorites', label: '收藏', icon: Heart, route: '/favorites' },
{ key: 'settings', label: '设置', icon: Settings, route: '/settings' },
];
interface MobileTabContainerProps {
children: React.ReactNode;
}
const MobileTabContainer: React.FC<MobileTabContainerProps> = ({ children }) => {
const router = useRouter();
const pathname = usePathname();
const { spacing } = useResponsiveLayout();
const handleTabPress = (route: string) => {
if (route === '/') {
router.push('/');
} else {
router.push(route as any);
}
};
const isTabActive = (route: string) => {
if (route === '/' && pathname === '/') return true;
if (route !== '/' && pathname === route) return true;
return false;
};
const dynamicStyles = createStyles(spacing);
return (
<View style={dynamicStyles.container}>
{/* 内容区域 */}
<View style={dynamicStyles.content}>
{children}
</View>
{/* 底部导航栏 */}
<View style={dynamicStyles.tabBar}>
{tabs.map((tab) => {
const isActive = isTabActive(tab.route);
const IconComponent = tab.icon;
return (
<TouchableOpacity
key={tab.key}
style={[dynamicStyles.tab, isActive && dynamicStyles.activeTab]}
onPress={() => handleTabPress(tab.route)}
activeOpacity={0.7}
>
<IconComponent
size={20}
color={isActive ? Colors.dark.primary : '#888'}
strokeWidth={isActive ? 2.5 : 2}
/>
<Text style={[
dynamicStyles.tabLabel,
isActive && dynamicStyles.activeTabLabel
]}>
{tab.label}
</Text>
</TouchableOpacity>
);
})}
</View>
</View>
);
};
const createStyles = (spacing: number) => {
const minTouchTarget = DeviceUtils.getMinTouchTargetSize();
return StyleSheet.create({
container: {
flex: 1,
},
content: {
flex: 1,
},
tabBar: {
flexDirection: 'row',
backgroundColor: '#1c1c1e',
borderTopWidth: 1,
borderTopColor: '#333',
paddingTop: spacing / 2,
paddingBottom: Platform.OS === 'ios' ? spacing * 2 : spacing,
paddingHorizontal: spacing,
shadowColor: '#000',
shadowOffset: {
width: 0,
height: -2,
},
shadowOpacity: 0.1,
shadowRadius: 4,
elevation: 10,
},
tab: {
flex: 1,
alignItems: 'center',
justifyContent: 'center',
minHeight: minTouchTarget,
paddingVertical: spacing / 2,
borderRadius: 8,
},
activeTab: {
backgroundColor: 'rgba(64, 156, 255, 0.1)',
},
tabLabel: {
fontSize: 11,
color: '#888',
marginTop: 2,
fontWeight: '500',
},
activeTabLabel: {
color: Colors.dark.primary,
fontWeight: '600',
},
});
};
export default MobileTabContainer;

View File

@@ -1,7 +1,7 @@
import React from 'react';
import { View, StyleSheet } from 'react-native';
import { useResponsiveLayout } from '@/hooks/useResponsiveLayout';
import MobileBottomTabNavigator from './MobileBottomTabNavigator';
import MobileTabContainer from './MobileTabContainer';
import TabletSidebarNavigator from './TabletSidebarNavigator';
interface ResponsiveNavigationProps {
@@ -13,14 +13,8 @@ const ResponsiveNavigation: React.FC<ResponsiveNavigationProps> = ({ children })
switch (deviceType) {
case 'mobile':
return (
<View style={styles.container}>
<View style={styles.content}>
{children}
</View>
<MobileBottomTabNavigator />
</View>
);
// 移动端使用Tab容器包装children
return <MobileTabContainer>{children}</MobileTabContainer>;
case 'tablet':
return (