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

[android] Refactored placepage UI.

Browse source
This commit is contained in:
Dmitry Yunitsky 2016-03-17 14:12:36 +03:00 • committed by Sergey Yershov
parent d7b1e7c99a
commit 56a6eed369
14 changed files with 251 additions and 259 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
android/res/layout-land/place_page.xml
View file

@ -1,23 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<include
android:id="@+id/pp__preview"
layout="@layout/place_page_preview"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<include
android:id="@+id/pp__details_frame"
layout="@layout/place_page_details"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/pp__preview"/>
android:id="@+id/pp__preview"
layout="@layout/place_page_preview"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<include
android:id="@+id/pp__buttons"
layout="@layout/place_page_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/pp__details_frame"/>
android:id="@+id/pp__details_frame"
layout="@layout/place_page_details"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/pp__preview"/>
<include
android:id="@+id/pp__buttons"
layout="@layout/place_page_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/pp__details_frame"/>
</merge>

39
android/res/layout/place_page.xml
View file

@ -2,31 +2,30 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<include
android:id="@+id/pp__preview"
layout="@layout/place_page_preview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/pp__buttons"/>
android:id="@+id/pp__preview"
layout="@layout/place_page_preview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/pp__buttons"/>
<include
android:id="@+id/pp__details_frame"
layout="@layout/place_page_details"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/pp__buttons"
android:layout_marginTop="56dp"
android:background="?panel"/>
android:id="@+id/pp__details_frame"
layout="@layout/place_page_details"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/pp__buttons"
android:background="?panel"/>
<include
android:id="@+id/pp__buttons"
layout="@layout/place_page_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"/>
android:id="@+id/pp__buttons"
layout="@layout/place_page_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"/>
<include
android:id="@+id/toolbar_layout"
layout="@layout/toolbar_elevated"
android:visibility="gone"/>
android:id="@+id/toolbar_layout"
layout="@layout/toolbar_elevated"
android:visibility="gone"/>
</merge>

194
android/res/layout/place_page_bookmark_details.xml
View file

