chore: update styles, add splash config, and improve search functionality
All checks were successful
Frontend CI / ota-android (push) Successful in 1m50s
Frontend CI / ota-ios (push) Successful in 2m38s
Frontend CI / build-and-push-web (push) Successful in 10m12s
Frontend CI / build-android-apk (push) Successful in 17m46s

- Replace deprecated StyleSheet.absoluteFillObject with StyleSheet.absoluteFill (React Native 0.76+)
- Add splash screen configuration in app.json
- Fix duplicate UIBackgroundModes and add audio mode for iOS
- Disable Android ripple effect on tab bar buttons
- Improve SmartImage loading state to prevent unnecessary re-renders
- Refactor ImageGrid to use mainUri with separate previewUrl for better preview handling
- Add market search support with trade items tab in SearchScreen
- Pass homeTab prop to SearchScreen for context-aware search behavior
- Simplify fetchUnreadCount return type to void in MessageSyncService
- Fix StatusBar import from expo to react-native in ChatScreen
This commit is contained in:
lafay
2026-06-02 08:14:04 +08:00
parent 52d2581dda
commit 8ee6e77cb4
24 changed files with 156 additions and 59 deletions

View File

@@ -1045,7 +1045,7 @@ function createCreatePostStyles(colors: AppColors) {
height: '100%',
},
uploadingOverlay: {
...StyleSheet.absoluteFillObject,
...StyleSheet.absoluteFill,
backgroundColor: 'rgba(0, 0, 0, 0.5)',
justifyContent: 'center',
alignItems: 'center',

View File

@@ -902,6 +902,7 @@ export const HomeScreen: React.FC = () => {
<StatusBar barStyle={statusBarStyle} backgroundColor={colors.background.paper} />
<SearchScreen
onBack={() => setShowSearch(false)}
homeTab={homeTab}
/>
</SafeAreaView>
);

View File

@@ -27,7 +27,7 @@ function createMarketStyles(colors: AppColors, gap: number, padding: number) {
},
listContent: {
paddingHorizontal: padding,
paddingTop: gap / 2,
paddingTop: padding,
paddingBottom: 80,
},
});

View File

