Dining redesign: open until subtitle, updated day chips, availability card redesign, improved chart and menus #48

kaushikravikumar · 2020-06-14T07:35:13Z

Summary

This pull request adds a toolbar that utilizes the api endpoint facilityHours in order to fetch the operating hours of a facility. Using this info, the user sees in the subtitle of the toolbar whether it's open or closed and exactly when it is open until or when it is closed until. Right Now, entire subtitle is red or green depending on whether it is closed or open. Will work on implementing it such that it matches the design on Figma, where only the word open or closed is colored in.

This pull request is the first step towards the dining redesign effort.

Changed Day Chips Design
Toolbar with Open/Close Info for facility
Change Availability Card
Clean up Menu design
Gray out closed hours of Historical data chart

Test Plan

I created a list inside the facilityHoursOnResponse function definition inside of the checkFacilityIsOpen() function inside the FacilityInfoPage Kotlin activity. This list had a bunch of sample unix timestamps for a day's operating hour time slots. The last element was the first time slot of the next day. This hardcoded list allows us to test our onResponse handler, since right now any request to the operatingHours endpoint will return an empty list. Then, we should also hardcode the currentTime variable within this function and play around with its value ensuring the results are as expected.
The cases we must test are as follows. The case that the currentTime is lower than the first time slots open time. Next case, is that the currentTime falls into one of the time slots in the day meaning that the facility is open. Another case is that the currentTime falls between two time slots so the facility is closed and will open when it is the second of the two time slots' open time. Finally, the last case is that the time is past the last time slot of the day's close time. After ensuring that all these edge cases are met, we should be good to go.
We must also make sure to test that the JSON parsing of the API response works as expected! In order to do this, we should actually mock the API response, so that we are testing the JSON parsing of the API response body.

Updated screenshot (2020-06-27)

Notes

In building this feature, I had to make a few minor changes in other parts of the code.

Moved parseTime function from jsonParser class to FluxUtil, since it made more sense being a util function for the entire project, plus I ended up using the function in FacilityInfoPage.
Edited getCurrentDate() and getDayStringDaysAfter() functions in FluxUtil to ask for param specifying what format we want the date returned in, with year first or last (MM-DD-YYYY or YYYY-MM-DD). However this is something we should standardize across all our backend api endpoints. Thus, this is jus a temporary change!

… api response

dti-github-bot · 2020-06-14T07:35:30Z

[diff-counting] Significant lines: 766.

kungpaogao

Looks good so far! I'm thinking we could probably optimize how many requests we make, since we're getting the operating hours with the historical data already.

kungpaogao · 2020-06-17T05:55:50Z

Density/app/src/main/java/org/cornelldti/density/density/network/API.kt

+    fun facilityHours(facilityId: String, startDate: String, endDate: String, facilityHoursOnResponse: (List<Pair<Long, Long>>) -> Unit) {
+        val facilityHoursRequest = getRequest(
+                url = "$OPERATING_HOURS_ENDPOINT?id=$facilityId&startDate=$startDate&endDate=$endDate",
+                onResponse = { response ->
+                    facilityHoursOnResponse(JsonParser.parseOperatingHoursToTimestampList(response))
+                },
+                onError = {
+                    error -> Log.d("Error fetching hours", error.networkResponse.toString());
+                }
+        )
+        queue.add(facilityHoursRequest)
+    }
+


I think since fetchHistoricalJSON() also does a request to get the operating hours, it would make sense to combine the two in some way. Right now, I think you end up fetching it twice in FacilityInfoPage.kt.

kungpaogao · 2020-06-17T05:59:46Z

Density/app/src/main/java/org/cornelldti/density/density/util/FluxUtil.kt

     */
