pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Show default OH string if it wasn't parsed properly.

Browse source 
Signed-off-by: vng <viktor.govako@gmail.com>
This commit is contained in:
vng 2021-05-29 14:59:12 +03:00 • committed by Roman Tsisyk
parent 2a59c8474d
commit 435464dfcd
1 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
View file

@ -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;
}
}