Added search feature

This commit is contained in:
Arnaud Vergnet 2020-04-03 23:58:44 +02:00
parent c148529b94
commit 8f1fc3f1bd
2 changed files with 201 additions and 45 deletions

View file

@ -0,0 +1,62 @@
// @flow
import * as React from 'react';
import {Avatar, List, withTheme} from 'react-native-paper';
import {View} from "react-native";
type Props = {
onPress: Function,
categoryTranslator: Function,
chipRender: Function,
item: Object,
}
class ClubListItem extends React.PureComponent<Props> {
colors: Object;
hasManagers: boolean;
constructor(props) {
super(props);
this.colors = props.theme.colors;
this.hasManagers = props.item.responsibles.length > 0;
}
getCategoriesRender(categories: Array<number | null>) {
let final = [];
for (let i = 0; i < categories.length; i++) {
if (categories[i] !== null)
final.push(this.props.chipRender(this.props.categoryTranslator(categories[i])));
}
return <View style={{flexDirection: 'row'}}>{final}</View>;
}
render() {
const categoriesRender = this.getCategoriesRender.bind(this, this.props.item.category);
return (
<List.Item
title={this.props.item.name}
description={categoriesRender}
onPress={this.props.onPress}
left={(props) => <Avatar.Image
{...props}
style={{backgroundColor: 'transparent'}}
size={64}
source={{uri: this.props.item.logo}}/>}
right={(props) => <Avatar.Icon
{...props}
style={{
marginTop: 'auto',
marginBottom: 'auto',
backgroundColor: 'transparent',
}}
size={48}
icon={this.hasManagers ? "check-circle-outline" : "alert-circle-outline"}
color={this.hasManagers ? this.colors.success : this.colors.primary}
/>}
/>
);
}
}
export default withTheme(ClubListItem);

View file