@@ -18,34 +18,42 @@ import { useRouter } from 'expo-router';
import { MaterialCommunityIcons } from '@expo/vector-icons';
import { spacing, fontSizes, borderRadius, useAppColors, type AppColors } from '../../theme';
import { Post, User } from '../../types';
import type { TradeItemDTO } from '../../types/trade';
import { useUserStore } from '../../stores';
import { postService, authService } from '../../services';
import { tradeService } from '../../services/trade/tradeService';
import { postSyncService } from '@/services/post';
import { PostCard, TabBar, SearchBar } from '../../components/business';
import { TradeCard } from '../../components/business/TradeCard/TradeCard';
import type { PostCardAction } from '../../components/business/PostCard';
import { Avatar, EmptyState, Text, ResponsiveGrid, Loading } from '../../components/common';
import * as hrefs from '../../navigation/hrefs';
import { useResponsive, useResponsiveSpacing, useResponsiveValue } from '../../hooks';
import { useCursorPagination } from '../../hooks/useCursorPagination';
const TABS = ['帖子', '用户'];
const SQUARE_TABS = ['帖子', '用户'];
const MARKET_TABS = ['商品', '用户'];
const DEFAULT_PAGE_SIZE = 20;
// 与 TabsLayout 中的常量保持一致tabBarHeight 56 + 上下浮动间距 12*2
const FLOATING_TAB_BAR_HEIGHT = 56 + 12 * 2;
type SearchType = 'posts' | 'users';
type SearchType = 'posts' | 'users' | 'trades';
interface SearchScreenProps {
onBack?: () => void;
homeTab?: 'square' | 'market';
}
export const SearchScreen: React.FC<SearchScreenProps> = ({ onBack }) => {
export const SearchScreen: React.FC<SearchScreenProps> = ({ onBack, homeTab = 'square' }) => {
const colors = useAppColors();
const styles = useMemo(() => createSearchScreenStyles(colors), [colors]);
const router = useRouter();
const insets = useSafeAreaInsets();
const history = useUserStore((state) => state.searchHistory);
const { addSearchHistory, clearSearchHistory } = useUserStore.getState();
const isMarket = homeTab === 'market';
const TABS = isMarket ? MARKET_TABS : SQUARE_TABS;
// 使用响应式 hook
const {
@@ -115,6 +123,10 @@ export const SearchScreen: React.FC<SearchScreenProps> = ({ onBack }) => {
const [userResults, setUserResults] = useState<User[]>([]);
const [userLoading, setUserLoading] = useState(false);
// 市集搜索结果
const [tradeResults, setTradeResults] = useState<TradeItemDTO[]>([]);
const [tradeLoading, setTradeLoading] = useState(false);
const refreshRef = useRef(refresh);
refreshRef.current = refresh;
const resetRef = useRef(reset);
@@ -143,14 +155,21 @@ export const SearchScreen: React.FC<SearchScreenProps> = ({ onBack }) => {
try {
const searchType = getSearchType();
if (searchType === 'users') {
setUserLoading(true);
const usersResponse = await authService.searchUsers(trimmedKeyword, 1, 20);
setUserResults(usersResponse.list || []);
} else if (searchType === 'trades') {
setTradeLoading(true);
const tradeResponse = await tradeService.getTradeItems({ keyword: trimmedKeyword, page_size: DEFAULT_PAGE_SIZE });
setTradeResults(tradeResponse.list || []);
}
} catch (error) {
console.error('搜索失败:', error);
} finally {
setUserLoading(false);
setTradeLoading(false);
}
setHasSearched(true);
@@ -219,6 +238,13 @@ export const SearchScreen: React.FC<SearchScreenProps> = ({ onBack }) => {
// 获取当前搜索类型
const getSearchType = (): SearchType => {
if (isMarket) {
switch (activeIndex) {
case 0: return 'trades';
case 1: return 'users';
default: return 'trades';
}
}
switch (activeIndex) {
case 0: return 'posts';
case 1: return 'users';
@@ -426,18 +452,54 @@ export const SearchScreen: React.FC<SearchScreenProps> = ({ onBack }) => {
);
};
// 渲染市集搜索结果
const renderTradeResults = () => {
if (tradeResults.length === 0 && !tradeLoading) {
return (
<EmptyState
title="未找到相关商品"
description="试试其他关键词吧"
icon="shopping-search-outline"
/>
);
}
return (
<FlatList
data={tradeResults}
renderItem={({ item }) => (
<View style={{ paddingHorizontal: responsivePadding, marginBottom: responsiveGap }}>
<TradeCard
item={item}
variant="list"
onPress={(id) => router.push(`/trade/${id}` as any)}
/>
</View>
)}
keyExtractor={item => item.id}
contentContainerStyle={{ paddingVertical: responsiveGap, paddingBottom: listBottomInset }}
showsVerticalScrollIndicator={false}
ListFooterComponent={tradeLoading ? <Loading size="sm" /> : null}
/>
);
};
// 渲染搜索结果
const renderSearchResults = () => {
const searchType = getSearchType();
if (searchType === 'posts') {
return renderPostResults();
}
if (searchType === 'users') {
return renderUserResults();
}
if (searchType === 'trades') {
return renderTradeResults();
}
return null;
};
@@ -517,7 +579,7 @@ export const SearchScreen: React.FC<SearchScreenProps> = ({ onBack }) => {
value={searchText}
onChangeText={setSearchText}
onSubmit={handleSearch}
placeholder="搜索帖子、用户"
placeholder={isMarket ? "搜索商品、用户" : "搜索帖子、用户"}
autoFocus
/>
</View>
@@ -548,7 +610,7 @@ export const SearchScreen: React.FC<SearchScreenProps> = ({ onBack }) => {
}
}}
variant="modern"
icons={['file-document-outline', 'account-outline']}
icons={isMarket ? ['shopping-outline', 'account-outline'] : ['file-document-outline', 'account-outline']}
/>
</View>

View File

@@ -27,11 +27,11 @@ import {
Platform,
TouchableOpacity,
BackHandler,
StatusBar,
} from 'react-native';
import { FlashList, ListRenderItem } from '@shopify/flash-list';
import { MaterialCommunityIcons } from '@expo/vector-icons';
import { useNavigation, useRouter } from 'expo-router';
import { StatusBar } from 'expo-status-bar';
import { SafeAreaView, useSafeAreaInsets } from 'react-native-safe-area-context';
import { Text, ImageGallery, ImageGridItem } from '../../components/common';
import { useAppColors, useResolvedColorScheme } from '../../theme';
@@ -478,7 +478,7 @@ export const ChatScreen: React.FC<ChatScreenProps> = (props) => {
behavior={Platform.OS === 'ios' ? 'padding' : undefined}
keyboardVerticalOffset={Platform.OS === 'ios' ? 0 : 0}
>
{!props.isEmbedded && <StatusBar style={resolved === 'dark' ? 'light' : 'dark'} backgroundColor={colors.background.paper} />}
{!props.isEmbedded && <StatusBar barStyle={resolved === 'dark' ? 'light-content' : 'dark-content'} backgroundColor={colors.background.paper} />}
{/* 顶部栏 */}
<ChatHeader

View File

@@ -374,7 +374,7 @@ export const GroupInfoPanel: React.FC<GroupInfoPanelProps> = ({
function createGroupInfoPanelStyles(colors: AppColors) {
return StyleSheet.create({
overlay: {
...StyleSheet.absoluteFillObject,
...StyleSheet.absoluteFill,
backgroundColor: 'rgba(0, 0, 0, 0.3)',
zIndex: 100,
},

View File

@@ -379,7 +379,7 @@ export const GroupInfoPanel: React.FC<GroupInfoPanelProps> = ({
function createGroupInfoPanelStyles(colors: AppColors) {
return StyleSheet.create({
overlay: {
...StyleSheet.absoluteFillObject,
...StyleSheet.absoluteFill,
backgroundColor: 'rgba(0, 0, 0, 0.35)',
zIndex: 100,
},

View File

@@ -551,7 +551,7 @@ export function createChatScreenStyles(colors: AppColors, dynamicStyles?: {
// 输入框@高亮
inputHighlightOverlay: {
...StyleSheet.absoluteFillObject,
...StyleSheet.absoluteFill,
flexDirection: 'row',
flexWrap: 'wrap',
paddingTop: 8,
@@ -1072,7 +1072,7 @@ export function createChatScreenStyles(colors: AppColors, dynamicStyles?: {
// 遮罩层
overlay: {
...StyleSheet.absoluteFillObject,
...StyleSheet.absoluteFill,
backgroundColor: 'rgba(0, 0, 0, 0.5)',
alignItems: 'center',
justifyContent: 'center',
@@ -1142,7 +1142,7 @@ export function createChatScreenStyles(colors: AppColors, dynamicStyles?: {
justifyContent: 'flex-end',
},
manageModalBackdrop: {
...StyleSheet.absoluteFillObject,
...StyleSheet.absoluteFill,
backgroundColor: 'rgba(0, 0, 0, 0.4)',
},
manageModalHandle: {
@@ -1165,7 +1165,7 @@ export function createChatScreenStyles(colors: AppColors, dynamicStyles?: {
borderColor: colors.chat.replyBorder,
},
stickerCheckOverlay: {
...StyleSheet.absoluteFillObject,
...StyleSheet.absoluteFill,
backgroundColor: 'rgba(127, 182, 230, 0.14)',
alignItems: 'flex-end',
justifyContent: 'flex-start',

View File

@@ -68,7 +68,7 @@ function createEditProfileStyles(colors: AppColors) {
alignItems: 'center',
},
coverOverlay: {
...StyleSheet.absoluteFillObject,
...StyleSheet.absoluteFill,
backgroundColor: 'rgba(0, 0, 0, 0.4)',
justifyContent: 'center',
alignItems: 'center',

View File

@@ -198,7 +198,7 @@ const CourseDetailScreen: React.FC = () => {
return (
<SafeAreaView style={styles.container}>
<View style={styles.mask}>
<Pressable style={StyleSheet.absoluteFillObject} onPress={() => router.back()} />
<Pressable style={StyleSheet.absoluteFill} onPress={() => router.back()} />
</View>
</SafeAreaView>
);
@@ -207,7 +207,7 @@ const CourseDetailScreen: React.FC = () => {
return (
<SafeAreaView style={styles.container}>
<View style={styles.mask}>
<Pressable style={StyleSheet.absoluteFillObject} onPress={() => router.back()} />
<Pressable style={StyleSheet.absoluteFill} onPress={() => router.back()} />
<View style={styles.card}>
<View style={styles.header}>
<View style={styles.headerLeft}>

View File

@@ -259,7 +259,7 @@ function createStyles(colors: AppColors) {
backgroundColor: colors.background.default,
},
uploadingOverlay: {
...StyleSheet.absoluteFillObject,
...StyleSheet.absoluteFill,
backgroundColor: 'rgba(0,0,0,0.3)',
alignItems: 'center',
justifyContent: 'center',