lpitault/application-amicale
1
0
Fork 0
forked from vergnet/application-amicale
Code Issues Pull requests Releases Wiki Activity

Added support for favorite groups

Browse source
This commit is contained in:
Arnaud Vergnet 2020-04-16 11:30:15 +02:00
parent 2abed04a9d
commit 9baaed9f6a
3 changed files with 91 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/components/Lists/GroupListAccordion.js
View file

@ -1,15 +1,18 @@
// @flow
import * as React from 'react';
import {List} from 'react-native-paper';
import {IconButton, List, withTheme} from 'react-native-paper';
import {FlatList} from "react-native";
import {stringMatchQuery} from "../../utils/Search";
type Props = {
item: Object,
onGroupPress: Function,
onFavoritePress: Function,
currentSearchString: string,
favoriteNumber: number,
height: number,
theme: Object,
}
type State = {
@ -18,10 +21,13 @@ type State = {
const LIST_ITEM_HEIGHT = 64;
export default class GroupListAccordion extends React.Component<Props, State> {
class GroupListAccordion extends React.Component<Props, State> {
state = {
expanded: false,
constructor(props) {
super(props);
this.state = {
expanded: props.item.id === "0",
}
}
shouldComponentUpdate(nextProps: Props, nextSate: State) {
@ -29,16 +35,22 @@ export default class GroupListAccordion extends React.Component<Props, State> {
this.state.expanded = nextProps.currentSearchString.length > 0;
return (nextProps.currentSearchString !== this.props.currentSearchString)
|| (nextSate.expanded !== this.state.expanded);
|| (nextSate.expanded !== this.state.expanded)
|| (nextProps.favoriteNumber !== this.props.favoriteNumber);
}
onPress = () => this.setState({expanded: !this.state.expanded});
keyExtractor = (item: Object) => item.id.toString();
isItemFavorite(item: Object) {
return item.isFav !== undefined && item.isFav;
}
renderItem = ({item}: Object) => {
if (stringMatchQuery(item.name, this.props.currentSearchString)) {
const onPress = () => this.props.onGroupPress(item);
const onStartPress = () => this.props.onFavoritePress(item);
return (
<List.Item
title={item.name}
@ -48,9 +60,12 @@ export default class GroupListAccordion extends React.Component<Props, State> {
{...props}
icon={"chevron-right"}/>}
right={props =>
<List.Icon
<IconButton
{...props}
icon={"star"}/>}
icon={"star"}
onPress={onStartPress}
color={this.isItemFavorite(item) ? this.props.theme.colors.tetrisScore : props.color}
/>}
style={{
height: LIST_ITEM_HEIGHT,
justifyContent: 'center',
@ -74,6 +89,14 @@ export default class GroupListAccordion extends React.Component<Props, State> {
height: this.props.height,
justifyContent: 'center',
}}
left={props =>
item.id === "0"
? <List.Icon
{...props}
icon={"star"}
color={this.props.theme.colors.tetrisScore}
/>
: null}
>
{/*$FlowFixMe*/}
<FlatList
@ -89,4 +112,6 @@ export default class GroupListAccordion extends React.Component<Props, State> {
</List.Accordion>
);
}
}
}
export default withTheme(GroupListAccordion)

5
src/managers/AsyncStorageManager.js
View file

@ -84,6 +84,11 @@ export default class AsyncStorageManager {
default: '',
current: '',
},
planexFavoriteGroups: {
key: 'planexFavoriteGroups',
default: '[]',
current: '',
},
};
/**

56
src/screens/GroupSelectionScreen.js
View file

@ -7,6 +7,7 @@ import {Searchbar, withTheme} from "react-native-paper";
import {stringMatchQuery} from "../utils/Search";
import WebSectionList from "../components/Lists/WebSectionList";
import GroupListAccordion from "../components/Lists/GroupListAccordion";
import AsyncStorageManager from "../managers/AsyncStorageManager";
const LIST_ITEM_HEIGHT = 70;
@ -19,6 +20,7 @@ type Props = {
type State = {
currentSearchString: string,
favoriteGroups: Array<Object>,
};
function sortName(a, b) {
@ -41,6 +43,7 @@ class GroupSelectionScreen extends React.Component<Props, State> {
super(props);
this.state = {
currentSearchString: '',
favoriteGroups: JSON.parse(AsyncStorageManager.getInstance().preferences.planexFavoriteGroups.current),
};
}
@ -93,6 +96,49 @@ class GroupSelectionScreen extends React.Component<Props, State> {
});
};
onListFavoritePress = (item: Object) => {
this.updateGroupFavorites(item);
};
isGroupInFavorites(group: Object) {
let isFav = false;
for (let i = 0; i < this.state.favoriteGroups.length; i++) {
if (group.id === this.state.favoriteGroups[i].id) {
isFav = true;
break;
}
}
return isFav;
}
removeGroupFromFavorites(favorites: Array<Object>, group: Object) {
for (let i = 0; i < favorites.length; i++) {
if (group.id === favorites[i].id) {
favorites.splice(i, 1);
break;
}
}
}
addGroupToFavorites(favorites: Array<Object>, group: Object) {
group.isFav = true;
favorites.push(group);
favorites.sort(sortName);
}
updateGroupFavorites(group: Object) {
let newFavorites = [...this.state.favoriteGroups]
if (this.isGroupInFavorites(group))
this.removeGroupFromFavorites(newFavorites, group);
else
this.addGroupToFavorites(newFavorites, group);
this.setState({favoriteGroups: newFavorites})
console.log(newFavorites);
AsyncStorageManager.getInstance().savePref(
AsyncStorageManager.getInstance().preferences.planexFavoriteGroups.key,
JSON.stringify(newFavorites));
}
shouldDisplayAccordion(item: Object) {
let shouldDisplay = false;
for (let i = 0; i < item.content.length; i++) {
@ -116,7 +162,9 @@ class GroupSelectionScreen extends React.Component<Props, State> {
<GroupListAccordion
item={item}
onGroupPress={this.onListItemPress}
onFavoritePress={this.onListFavoritePress}
currentSearchString={this.state.currentSearchString}
favoriteNumber={this.state.favoriteGroups.length}
height={LIST_ITEM_HEIGHT}
/>
);
@ -127,16 +175,18 @@ class GroupSelectionScreen extends React.Component<Props, State> {
generateData(fetchedData: Object) {
let data = [];
for (let key in fetchedData) {
this.formatGroupNames(fetchedData[key]);
this.formatGroups(fetchedData[key]);
data.push(fetchedData[key]);
}
data.sort(sortName);
data.unshift({name: "FAVORITES", id: "0", content: this.state.favoriteGroups});
return data;
}
formatGroupNames(item: Object) {
formatGroups(item: Object) {
for (let i = 0; i < item.content.length; i++) {
item.content[i].name = item.content[i].name.replace(REPLACE_REGEX, " ")
item.content[i].isFav = this.isGroupInFavorites(item.content[i]);
}
}
@ -167,7 +217,7 @@ class GroupSelectionScreen extends React.Component<Props, State> {
refreshOnFocus={false}
fetchUrl={GROUPS_URL}
renderItem={this.renderItem}
updateData={this.state.currentSearchString}
updateData={this.state.currentSearchString + this.state.favoriteGroups.length}
itemHeight={LIST_ITEM_HEIGHT}
/>
</View>