[Android] Opening hours UI rework #1599

strump · 2021-11-22T13:27:11Z

strump commented

2021-11-22 13:27:11 +00:00

Another week, another PR!

Closes Issue #970. Made Android Opening hours UI simmilar to iOS. opening_hours value matches different cases:

Case 1: Label only

E.g.

opening_hours = 24/7
opening_hours unparsable

🌍 https://osm.org/node/3882420485 → 🕗 24/7
🌍 https://osm.org/node/6070463188 → 🕗 Unparsed Mo-Fr 09:00-19:00; Sa,Su,PH 09:00-20:00

Show just label:

Unparsable sample:

Case 2: Label + time

E.g.

opening_hours = 10:00-22:00
opening_hours = Mo-Su 17:00-00:00

🌍 https://osm.org/node/4601505099 → 🕗Mo-Su 17:00-00:00

Open hours are right aligned:

Case 3: Label + time + non-business time(s)

E.g.

opening_hours = 10:00-16:00, 16:30-22:00
opening_hours = Mo-Su 10:00-16:00, 16:30-22:00

🌍 https://osm.org/node/6293418985 → 🕗Mo-Su 9:30-14:00, 15:00-18:30

Open hours are right aligned. Non-business hours text below hours.

Case 4: Label + time + week schedule

E.g.

opening_hours = Mo-Fr 09:00-20:00; Sa 10:00-17:00; Su 11:00-14:00

🌍 https://osm.org/way/684433599 → 🕗Mo-Fr 06:00-22:00; Sa-Su 07:00-22:00

Open hours are right aligned for today and for the whole week.

Case 5: Label + time + week schedule + non-business time(s)

E.g.

opening_hours = Mo-Fr 09:00-15:00,15:30-22:00; Sa 10:00-15:00,15:30-22:00; Su 10:00-18:00

🌍 https://osm.org/node/2665722353 → 🕗Mo-Th 13:30-16:00,20:30-23:30;Tu off;Fr,Sa 13:30-16:00,20:30-24:00;Su 13:30-16:00

Open hours are right aligned for today and for the whole week. Non-business hours text below hours for today and for each week day.

Case 6: Closed today label + week schedule + non-business time(s)

E.g.

opening_hours = Mo off; Tu-Fr 09:00-15:00,15:30-22:00; Sa 10:00-15:00,15:30-22:00; Su 10:00-18:00

🌍 https://osm.org/node/2199786968 → 🕗Th,Fr 21:30-00:30,Sa 14:00-17:00,21:30-00:30; Mo-We off

Label tells that POI is closed today in red. Open hours are right aligned for the whole week. Non-business hours text below hours for each week day.

Layout changes:

Before:

After:

Questions:

☑️ Do we need horizontal separators as iOS version does? - No
☑️ Does Opening hours widget should be collapsible like iOS version? - No
☑️ iOS version shows if place is closed at some date. See "Sun-Wed closed" at the Case 6 screenshot. Do we need the same feature for Android? - Added

Update 23 Nov 2021

Added em-dash as open time and non-business time separator. (I will not update all screenshots in this PR. Just belive me 😄)

Added closed weekdays as last item of week schedule:

