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

[android] fix for lost header label 'key information' on PP

Browse source
This commit is contained in:
Alexey Osminin 2020-12-01 18:03:58 +03:00 • committed by Alexander Boriskov
parent 1855d4c46f
commit ba8dfaaeb9
5 changed files with 37 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/res/layout/place_page_details.xml
View file

@ -53,6 +53,8 @@
<include layout="@layout/place_page_placename"/>
<include layout="@layout/place_page_key_info_header"/>
<include layout="@layout/place_page_opening_hours"/>
<include layout="@layout/place_page_entrance"/>

22
android/res/layout/place_page_key_info_header.xml Normal file
View file

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/place_page_key_info"
android:visibility="gone"
tools:visibility="visible"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:padding="@dimen/margin_base"
android:singleLine="true"
android:background="?windowBackgroundForced"
android:text="@string/key_information_title"
android:textColor="?buttonTextColor"
android:lineSpacingExtra="8sp"
android:textAppearance="?fontSubtitle2" />
<include layout="@layout/divider_horizontal" />
</FrameLayout>

5
android/src/com/mapswithme/maps/bookmarks/data/MapObject.java
View file

@ -380,6 +380,11 @@ public class MapObject implements PopularityProvider, ShareableInfoProvider,
return res == null ? "" : res;
}
public boolean hasMetadata()
{
return !mMetadata.isEmpty();
}
@MapObjectType
public int getMapObjectType()
{

5
android/src/com/mapswithme/maps/bookmarks/data/Metadata.java
View file

@ -100,6 +100,11 @@ public class Metadata implements Parcelable
return mMetadataMap.get(type);
}
boolean isEmpty()
{
return mMetadataMap.isEmpty();
}
@Override
public int describeContents()
{

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

@ -157,6 +157,7 @@ public class PlacePageView extends NestedScrollViewClickFixed
private TextView mTvWebsite;
private TextView mTvLatlon;
private View mOpeningHours;
private View mKeyInfo;
private TextView mFullOpeningHours;
private TextView mTodayOpeningHours;
private View mWifi;
@ -438,6 +439,7 @@ public class PlacePageView extends NestedScrollViewClickFixed
LinearLayout latlon = findViewById(R.id.ll__place_latlon);
latlon.setOnClickListener(this);
mTvLatlon = findViewById(R.id.tv__place_latlon);
mKeyInfo = findViewById(R.id.place_page_key_info);
mOpeningHours = findViewById(R.id.ll__place_schedule);
mFullOpeningHours = findViewById(R.id.opening_hours);
mTodayOpeningHours = findViewById(R.id.today_opening_hours);
@ -1422,6 +1424,7 @@ public class PlacePageView extends NestedScrollViewClickFixed
refreshMetadataOrHide(mapObject.getMetadata(Metadata.MetadataType.FMD_WIKIPEDIA), mWiki, null);
refreshMetadataOrHide(mapObject.getMetadata(Metadata.MetadataType.FMD_INTERNET), mWifi, null);
refreshMetadataOrHide(mapObject.getMetadata(Metadata.MetadataType.FMD_FLATS), mEntrance, mTvEntrance);
UiUtils.showIf(mapObject.hasMetadata(), mKeyInfo);
refreshOpeningHours(mapObject);
showTaxiOffer(mapObject);