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

Improved dashboard display and translations. Fixed events ending the next day not showing

Browse source
This commit is contained in:
keplyx 2019-10-09 20:03:33 +02:00
parent 98e820473e
commit 0e6719a274
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app.json
View file

@ -10,7 +10,7 @@
"android", "android",
"web" "web"
], ],
"version": "1.1.1", "version": "1.2.0",
"orientation": "portrait", "orientation": "portrait",
"primaryColor": "#be1522", "primaryColor": "#be1522",
"icon": "./assets/android.icon.png", "icon": "./assets/android.icon.png",
@ -36,7 +36,7 @@
}, },
"android": { "android": {
"package": "fr.amicaleinsat.application", "package": "fr.amicaleinsat.application",
"versionCode": 8, "versionCode": 9,
"icon": "./assets/android.icon.png", "icon": "./assets/android.icon.png",
"adaptiveIcon": { "adaptiveIcon": {
"foregroundImage": "./assets/android.adaptive-icon.png", "foregroundImage": "./assets/android.adaptive-icon.png",

6
screens/HomeScreen.js
View file

@ -41,7 +41,7 @@ function openWebLink(link) {
export default class HomeScreen extends FetchedDataSectionList { export default class HomeScreen extends FetchedDataSectionList {
constructor() { constructor() {
super('DATA_URL', REFRESH_TIME); super(DATA_URL, REFRESH_TIME);
} }
getHeaderTranslation() { getHeaderTranslation() {
@ -57,7 +57,7 @@ export default class HomeScreen extends FetchedDataSectionList {
} }
createDataset(fetchedData: Object) { createDataset(fetchedData: Object) {
fetchedData = DATA; // fetchedData = DATA;
let newsData = []; let newsData = [];
let dashboardData = []; let dashboardData = [];
if (fetchedData['news_feed'] !== undefined) if (fetchedData['news_feed'] !== undefined)
@ -255,7 +255,7 @@ export default class HomeScreen extends FetchedDataSectionList {
if (startDate > now) if (startDate > now)
validEvents.push(event); validEvents.push(event);
else if (endDate !== undefined && endDate !== null) { else if (endDate !== undefined && endDate !== null) {
if (endDate > now) if (endDate > now || endDate < startDate) // Display event if it ends the following day
validEvents.push(event); validEvents.push(event);
} }
} }