Another week, another PR! Closes Issue #970. Made Android Opening hours UI simmilar to iOS. `opening_hours` value matches different cases: ## Case 1: Label only E.g. * `opening_hours = 24/7` * `opening_hours` unparsable 🌍 https://osm.org/node/3882420485 → 🕗 `24/7` 🌍 https://osm.org/node/6070463188 → 🕗 Unparsed `Mo-Fr 09:00-19:00; Sa,Su,PH 09:00-20:00` Show just label: ![case1_24-7](https://user-images.githubusercontent.com/720808/142868144-f8366182-cd2d-42a0-92ad-5674208643be.png) Unparsable sample: ![case1_unparsable](https://user-images.githubusercontent.com/720808/142868176-afd20e44-fb5e-4427-8691-c0d3021945a6.png) ## Case 2: Label + time E.g. * `opening_hours = 10:00-22:00` * `opening_hours = Mo-Su 17:00-00:00` 🌍 https://osm.org/node/4601505099 → 🕗`Mo-Su 17:00-00:00` Open hours are right aligned: ![case2](https://user-images.githubusercontent.com/720808/142868232-b3d3c620-753e-4761-b47b-54b7b61b4b88.png) ## Case 3: Label + time + non-business time(s) E.g. * `opening_hours = 10:00-16:00, 16:30-22:00` * `opening_hours = Mo-Su 10:00-16:00, 16:30-22:00` 🌍 https://osm.org/node/6293418985 → 🕗`Mo-Su 9:30-14:00, 15:00-18:30` Open hours are right aligned. Non-business hours text below hours. ![case3](https://user-images.githubusercontent.com/720808/142868314-9f56382c-3df9-4dd7-afea-600d8e348989.png) ## Case 4: Label + time + week schedule E.g. * `opening_hours = Mo-Fr 09:00-20:00; Sa 10:00-17:00; Su 11:00-14:00` 🌍 https://osm.org/way/684433599 → 🕗`Mo-Fr 06:00-22:00; Sa-Su 07:00-22:00` Open hours are right aligned for today and for the whole week. ![case4](https://user-images.githubusercontent.com/720808/142868382-52f95611-30f3-44c9-bcc2-cdac8e6c7f7f.png) ## Case 5: Label + time + week schedule + non-business time(s) E.g. * `opening_hours = Mo-Fr 09:00-15:00,15:30-22:00; Sa 10:00-15:00,15:30-22:00; Su 10:00-18:00` 🌍 https://osm.org/node/2665722353 → 🕗`Mo-Th 13:30-16:00,20:30-23:30;Tu off;Fr,Sa 13:30-16:00,20:30-24:00;Su 13:30-16:00` Open hours are right aligned for today and for the whole week. Non-business hours text below hours for today and for each week day. ![case5](https://user-images.githubusercontent.com/720808/142868620-648e36f5-697c-44b8-b75d-4447ba4f1275.png) ## Case 6: Closed today label + week schedule + non-business time(s) E.g. * `opening_hours = Mo off; Tu-Fr 09:00-15:00,15:30-22:00; Sa 10:00-15:00,15:30-22:00; Su 10:00-18:00` 🌍 https://osm.org/node/2199786968 → 🕗`Th,Fr 21:30-00:30,Sa 14:00-17:00,21:30-00:30; Mo-We off` Label tells that POI is closed today in red. Open hours are right aligned for the whole week. Non-business hours text below hours for each week day. ![case6](https://user-images.githubusercontent.com/720808/142868691-d7e7d439-7c83-41fb-968f-28f82ee06f13.png) ## Layout changes: **Before:** ![layout_old](https://user-images.githubusercontent.com/720808/142869473-aabbcc99-c8d8-40d3-9e41-33aea072884f.png) **After:** ![layout_new](https://user-images.githubusercontent.com/720808/142869507-a4572cfc-a757-4152-8799-4c9886f79dcf.png) ## Questions: * ☑️ Do we need horizontal separators as iOS version does? - No * ☑️ Does Opening hours widget should be collapsible like iOS version? - No * ☑️ iOS version shows if place is closed at some date. See "Sun-Wed closed" at the Case 6 screenshot. Do we need the same feature for Android? - Added ## Update 23 Nov 2021 Added em-dash as open time and non-business time separator. (I will not update all screenshots in this PR. Just belive me 😄) Added closed weekdays as last item of week schedule: ![android_new_case5_case6_plus](https://user-images.githubusercontent.com/720808/143013035-b71baf1b-d8e6-4b12-b6ab-53d45b7ff658.png)

👍 4

biodranik commented

2021-11-23 00:33:38 +00:00

(Migrated from github.com)

Do we need horizontal separators as iOS version does?

No, it looks good now.

Does Opening hours widget should be collapsible like iOS version?

Not crucial, IMO.

iOS version shows if place is closed at some date. See "Sun-Wed closed" at the Case 6 screenshot. Do we need the same feature for Android?

Yes, it is easier if all days are present.

> Do we need horizontal separators as iOS version does? No, it looks good now. > Does Opening hours widget should be collapsible like iOS version? Not crucial, IMO. > iOS version shows if place is closed at some date. See "Sun-Wed closed" at the Case 6 screenshot. Do we need the same feature for Android? Yes, it is easier if all days are present.

biodranik (Migrated from github.com) reviewed 2021-11-23 00:46:37 +00:00

biodranik (Migrated from github.com) left a comment

Thanks for the fixes!

android/src/com/mapswithme/maps/editor/data/TimeFormatUtils.java