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

[android] Added temporary flag for switching from old booking place page to the new booking place page.

Browse source
This commit is contained in:
Roman Romanov 2016-10-03 16:59:05 +04:00
parent 79300a23ee
commit 027c34d870
4 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -59,6 +59,9 @@
<include layout="@layout/place_page_hotel_rating"/>
<!--TODO: remove this after booking_api.cpp will be done-->
<include layout="@layout/place_page_more"/>
<include layout="@layout/divider_horizontal"/>
<include layout="@layout/place_page_editor"/>

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

@ -6,6 +6,7 @@
android:layout_height="@dimen/placepage_hotel_gallery_height"
android:orientation="horizontal"
android:minHeight="@dimen/placepage_hotel_gallery_height"
android:visibility="gone"
tools:background="#20FF0000"
tools:visibility="visible">

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

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!--TODO: remove this layout after booking_api.cpp will be done-->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/ll__more"

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

@ -95,6 +95,9 @@ public class PlacePageView extends RelativeLayout
{
private static final String PREF_USE_DMS = "use_dms";
//TODO: remove this after booking_api.cpp will be done
private static final boolean USE_OLD_BOOKING = true;
private boolean mIsDocked;
private boolean mIsFloating;
@ -151,6 +154,8 @@ public class PlacePageView extends RelativeLayout
private View mHotelReview;
private TextView mHotelRating;
private TextView mHotelRatingBase;
//TODO: remove this after booking_api.cpp will be done
private View mHotelMore;
// Animations
private BaseShadowController mShadowController;
@ -310,6 +315,10 @@ public class PlacePageView extends RelativeLayout
ViewGroup ppButtons = (ViewGroup) findViewById(R.id.pp__buttons);
// TODO: remove this after booking_api.cpp will be done
mHotelMore = findViewById(R.id.ll__more);
mHotelMore.setOnClickListener(this);
initHotelDescriptionView();
initHotelFacilitiesView();
initHotelGalleryView();
@ -750,7 +759,9 @@ public class PlacePageView extends RelativeLayout
Locale locale = Locale.getDefault();
Currency currency = Currency.getInstance(locale);
SponsoredHotel.requestPrice(mSponsoredHotel.getId(), currency.getCurrencyCode());
SponsoredHotel.requestInfo(mSponsoredHotel.getId(), locale.toString());
// TODO: remove this after booking_api.cpp will be done
if (!USE_OLD_BOOKING)
SponsoredHotel.requestInfo(mSponsoredHotel.getId(), locale.toString());
}
String country = MapManager.nativeGetSelectedCountry();
@ -855,10 +866,15 @@ public class PlacePageView extends RelativeLayout
UiUtils.hide(mHotelGallery);
UiUtils.hide(mHotelNearby);
UiUtils.hide(mHotelReview);
// TODO: remove this after booking_api.cpp will be done
UiUtils.hide(mHotelMore);
}
else
{
UiUtils.hide(mWebsite);
// TODO: remove this after booking_api.cpp will be done
if (!USE_OLD_BOOKING)
UiUtils.hide(mHotelMore);
}
refreshMetadataOrHide(mMapObject.getMetadata(Metadata.MetadataType.FMD_PHONE_NUMBER), mPhone, mTvPhone);