@ -1,26 +1,33 @@
// @flow // @flow
import * as React from 'react'; import * as React from 'react';
import {View} from "react-native"; import {FlatList, Platform, View} from "react-native";
import {Avatar, Chip, List, withTheme} from 'react-native-paper'; import {Chip, Searchbar, withTheme} from 'react-native-paper';
import AuthenticatedScreen from "../../components/Amicale/AuthenticatedScreen"; import AuthenticatedScreen from "../../components/Amicale/AuthenticatedScreen";
import PureFlatList from "../../components/Lists/PureFlatList"; import i18n from "i18n-js";
import ClubListItem from "../../components/Lists/ClubListItem";
type Props = { type Props = {
navigation: Object, navigation: Object,
theme: Object, theme: Object,
} }
type State = {} type State = {
currentlySelectedCategories: Array<string>,
currentSearchString: string,
}
class ClubListScreen extends React.Component<Props, State> { class ClubListScreen extends React.Component<Props, State> {
state = {}; state = {
currentlySelectedCategories: [],
currentSearchString: '',
};
colors: Object; colors: Object;
getRenderItem: Function; getRenderItem: Function;
originalData: Array<Object>;
categories: Array<Object>; categories: Array<Object>;
constructor(props) { constructor(props) {
@ -28,6 +35,53 @@ class ClubListScreen extends React.Component<Props, State> {
this.colors = props.theme.colors; this.colors = props.theme.colors;
} }
/**
* Creates the header content
*/
componentDidMount() {
const title = this.getSearchBar.bind(this);
this.props.navigation.setOptions({
headerTitle: title,
headerBackTitleVisible: false,
headerTitleContainerStyle: Platform.OS === 'ios' ?
{marginHorizontal: 0, width: '70%'} :
{marginHorizontal: 0, right: 50, left: 50},
});
}
/**
* Gets the header search bar
*
* @return {*}
*/
getSearchBar() {
return (
<Searchbar
placeholder={i18n.t('proximoScreen.search')}
onChangeText={this.onSearchStringChange}
/>
);
}
/**
* Callback used when the search changes
*
* @param str The new search string
*/
onSearchStringChange = (str: string) => {
this.updateFilteredData(this.sanitizeString(str), null);
};
/**
* Sanitizes the given string to improve search performance
*
* @param str The string to sanitize
* @return {string} The sanitized string
*/
sanitizeString(str: string): string {
return str.toLowerCase().normalize("NFD").replace(/[\u0300-\u036f]/g, "");
}
keyExtractor = (item: Object) => { keyExtractor = (item: Object) => {
return item.name + item.logo; return item.name + item.logo;
}; };
@ -35,59 +89,99 @@ class ClubListScreen extends React.Component<Props, State> {
getScreen = (data: Object) => { getScreen = (data: Object) => {
this.categories = data.categories; this.categories = data.categories;
return ( return (
<PureFlatList <FlatList
data={data.clubs} data={data.clubs}
keyExtractor={this.keyExtractor} keyExtractor={this.keyExtractor}
renderItem={this.getRenderItem} renderItem={this.getRenderItem}
updateData={0} ListHeaderComponent={this.getListHeader()}
/> />
) )
}; };
getCategoryName(id: number) { onChipSelect(id: string) {
for (let i = 0; i < this.categories.length; i++) { this.updateFilteredData(null, id);
if (id === this.categories[i].id)
return this.categories[i].name;
}
return "";
} }
getCategoriesRender(categories: Array<number|null>) { updateFilteredData(filterStr: string | null, categoryId: string | null) {
let final = []; let newCategoriesState = [...this.state.currentlySelectedCategories];
for (let i = 0; i < categories.length; i++) { let newStrState = this.state.currentSearchString;
if (categories[i] !== null) if (filterStr !== null)
final.push(<Chip style={{marginRight: 5}}>{this.getCategoryName(categories[i])}</Chip>); newStrState = filterStr;
if (categoryId !== null) {
let index = newCategoriesState.indexOf(categoryId);
if (index === -1)
newCategoriesState.push(categoryId);
else
newCategoriesState.splice(index);
} }
return <View style={{flexDirection: 'row'}}>{final}</View>; if (filterStr !== null || categoryId !== null)
this.setState({
currentSearchString: newStrState,
currentlySelectedCategories: newCategoriesState,
})
}
isItemInCategoryFilter(categories: Array<string>) {
for (const category of categories) {
if (this.state.currentlySelectedCategories.indexOf(category) !== -1)
return true;
}
return false;
}
getChipRender = (category: Object) => {
const onPress = this.onChipSelect.bind(this, category.id);
return <Chip
selected={this.isItemInCategoryFilter([category.id])}
mode={'outlined'}
onPress={onPress}
style={{marginRight: 5, marginBottom: 5}}
>
{category.name}
</Chip>;
};
getListHeader() {
let final = [];
for (let i = 0; i < this.categories.length; i++) {
final.push(this.getChipRender(this.categories[i]));
}
return <View style={{
justifyContent: 'space-around',
flexDirection: 'row',
flexWrap: 'wrap',
margin: 10,
}}>{final}</View>;
}
getCategoryOfId = (id: number) => {
for (let i = 0; i < this.categories.length; i++) {
if (id === this.categories[i].id)
return this.categories[i];
}
};
shouldRenderItem(item) {
let shouldRender = this.state.currentlySelectedCategories.length === 0
|| this.isItemInCategoryFilter(item.category);
if (shouldRender)
shouldRender = this.sanitizeString(item.name).includes(this.state.currentSearchString);
return shouldRender;
} }
getRenderItem = ({item}: Object) => { getRenderItem = ({item}: Object) => {
const onPress = this.onListItemPress.bind(this, item); const onPress = this.onListItemPress.bind(this, item);
const categoriesRender = this.getCategoriesRender.bind(this, item.category); if (this.shouldRenderItem(item)) {
const hasManagers = item.responsibles.length > 0;
return ( return (
<List.Item <ClubListItem
title={item.name} categoryTranslator={this.getCategoryOfId}
description={categoriesRender} chipRender={this.getChipRender}
item={item}
onPress={onPress} onPress={onPress}
left={(props) => <Avatar.Image
{...props}
style={{backgroundColor: 'transparent'}}
size={64}
source={{uri: item.logo}}/>}
right={(props) => <Avatar.Icon
{...props}
style={{
marginTop: 'auto',
marginBottom: 'auto',
backgroundColor: 'transparent',
}}
size={48}
icon={hasManagers ? "check-circle-outline" : "alert-circle-outline"}
color={hasManagers ? this.colors.success : this.colors.primary}
/>}
/> />
); );
} else
return null;
}; };
/** /**