@ -1,118 +1,136 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/rl__bookmark_details"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/rl__bookmark_details"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipChildren="false"
android:orientation="vertical"
android:paddingBottom="@dimen/margin_base"
android:paddingEnd="@dimen/margin_base"
android:paddingLeft="@dimen/margin_base"
android:paddingRight="@dimen/margin_base"
android:paddingStart="@dimen/margin_base"
android:visibility="invisible"
tools:visibility="visible">
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:clipChildren="false"
android:paddingBottom="@dimen/margin_base"
android:visibility="invisible"
tools:visibility="visible">
<View android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?attr/dividerHorizontal"/>
android:layout_height="1dp"
android:background="?attr/dividerHorizontal"/>
<com.mapswithme.maps.widget.CustomTextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_half"
android:layout_marginTop="@dimen/margin_base">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_half"
android:layout_marginTop="@dimen/margin_base">
<EditText
android:id="@+id/et__bookmark_name"
style="@style/MwmWidget.PlacePage.EditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/name"
android:inputType="textCapWords"
android:singleLine="true"/>
android:id="@+id/et__bookmark_name"
style="@style/MwmWidget.PlacePage.EditText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/name"
android:inputType="textCapWords"
android:singleLine="true"/>
</com.mapswithme.maps.widget.CustomTextInputLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_base_plus"
android:lineSpacingMultiplier="1.67"
android:text="@string/set"
android:textAppearance="@style/MwmTextAppearance.Caption"/>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_base_plus"
android:lineSpacingMultiplier="1.67"
android:text="@string/set"
android:textAppearance="@style/MwmTextAppearance.Caption"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/tv__bookmark_group"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/iv__bookmark_color"
android:background="?clickableBackground"
android:drawableRight="@drawable/ic_arrow_down"
android:lineSpacingMultiplier="1.43"
android:paddingBottom="@dimen/margin_half"
android:paddingRight="@dimen/margin_half"
android:paddingTop="@dimen/margin_half"
android:textAppearance="@style/MwmTextAppearance.PlacePage"/>
android:id="@+id/tv__bookmark_group"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/iv__bookmark_color"
android:layout_toStartOf="@id/iv__bookmark_color"
android:background="?clickableBackground"
android:drawableEnd="@drawable/ic_arrow_down"
android:drawableRight="@drawable/ic_arrow_down"
android:lineSpacingMultiplier="1.43"
android:paddingBottom="@dimen/margin_half"
android:paddingEnd="@dimen/margin_half"
android:paddingRight="@dimen/margin_half"
android:paddingTop="@dimen/margin_half"
android:textAppearance="@style/MwmTextAppearance.PlacePage"
tools:ignore="RtlSymmetry"/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_below="@id/tv__bookmark_group"
android:layout_marginTop="@dimen/margin_quarter"
android:layout_toLeftOf="@+id/iv__bookmark_color"
android:background="?attr/dividerHorizontal"/>
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_below="@id/tv__bookmark_group"
android:layout_marginTop="@dimen/margin_quarter"
android:layout_toLeftOf="@id/iv__bookmark_color"
android:layout_toStartOf="@id/iv__bookmark_color"
android:background="?attr/dividerHorizontal"/>
<ImageView
android:id="@+id/iv__bookmark_color"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="?clickableBackground"
android:padding="@dimen/margin_half"
tools:src="@drawable/ic_bookmark_marker_red_on"/>
android:id="@+id/iv__bookmark_color"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="?clickableBackground"
android:padding="@dimen/margin_half"
tools:src="@drawable/ic_bookmark_marker_red_on"/>
</RelativeLayout>
<TextView
android:id="@+id/tv__bookmark_notes"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/margin_base"
android:paddingBottom="@dimen/margin_half"
android:lineSpacingMultiplier="1.67"
android:text="@string/description"
android:textAppearance="@style/MwmTextAppearance.Caption"/>
android:id="@+id/tv__bookmark_notes"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:lineSpacingMultiplier="1.67"
android:paddingBottom="@dimen/margin_half"
android:paddingTop="@dimen/margin_base"
android:text="@string/description"
android:textAppearance="@style/MwmTextAppearance.Caption"/>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<WebView
android:id="@+id/wv__description"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:id="@+id/wv__description"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<Button
android:id="@+id/btn__edit_html_bookmark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|bottom"
android:background="?attr/selectableItemBackground"
android:text="@string/edit"
android:textAppearance="@style/MwmTextAppearance.Button"/>
android:id="@+id/btn__edit_html_bookmark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"
android:background="?attr/selectableItemBackground"
android:text="@string/edit"
android:textAppearance="@style/MwmTextAppearance.Button"/>
</LinearLayout>
<TextView
android:id="@+id/tv__description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/MwmTextAppearance.Body1"/>
android:id="@+id/tv__description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/MwmTextAppearance.Body1"/>
</FrameLayout>
<View android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="@dimen/margin_half"
android:background="?attr/dividerHorizontal"/>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="@dimen/margin_half"
android:background="?attr/dividerHorizontal"/>
</LinearLayout>

7
android/res/layout/place_page_cuisine.xml
View file

@ -5,12 +5,14 @@
android:id="@+id/ll__place_cuisine"
style="@style/PlacePageItemFrame"
android:tag="cuisine"
android:visibility="gone"
tools:visibility="visible">
tools:visibility="visible"
tools:ignore="UseCompoundDrawables">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_base"
android:layout_marginEnd="@dimen/margin_base"
android:tint="?iconTint"
android:src="@drawable/ic_cuisine"/>
@ -20,4 +22,5 @@
android:layout_height="wrap_content"
android:textAppearance="@style/MwmTextAppearance.PlacePage"
tools:text="Japan, European"/>
</LinearLayout>

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

