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

[android] fix for incorrect copy text on openin hours view into place page

Browse source
This commit is contained in:
Arsentiy Milchakov 2019-07-01 13:21:05 +03:00 • committed by Aleksandr Zatsepin
parent 70846ae6d9
commit ac786cbafe
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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());

6
android/src/com/mapswithme/util/UiUtils.java
View file

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