From 435464dfcddeb82d4f015d4bb61315fe61d0dc47 Mon Sep 17 00:00:00 2001 From: vng Date: Sat, 29 May 2021 14:59:12 +0300 Subject: [PATCH] [android] Show default OH string if it wasn't parsed properly. Signed-off-by: vng --- .../maps/widget/placepage/PlacePageView.java | 35 +++++++++++++------ 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java index 6008fbe949..5201b7a1eb 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java @@ -802,21 +802,36 @@ public class PlacePageView extends NestedScrollViewClickFixed private void refreshOpeningHours(@NonNull MapObject mapObject) { - final Timetable[] timetables = OpeningHours.nativeTimetablesFromString(mapObject.getMetadata(Metadata.MetadataType.FMD_OPEN_HOURS)); - if (timetables == null || timetables.length == 0) + final String ohStr = mapObject.getMetadata(Metadata.MetadataType.FMD_OPEN_HOURS); + final Timetable[] timetables = OpeningHours.nativeTimetablesFromString(ohStr); + final boolean isEmptyTT = (timetables == null || timetables.length == 0); + final int color = ThemeUtils.getColor(getContext(), android.R.attr.textColorPrimary); + + String ohStringToShow = null; + + if (isEmptyTT) { - UiUtils.hide(mOpeningHours); - return; + if (!ohStr.isEmpty()) + ohStringToShow = ohStr; + else + { + UiUtils.hide(mOpeningHours); + return; + } } UiUtils.show(mOpeningHours); final Resources resources = getResources(); - if (timetables[0].isFullWeek()) + if (!isEmptyTT && timetables[0].isFullWeek()) { - refreshTodayOpeningHours((timetables[0].isFullday ? resources.getString(R.string.twentyfour_seven) - : resources.getString(R.string.daily) + " " + timetables[0].workingTimespan), - ThemeUtils.getColor(getContext(), android.R.attr.textColorPrimary)); + ohStringToShow = timetables[0].isFullday ? resources.getString(R.string.twentyfour_seven) + : resources.getString(R.string.daily) + " " + timetables[0].workingTimespan; + } + + if (ohStringToShow != null) + { + refreshTodayOpeningHours(ohStringToShow, color); UiUtils.clearTextAndHide(mFullOpeningHours); return; } @@ -840,9 +855,7 @@ public class PlacePageView extends NestedScrollViewClickFixed workingTime = tt.workingTimespan.toString(); } - refreshTodayOpeningHours(resources.getString(R.string.today) + " " + workingTime, - ThemeUtils.getColor(getContext(), android.R.attr.textColorPrimary)); - + refreshTodayOpeningHours(resources.getString(R.string.today) + " " + workingTime, color); break; } }