@ -9,13 +9,11 @@
android:layout_height="match_parent"
android:background="?ppBackground"
android:overScrollMode="never">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="@dimen/margin_base_plus"
android:paddingRight="@dimen/margin_base_plus"
android:paddingTop="@dimen/margin_base">
android:orientation="vertical">
<View
android:layout_width="match_parent"
@ -57,7 +55,9 @@
layout="@layout/place_page_bookmark_details"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
</com.mapswithme.maps.widget.ObservableScrollView>
<include layout="@layout/shadow_top"/>

14
android/res/layout/place_page_editor.xml
View file

@ -1,14 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/ll__place_editor"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?clickableBackground"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="@dimen/margin_half"
android:paddingTop="@dimen/margin_half">
style="@style/PlacePageItemFrame"
tools:visibility="visible">
<ImageView
style="@style/PlacePageMetadataIcon"
@ -18,6 +14,6 @@
<TextView
android:id="@+id/tv__editor"
style="@style/PlacePageMetadataText"
android:textAppearance="@style/MwmTextAppearance.PlacePage.Accent"
android:text="@string/edit_place"/>
android:text="@string/edit_place"
android:textAppearance="@style/MwmTextAppearance.PlacePage.Accent"/>
</LinearLayout>

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

@ -3,75 +3,65 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<RelativeLayout
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1">
android:layout_weight="1"
android:orientation="vertical"
tools:background="@color/base_red">
<TextView
android:id="@+id/tv__title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:fontFamily="@string/robotoMedium"
android:maxLines="@integer/pp_title_lines"
android:textAppearance="@style/MwmTextAppearance.Headline"/>
android:textAppearance="@style/MwmTextAppearance.Title"
tools:ignore="UnusedAttribute"
tools:text="Title"/>
<TextView
android:id="@+id/tv__subtitle"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/tv__title"
android:layout_marginRight="@dimen/margin_base"
android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"/>
android:layout_marginTop="@dimen/margin_quarter"
android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
tools:text="Subtitle"/>
<!-- TODO set correct color when that block will be handled (now its hidden always) -->
<TextView
android:id="@+id/tv__opened_till"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/tv__subtitle"
android:gravity="center_vertical"
android:layout_marginTop="@dimen/margin_quarter"
android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
android:visibility="gone"/>
<RatingBar
android:id="@+id/rb__stars"
style="?android:attr/ratingBarStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/tv__subtitle"
android:layout_marginBottom="@dimen/margin_eighth"
android:layout_toRightOf="@id/tv__subtitle"
android:numStars="5"
android:progressDrawable="@drawable/rating_bar_stars"
android:stepSize="1"
android:visibility="gone"
tools:text="Till 9 PM"
tools:visibility="visible"/>
<TextView
android:id="@+id/tv__peak_elevation"
android:layout_width="wrap_content"
android:id="@+id/tv__address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/tv__subtitle"
android:layout_toRightOf="@id/tv__subtitle"
android:drawableLeft="@drawable/ic_high_mountain"
android:layout_marginTop="@dimen/margin_quarter"
android:textAppearance="@style/MwmTextAppearance.Body1.Secondary"
android:visibility="gone"
tools:text="Das ist Mountain!"
tools:visibility="visible"/>
</RelativeLayout>
tools:text="Lenina str, 10"/>
<TextView
android:id="@+id/tv__straight_distance"
android:layout_width="72dp"
android:layout_height="wrap_content"
android:gravity="right"
android:textAppearance="@style/MwmTextAppearance.PlacePage"/>
</LinearLayout>
<com.mapswithme.maps.widget.ArrowView
android:id="@+id/av__direction"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="-8dp"
android:layout_marginEnd="@dimen/margin_quarter"
android:layout_marginRight="@dimen/margin_quarter"
android:clickable="true"
android:padding="@dimen/margin_half"/>
<TextView
android:id="@+id/tv__straight_distance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/MwmTextAppearance.PlacePage.Accent"/>
</merge>

