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

Displayed elevation for peaks.

Browse source
This commit is contained in:
Dmitry Yunitsky 2015-03-18 18:35:41 +03:00 • committed by Alex Zolotarev
parent 4cb2d80411
commit 288e8af7c9
7 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
android/res/drawable-hdpi/ic_high_mountain.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 288 B

BIN
android/res/drawable-mdpi/ic_high_mountain.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 205 B

BIN
android/res/drawable-xhdpi/ic_high_mountain.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 349 B

BIN
android/res/drawable-xxhdpi/ic_high_mountain.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 517 B

1
android/res/layout/place_page_details_common.xml
View file

@ -35,7 +35,6 @@
<View
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_marginTop="@dimen/margin_small"
android:layout_marginBottom="@dimen/margin_small"/>
<include

13
android/res/layout/place_page_preview_common.xml
View file

@ -18,6 +18,7 @@
<TextView
android:id="@+id/tv__subtitle"
android:layout_width="wrap_content"
android:layout_marginRight="@dimen/margin_medium"
android:layout_height="wrap_content"
android:layout_below="@id/tv__title"
android:textColor="@color/text_place_page_subtitle"
@ -41,11 +42,21 @@
android:numStars="5"
android:stepSize="1"
android:progressDrawable="@drawable/rating_bar_stars"
android:layout_marginLeft="@dimen/margin_small"
android:layout_toRightOf="@id/tv__subtitle"
android:layout_alignBottom="@id/tv__subtitle"
android:visibility="gone"/>
<TextView
android:id="@+id/tv__peak_elevation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/ic_high_mountain"
android:layout_toRightOf="@id/tv__subtitle"
android:layout_alignBottom="@id/tv__subtitle"
android:textColor="@color/text_place_page_subtitle"
android:textSize="@dimen/place_page_subtitle"
android:visibility="gone"/>
</RelativeLayout>
<TextView

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

@ -63,6 +63,7 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
private ArrowView mAvDirection;
private TextView mTvDistance;
private RatingBar mRbStars;
private TextView mTvElevation;
// Place page details
private ViewGroup mPpDetails;
private LinearLayout mLlAddress;
@ -143,6 +144,7 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
mAvDirection.setOnClickListener(this);
mAvDirection.setImageResource(R.drawable.selector_direction);
mRbStars = (RatingBar) ppPreview.findViewById(R.id.rb__stars);
mTvElevation = (TextView) ppPreview.findViewById(R.id.tv__peak_elevation);
mPpDetails = (ViewGroup) findViewById(R.id.pp__details);
mLlAddress = (LinearLayout) mPpDetails.findViewById(R.id.ll__place_name);
@ -375,6 +377,15 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
refreshMetadataOrHide(null, mLlSchedule, mTvSchedule);
refreshMetadataStars(mMapObject.getMetadata(Metadata.MetadataType.FMD_STARS));
final String elevation = mMapObject.getMetadata(Metadata.MetadataType.FMD_ELE);
if (!TextUtils.isEmpty(elevation))
{
mTvElevation.setVisibility(View.VISIBLE);
mTvElevation.setText(elevation);
}
else
mTvElevation.setVisibility(View.GONE);
}
private void refreshButtons(boolean showBackButton)