vergnet/application-amicale
5
5
Fork 5
Code Issues Pull requests Releases Wiki Activity

Improved planning display screen and fixed crash when no event on home

Browse source
This commit is contained in:
keplyx 2020-02-05 09:46:10 +01:00
parent f171578c8d
commit 7def165547
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
screens/HomeScreen.js
View file

@ -310,7 +310,12 @@ export default class HomeScreen extends FetchedDataSectionList {
</Text>; </Text>;
} else } else
subtitle = i18n.t('homeScreen.dashboard.todayEventsSubtitleNA'); subtitle = i18n.t('homeScreen.dashboard.todayEventsSubtitleNA');
let clickAction = () => this.props.navigation.navigate('PlanningDisplayScreen', {data: displayEvent}); let clickAction = () => {
if (isAvailable)
this.props.navigation.navigate('PlanningDisplayScreen', {data: displayEvent});
else
this.props.navigation.navigate('PlanningScreen');
};
let displayEvent = this.getDisplayEvent(futureEvents); let displayEvent = this.getDisplayEvent(futureEvents);

6
screens/PlanningDisplayScreen.js
View file

@ -37,6 +37,12 @@ export default class PlanningDisplayScreen extends React.Component<Props> {
<H1> <H1>
{displayData.title} {displayData.title}
</H1> </H1>
<H3 style={{
marginTop: 10,
color: ThemeManager.getCurrentThemeVariables().listNoteColor
}}>
{PlanningEventManager.getFormattedTime(displayData)}
</H3>
{displayData.logo !== null ? {displayData.logo !== null ?
<View style={{width: '100%', height: 300, marginTop: 20, marginBottom: 20}}> <View style={{width: '100%', height: 300, marginTop: 20, marginBottom: 20}}>
<Image style={{flex: 1, resizeMode: "contain"}} <Image style={{flex: 1, resizeMode: "contain"}}