10
android/res/layout/place_page_report_problem.xml
View file

@ -1,14 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/ll__report_problem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?clickableBackground"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingBottom="@dimen/margin_half"
android:paddingTop="@dimen/margin_half">
style="@style/PlacePageItemFrame"
tools:visibility="visible">
<ImageView
style="@style/PlacePageMetadataIcon"

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

@ -11,7 +11,7 @@
android:layout_height="match_parent"
android:orientation="horizontal"
android:baselineAligned="false"
android:layout_gravity="right|center_vertical">
android:layout_gravity="end|center_vertical">
<include layout="@layout/toolbar_search_controls"/>
<ImageView

11
android/res/values/styles-place_page.xml
View file

@ -2,13 +2,10 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="PlacePagePreview">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">56dp</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:gravity">center_vertical</item>
<item name="android:orientation">horizontal</item>
<item name="android:paddingBottom">@dimen/margin_half_plus</item>
<item name="android:paddingLeft">@dimen/margin_base_plus</item>
<item name="android:paddingRight">@dimen/margin_base_plus</item>
<item name="android:paddingTop">@dimen/margin_base_plus</item>
<item name="android:padding">@dimen/margin_base</item>
</style>
<style name="PlacePageButtonText">
@ -57,6 +54,10 @@
<item name="android:layout_height">wrap_content</item>
<item name="android:orientation">horizontal</item>
<item name="android:paddingBottom">@dimen/margin_half</item>
<item name="android:paddingLeft">@dimen/margin_base</item>
<item name="android:paddingStart" tools:targetApi="jelly_bean_mr1">@dimen/margin_base</item>
<item name="android:paddingRight">@dimen/margin_base</item>
<item name="android:paddingEnd" tools:targetApi="jelly_bean_mr1">@dimen/margin_base</item>
<item name="android:paddingTop">@dimen/margin_half</item>
<item name="android:gravity">center_vertical</item>
<item name="android:background">?clickableBackground</item>

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

@ -109,6 +109,8 @@ public class MapObject implements Parcelable
public double getLon() { return mLon; }
public String getAddress() { return mAddress; }
@NonNull
public String getMetadata(Metadata.MetadataType type)
{

4
android/src/com/mapswithme/maps/widget/placepage/BasePlacePageAnimationController.java
View file

@ -38,10 +38,10 @@ public abstract class BasePlacePageAnimationController
// Visibility
protected OnVisibilityChangedListener mVisibilityChangedListener;
public interface OnVisibilityChangedListener
{
void onPreviewVisibilityChanged(boolean isVisible);
void onPlacePageVisibilityChanged(boolean isVisible);
}
@ -117,4 +117,6 @@ public abstract class BasePlacePageAnimationController
mVisibilityChangedListener.onPlacePageVisibilityChanged(ppShown);
}
}
protected void alignDetailsFrame() {}
}

9
android/src/com/mapswithme/maps/widget/placepage/PlacePageBottomAnimationController.java
View file

@ -14,6 +14,7 @@ import android.view.animation.AccelerateInterpolator;
import android.view.animation.Interpolator;
import android.view.animation.OvershootInterpolator;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import com.mapswithme.maps.R;
import com.mapswithme.maps.widget.placepage.PlacePageView.State;
@ -352,4 +353,12 @@ class PlacePageBottomAnimationController extends BasePlacePageAnimationControlle
animator.setInterpolator(new AccelerateInterpolator());
animator.start();
}
@Override
protected void alignDetailsFrame()
{
final RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mFrame.getLayoutParams();
params.topMargin = mPreview.getHeight();
mFrame.setLayoutParams(params);
}
}

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

