From ac786cbafe2e733c4ca1436876773d03a6fd7f7e Mon Sep 17 00:00:00 2001 From: Arsentiy Milchakov Date: Mon, 1 Jul 2019 13:21:05 +0300 Subject: [PATCH] [android] fix for incorrect copy text on openin hours view into place page --- .../mapswithme/maps/widget/placepage/PlacePageView.java | 7 +++++-- android/src/com/mapswithme/util/UiUtils.java | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java index d059dac913..6e0a0c5701 100644 --- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java +++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java @@ -1537,7 +1537,7 @@ public class PlacePageView extends NestedScrollView 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)); - UiUtils.hide(mFullOpeningHours); + UiUtils.clearTextAndHide(mFullOpeningHours); return; } @@ -1997,7 +1997,10 @@ public class PlacePageView extends NestedScrollView items.add(mTvPhone.getText().toString()); break; case R.id.ll__place_schedule: - items.add(mFullOpeningHours.getText().toString()); + String text = UiUtils.isVisible(mFullOpeningHours) + ? mFullOpeningHours.getText().toString() + : mTodayOpeningHours.getText().toString(); + items.add(text); break; case R.id.ll__place_operator: items.add(mTvOperator.getText().toString()); diff --git a/android/src/com/mapswithme/util/UiUtils.java b/android/src/com/mapswithme/util/UiUtils.java index f483277457..c1fe3ad843 100644 --- a/android/src/com/mapswithme/util/UiUtils.java +++ b/android/src/com/mapswithme/util/UiUtils.java @@ -280,6 +280,12 @@ public final class UiUtils showIf(!TextUtils.isEmpty(text), tv); } + public static void clearTextAndHide(TextView tv) + { + tv.setText(""); + hide(tv); + } + public static void showHomeUpButton(Toolbar toolbar) { toolbar.setNavigationIcon(ThemeUtils.getResource(toolbar.getContext(), R.attr.homeAsUpIndicator));