-    fun getCurrentDate(): String {
+    fun getCurrentDate(yearBeginning: Boolean): String {


we should get backend to update to use ISO format with year at beginning LOL

also, there's another function called getDate() that we should probably combine

kungpaogao · 2020-06-17T06:01:11Z

Density/app/src/main/java/org/cornelldti/density/density/util/FluxUtil.kt

+    fun parseTime(timestamp: Long): String {
+        val timeZone = Calendar.getInstance().timeZone
+        var format = SimpleDateFormat("h:mma", Locale.US)
+        if (DateFormat.is24HourFormat(DensityApplication.getAppContext())) {


love me some 24h time 😍

kungpaogao

Like the improvements to the API calls - it makes a lot of sense to pair the timestamps + interval strings together and have the view determine what to use.

kungpaogao · 2020-06-20T03:57:39Z

Density/app/src/main/java/org/cornelldti/density/density/network/API.kt

+    fun facilityHours(facilityId: String, startDate: String, endDate: String, facilityHoursTimeStampsOnResponse: (List<Pair<Long, Long>>) -> Unit,
+    facilityHoursStringsOnResponse: (List<String>) -> Unit) {
        val facilityHoursRequest = getRequest(
                url = "$OPERATING_HOURS_ENDPOINT?id=$facilityId&startDate=$startDate&endDate=$endDate",
                onResponse = { response ->
-                    facilityHoursOnResponse(JsonParser.parseOperatingHoursToTimestampList(response))
+                    facilityHoursTimeStampsOnResponse(JsonParser.parseOperatingHoursToTimestampList(response))
+                    facilityHoursStringsOnResponse(JsonParser.parseOperatingHours(response))


good, makes sense to pair these together

kungpaogao · 2020-06-20T05:12:18Z

Density/app/src/main/java/org/cornelldti/density/density/facilitydetail/FacilityInfoPage.kt

+        facilityHoursStringsOnResponse = {
+            hoursStringsList ->
+            opHoursStrings = hoursStringsList
+        })


will things get messed up if opHoursStrings is not set in time for the UI updates?

I guess it won't throw an error since it's just an empty list...

kungpaogao · 2020-06-20T05:15:41Z

Density/app/src/main/java/org/cornelldti/density/density/util/FluxUtil.kt

    /**
-     * getDate(day) provides the date for historical endpoint request.
+     * getDateString(day) provides the date in string format for historical endpoint request.
     */
-    fun getDate(day: String): String {
+    fun getDateObject(day: String): Date {


did the documentation get mixed up?

…king if closed/open and one that shows operating hours for selected day

…ed word in text

- move `fun initializeView` into `onCreate` - add helper for getting integer of day (0 = sun ... 6 = sat)

- no data, just some hardcoded strings + approx. layout

- increase font size - marginStart 8dp

…us-density-android into dining_redesign

- left-align chips - move chips out of card - update font color/styles - remove accessibility icon when closed

…us-density-android into dining_redesign had to add last updated text

…lowered width of day chips

- change FluxUtil.convertDateObjectToString to use ISO format (yyyy-MM-dd) - now works with new backend changes

…esign

- flatten relative layout

- made the bars only rounded on the top - updated label and axis colors - updated some code style - TODO: improve performance

kungpaogao

We should probably get another pair of eyes on this, but I think it's ready to merge.

kungpaogao · 2020-08-15T18:02:27Z

Merging for now, but there is still a related issue #49.

kaushikravikumar added 3 commits May 9, 2020 10:04

added date to day chips by making chips into radiobuttons

2098eda

removed lite_lunch logic, since its grouped with lunch in dining menu…

4c66c5c

… api response

made toolbar include subtitle with openclose info

fc468a5

kaushikravikumar requested a review from a team as a code owner June 14, 2020 07:35

kaushikravikumar added 2 commits June 14, 2020 00:37

moved parseTime function to fluxutil

2b478a0

added next day to facilityhours endpoint

f4960d4

kaushikravikumar requested a review from kungpaogao June 14, 2020 07:51

kaushikravikumar self-assigned this Jun 14, 2020

kaushikravikumar added the feature New feature or request label Jun 14, 2020

kungpaogao reviewed Jun 17, 2020

View reviewed changes

removed duplicate operating hours request

3805277

kungpaogao reviewed Jun 20, 2020

View reviewed changes

kaushikravikumar and others added 17 commits June 21, 2020 13:53

created two separate variables to store operating hours: one for chec…

5dd527f

…king if closed/open and one that shows operating hours for selected day

added curr date textview

c4e3857

changed so open/closed text only colors red or green for open or clos…

dd50c58

…ed word in text

removed extra line

9c6779a

Bump Gradle, package versions

9c0698d

Implement dynamic chips (shows today first)

5243351

- move `fun initializeView` into `onCreate` - add helper for getting integer of day (0 = sun ... 6 = sat)

Remove unnecessary outline

e658a89

Format code

47758a5

Implement basic layout for new availability card

989e567

- no data, just some hardcoded strings + approx. layout

Availability number now updates according to crowdedness

7cdbde8

Availability card displays live max capacity

9753081

made all dates yyyy-mm-dd

154c8b3

fixed double loading of historical chart bug

658abd4

Move section headers outside of card

a2fe498

- increase font size - marginStart 8dp

Merge branch 'dining_redesign' of https://github.com/cornell-dti/camp…

aa9fa53

…us-density-android into dining_redesign

Implement color changes for availability card

450baef

Update green/teal color

25ac06b

kungpaogao and others added 10 commits July 5, 2020 14:37

Update menu UI to match design mockups

e2b6ba0

- left-align chips - move chips out of card - update font color/styles - remove accessibility icon when closed

added last updated text

ee75f8d

merge branch 'dining_redesign' of https://github.com/cornell-dti/camp…

a9af916

…us-density-android into dining_redesign had to add last updated text

changed color of is it accurate text

ab97968

fixed spacing between last updated text and next component below and …

ab79278

…lowered width of day chips

Fix operating hours not displaying on Android

8a44223

- change FluxUtil.convertDateObjectToString to use ISO format (yyyy-MM-dd) - now works with new backend changes

Update spacing for operating hours in historical data card

9223977

Merge remote-tracking branch 'origin/dining_redesign' into dining_red…

42c532f

…esign

Fix layout scaling for date selection buttons

995f337

- flatten relative layout

Implement graying out of chart + other chart improvements

975977e

- made the bars only rounded on the top - updated label and axis colors - updated some code style - TODO: improve performance

kungpaogao self-assigned this Jul 11, 2020

kungpaogao approved these changes Jul 19, 2020

View reviewed changes

kungpaogao requested a review from SamChou19815 August 7, 2020 05:08

kungpaogao changed the title ~~Dining redesign: Toolbar includes open/close info of facility~~ Dining redesign: open until subtitle, updated day chips, availability card redesign, improved chart and menus Aug 15, 2020

kungpaogao merged commit 5c179ba into master Aug 15, 2020

kungpaogao deleted the dining_redesign branch August 15, 2020 18:03

kungpaogao mentioned this pull request Sep 26, 2020

Dynamic chips and favorites #25

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dining redesign: open until subtitle, updated day chips, availability card redesign, improved chart and menus #48

Dining redesign: open until subtitle, updated day chips, availability card redesign, improved chart and menus #48

kaushikravikumar commented Jun 14, 2020 •

edited by kungpaogao

Loading

dti-github-bot commented Jun 14, 2020 •

edited

Loading

kungpaogao left a comment

kungpaogao Jun 17, 2020

kungpaogao Jun 17, 2020

kungpaogao Jun 17, 2020

kungpaogao Jun 17, 2020

kungpaogao left a comment

kungpaogao Jun 20, 2020

kungpaogao Jun 20, 2020

kungpaogao Jun 20, 2020

kungpaogao Jun 20, 2020

kungpaogao left a comment

kungpaogao commented Aug 15, 2020

Dining redesign: open until subtitle, updated day chips, availability card redesign, improved chart and menus #48

Dining redesign: open until subtitle, updated day chips, availability card redesign, improved chart and menus #48

Conversation

kaushikravikumar commented Jun 14, 2020 • edited by kungpaogao Loading

Summary

Test Plan

Notes

dti-github-bot commented Jun 14, 2020 • edited Loading

kungpaogao left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kungpaogao left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kungpaogao left a comment

Choose a reason for hiding this comment

kungpaogao commented Aug 15, 2020

kaushikravikumar commented Jun 14, 2020 •

edited by kungpaogao

Loading

dti-github-bot commented Jun 14, 2020 •

edited

Loading