@ -34,7 +34,6 @@ import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.PopupMenu;
import android.widget.RatingBar;
import android.widget.RelativeLayout;
import android.widget.ScrollView;
import android.widget.TextView;
@ -84,16 +83,16 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
private boolean mIsDocked;
private boolean mIsFloating;
// Preview
private TextView mTvTitle;
// Preview.
private ViewGroup mPreview;
private Toolbar mToolbar;
private TextView mTvTitle;
private TextView mTvSubtitle;
private ArrowView mAvDirection;
private TextView mTvDistance;
private RatingBar mRbStars;
private TextView mTvElevation;
// Place page details
private ScrollView mPpDetails;
private TextView mTvAddress;
// Details.
private ScrollView mDetails;
private View mPhone;
private TextView mTvPhone;
private View mWebsite;
@ -110,11 +109,9 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
private View mCuisine;
private TextView mTvCuisine;
private View mWiki;
private TextView mTvWiki;
private View mEntrance;
private TextView mTvEntrance;
private View mEditor;
private TextView mTvEditor;
// Bookmark
private ImageView mIvColor;
private EditText mEtBookmarkName;
@ -136,7 +133,6 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
private MapObject mMapObject;
private boolean mIsLatLonDms;
public enum State
{
HIDDEN,
@ -168,48 +164,46 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
{
LayoutInflater.from(getContext()).inflate(R.layout.place_page, this);
ViewGroup ppPreview = (ViewGroup) findViewById(R.id.pp__preview);
mTvTitle = (TextView) ppPreview.findViewById(R.id.tv__title);
mPreview = (ViewGroup) findViewById(R.id.pp__preview);
mTvTitle = (TextView) mPreview.findViewById(R.id.tv__title);
mToolbar = (Toolbar) findViewById(R.id.toolbar);
mTvSubtitle = (TextView) ppPreview.findViewById(R.id.tv__subtitle);
mTvDistance = (TextView) ppPreview.findViewById(R.id.tv__straight_distance);
mAvDirection = (ArrowView) ppPreview.findViewById(R.id.av__direction);
mTvSubtitle = (TextView) mPreview.findViewById(R.id.tv__subtitle);
mTvDistance = (TextView) mPreview.findViewById(R.id.tv__straight_distance);
mAvDirection = (ArrowView) mPreview.findViewById(R.id.av__direction);
mAvDirection.setOnClickListener(this);
mAvDirection.setImageResource(R.drawable.direction);
mRbStars = (RatingBar) ppPreview.findViewById(R.id.rb__stars);
mTvElevation = (TextView) ppPreview.findViewById(R.id.tv__peak_elevation);
mTvAddress = (TextView) mPreview.findViewById(R.id.tv__address);
mPpDetails = (ScrollView) findViewById(R.id.pp__details);
RelativeLayout address = (RelativeLayout) mPpDetails.findViewById(R.id.ll__place_name);
mPhone = mPpDetails.findViewById(R.id.ll__place_phone);
mDetails = (ScrollView) findViewById(R.id.pp__details);
RelativeLayout address = (RelativeLayout) mDetails.findViewById(R.id.ll__place_name);
mPhone = mDetails.findViewById(R.id.ll__place_phone);
mPhone.setOnClickListener(this);
mTvPhone = (TextView) mPpDetails.findViewById(R.id.tv__place_phone);
mWebsite = mPpDetails.findViewById(R.id.ll__place_website);
mTvPhone = (TextView) mDetails.findViewById(R.id.tv__place_phone);
mWebsite = mDetails.findViewById(R.id.ll__place_website);
mWebsite.setOnClickListener(this);
mTvWebsite = (TextView) mPpDetails.findViewById(R.id.tv__place_website);
LinearLayout latlon = (LinearLayout) mPpDetails.findViewById(R.id.ll__place_latlon);
mTvWebsite = (TextView) mDetails.findViewById(R.id.tv__place_website);
LinearLayout latlon = (LinearLayout) mDetails.findViewById(R.id.ll__place_latlon);
latlon.setOnClickListener(this);
mTvLatlon = (TextView) mPpDetails.findViewById(R.id.tv__place_latlon);
mOpeningHours = mPpDetails.findViewById(R.id.ll__place_schedule);
mFullOpeningHours = (TextView) mPpDetails.findViewById(R.id.opening_hours);
mTodayOpeningHours = (TextView) mPpDetails.findViewById(R.id.today_opening_hours);
mWifi = mPpDetails.findViewById(R.id.ll__place_wifi);
mIvColor = (ImageView) mPpDetails.findViewById(R.id.iv__bookmark_color);
mTvLatlon = (TextView) mDetails.findViewById(R.id.tv__place_latlon);
mOpeningHours = mDetails.findViewById(R.id.ll__place_schedule);
mFullOpeningHours = (TextView) mDetails.findViewById(R.id.opening_hours);
mTodayOpeningHours = (TextView) mDetails.findViewById(R.id.today_opening_hours);
mWifi = mDetails.findViewById(R.id.ll__place_wifi);
mIvColor = (ImageView) mDetails.findViewById(R.id.iv__bookmark_color);
mIvColor.setOnClickListener(this);
mEmail = mPpDetails.findViewById(R.id.ll__place_email);
mEmail = mDetails.findViewById(R.id.ll__place_email);
mEmail.setOnClickListener(this);
mTvEmail = (TextView) mEmail.findViewById(R.id.tv__place_email);
mOperator = mPpDetails.findViewById(R.id.ll__place_operator);
mOperator = mDetails.findViewById(R.id.ll__place_operator);
mOperator.setOnClickListener(this);
mTvOperator = (TextView) mOperator.findViewById(R.id.tv__place_operator);
mCuisine = mPpDetails.findViewById(R.id.ll__place_cuisine);
mCuisine = mDetails.findViewById(R.id.ll__place_cuisine);
mTvCuisine = (TextView) mCuisine.findViewById(R.id.tv__place_cuisine);
mWiki = mPpDetails.findViewById(R.id.ll__place_wiki);
mWiki = mDetails.findViewById(R.id.ll__place_wiki);
mWiki.setOnClickListener(this);
mEntrance = mPpDetails.findViewById(R.id.ll__place_entrance);
mEntrance = mDetails.findViewById(R.id.ll__place_entrance);
mTvEntrance = (TextView) mEntrance.findViewById(R.id.tv__place_entrance);
mEditor = mPpDetails.findViewById(R.id.ll__place_editor);
mTvEditor = (TextView) mEditor.findViewById(R.id.tv__editor);
mEditor = mDetails.findViewById(R.id.ll__place_editor);
mEditor.setOnClickListener(this);
latlon.setOnLongClickListener(this);
address.setOnLongClickListener(this);
@ -219,9 +213,9 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
mEmail.setOnLongClickListener(this);
mOperator.setOnLongClickListener(this);
mWiki.setOnLongClickListener(this);
mPpDetails.findViewById(R.id.ll__report_problem).setOnClickListener(this);
mDetails.findViewById(R.id.ll__report_problem).setOnClickListener(this);
mEtBookmarkName = (EditText) mPpDetails.findViewById(R.id.et__bookmark_name);
mEtBookmarkName = (EditText) mDetails.findViewById(R.id.et__bookmark_name);
mEtBookmarkName.setOnEditorActionListener(new TextView.OnEditorActionListener()
{
@Override
@ -237,15 +231,15 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
}
});
TextView tvNotes = (TextView) mPpDetails.findViewById(R.id.tv__bookmark_notes);
TextView tvNotes = (TextView) mDetails.findViewById(R.id.tv__bookmark_notes);
tvNotes.setOnClickListener(this);
mTvBookmarkGroup = (TextView) mPpDetails.findViewById(R.id.tv__bookmark_group);
mTvBookmarkGroup = (TextView) mDetails.findViewById(R.id.tv__bookmark_group);
mTvBookmarkGroup.setOnClickListener(this);
mWvDescription = (WebView) mPpDetails.findViewById(R.id.wv__description);
mTvDescription = (TextView) mPpDetails.findViewById(R.id.tv__description);
mWvDescription = (WebView) mDetails.findViewById(R.id.wv__description);
mTvDescription = (TextView) mDetails.findViewById(R.id.tv__description);
mTvDescription.setOnClickListener(this);
mBtnEditHtmlDescription = (Button) mPpDetails.findViewById(R.id.btn__edit_html_bookmark);
mBtnEditHtmlDescription = (Button) mDetails.findViewById(R.id.btn__edit_html_bookmark);
mBtnEditHtmlDescription.setOnClickListener(this);
ViewGroup ppButtons = (ViewGroup) findViewById(R.id.pp__buttons);
@ -263,7 +257,7 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
mRouteButtonsFrame.findViewById(R.id.from).setOnClickListener(this);
mRouteButtonsFrame.findViewById(R.id.to).setOnClickListener(this);
mShadowController = new ScrollViewShadowController((ObservableScrollView) mPpDetails)
mShadowController = new ScrollViewShadowController((ObservableScrollView) mDetails)
.addBottomShadow()
.attach();
@ -271,7 +265,7 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
setElevation(UiUtils.dimen(R.dimen.placepage_elevation));
if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE)
mPpDetails.setBackgroundResource(0);
mDetails.setBackgroundResource(0);
}
private void init(AttributeSet attrs, int defStyleAttr)
@ -339,7 +333,7 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
{
InputUtils.hideKeyboard(mEtBookmarkName);
mPpDetails.scrollTo(0, 0);
mDetails.scrollTo(0, 0);
if (mMapObject != null)
mAnimationController.setState(state, mMapObject.getMapObjectType());
@ -414,11 +408,12 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
private void refreshPreview()
{
mTvTitle.setText(mMapObject.getTitle());
UiUtils.setTextAndHideIfEmpty(mTvTitle, mMapObject.getTitle());
if (mToolbar != null)
mToolbar.setTitle(mMapObject.getTitle());
mTvSubtitle.setText(mMapObject.getSubtitle());
UiUtils.setTextAndHideIfEmpty(mTvSubtitle, mMapObject.getSubtitle());
mAvDirection.setVisibility(View.GONE);
UiUtils.setTextAndHideIfEmpty(mTvAddress, mMapObject.getAddress());
}
private void refreshDetails()
@ -435,8 +430,6 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
refreshMetadataOrHide(mMapObject.getMetadata(Metadata.MetadataType.FMD_INTERNET), mWifi, null);
refreshMetadataOrHide(mMapObject.getMetadata(Metadata.MetadataType.FMD_FLATS), mEntrance, mTvEntrance);
refreshOpeningHours();
refreshMetadataStars(mMapObject.getMetadata(Metadata.MetadataType.FMD_STARS));
UiUtils.setTextAndHideIfEmpty(mTvElevation, mMapObject.getMetadata(Metadata.MetadataType.FMD_ELE));
UiUtils.showIf(mMapObject != null && Editor.nativeIsFeatureEditable(), mEditor);
}
@ -596,24 +589,6 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
metaLayout.setVisibility(View.GONE);
}
private void refreshMetadataStars(String stars)
{
if (TextUtils.isEmpty(stars))
{
mRbStars.setVisibility(View.GONE);
return;
}
try
{
mRbStars.setRating(Float.parseFloat(stars));
mRbStars.setVisibility(View.VISIBLE);
} catch (NumberFormatException e)
{
mRbStars.setVisibility(View.GONE);
}
}
public void refreshAzimuth(double northAzimuth)
{
if (getState() == State.HIDDEN ||