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

[android] Temporarily disabled Booking reviews activity

Browse source 
[android] Fixed booking items order in PP
This commit is contained in:
alexzatsepin 2017-03-01 20:27:08 +03:00
parent b472fb45c7
commit 97b108f2eb
8 changed files with 34 additions and 51 deletions

9
android/AndroidManifest.xml
View file

@ -310,15 +310,6 @@
android:value="com.mapswithme.maps.MwmActivity"/>
</activity>
<activity
android:name="com.mapswithme.maps.review.ReviewActivity"
android:parentActivityName="com.mapswithme.maps.MwmActivity">
<!-- The meta-data element is needed for versions lower than 4.1 -->
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.mapswithme.maps.MwmActivity"/>
</activity>
<!-- facebook -->
<activity
android:name="com.facebook.FacebookActivity"

15
android/res/layout-land/place_page_details.xml
View file

@ -37,9 +37,15 @@
<include layout="@layout/place_page_hotel_gallery"/>
<include layout="@layout/place_page_hotel_description"/>
<include layout="@layout/place_page_more"/>
<include layout="@layout/place_page_hotel_facilities"/>
<include layout="@layout/place_page_hotel_description"/>
<include layout="@layout/place_page_hotel_nearby"/>
<include layout="@layout/place_page_hotel_rating"/>
<include layout="@layout/place_page_placename"/>
@ -67,13 +73,6 @@
<include layout="@layout/place_page_taxi"/>
<include layout="@layout/place_page_hotel_nearby"/>
<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"/>

18
android/res/layout-w600dp-port/place_page_details.xml
View file

@ -47,11 +47,18 @@
android:layout_toLeftOf="@id/anchor_center"
android:layout_toStartOf="@id/anchor_center"
android:orientation="vertical">
<include layout="@layout/place_page_hotel_gallery"/>
<include layout="@layout/place_page_hotel_description"/>
<include layout="@layout/place_page_more"/>
<include layout="@layout/place_page_hotel_facilities"/>
<include layout="@layout/place_page_hotel_description"/>
<include layout="@layout/place_page_hotel_nearby"/>
<include layout="@layout/place_page_hotel_rating"/>
<include layout="@layout/place_page_placename"/>
@ -92,13 +99,6 @@
<include layout="@layout/place_page_taxi"/>
<include layout="@layout/place_page_hotel_nearby"/>
<include layout="@layout/place_page_hotel_rating"/>
<!--TODO: remove this after booking_api.cpp will be done-->
<include layout="@layout/place_page_more"/>
</LinearLayout>
</RelativeLayout>
@ -108,4 +108,4 @@
<include layout="@layout/shadow_top"/>
<include layout="@layout/shadow_bottom"/>
</FrameLayout>
</FrameLayout>

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

@ -23,9 +23,15 @@
<include layout="@layout/place_page_hotel_gallery"/>
<include layout="@layout/place_page_hotel_description"/>
<include layout="@layout/place_page_more"/>
<include layout="@layout/place_page_hotel_facilities"/>
<include layout="@layout/place_page_hotel_description"/>
<include layout="@layout/place_page_hotel_nearby"/>
<include layout="@layout/place_page_hotel_rating"/>
<include layout="@layout/place_page_placename"/>
@ -53,13 +59,6 @@
<include layout="@layout/place_page_taxi"/>
<include layout="@layout/place_page_hotel_nearby"/>
<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"/>

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

@ -15,7 +15,7 @@
android:layout_marginRight="@dimen/margin_base"
android:layout_marginTop="@dimen/margin_base"
style="@style/PlacePageTitleText"
android:text="@string/details"/>
android:text="@string/placepage_place_description"/>
<com.mapswithme.maps.widget.LineCountTextView
android:id="@+id/tv__place_hotel_details"

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

@ -54,4 +54,6 @@
android:background="?clickableBackground"
android:gravity="center"
android:text="@string/placepage_more_reviews_button"/>
<include
layout="@layout/divider_horizontal"/>
</LinearLayout>

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

@ -7,13 +7,13 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<include
layout="@layout/divider_horizontal"/>
<TextView
style="@style/PlacePageMetadataText.Button"
android:height="@dimen/height_block_base"
android:background="?clickableBackground"
android:gravity="center"
android:text="@string/details"/>
</LinearLayout>
<include
layout="@layout/divider_horizontal"/>
</LinearLayout>

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

@ -37,6 +37,7 @@ import android.widget.LinearLayout;
import android.widget.PopupMenu;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import com.mapswithme.maps.Framework;
import com.mapswithme.maps.MwmActivity;
@ -59,7 +60,6 @@ import com.mapswithme.maps.gallery.FullScreenGalleryActivity;
import com.mapswithme.maps.gallery.GalleryActivity;
import com.mapswithme.maps.gallery.Image;
import com.mapswithme.maps.location.LocationHelper;
import com.mapswithme.maps.review.ReviewActivity;
import com.mapswithme.maps.routing.RoutingController;
import com.mapswithme.maps.widget.ArrowView;
import com.mapswithme.maps.widget.BaseShadowController;
@ -103,9 +103,6 @@ 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 = false;
private boolean mIsDocked;
private boolean mIsFloating;
@ -925,9 +922,7 @@ public class PlacePageView extends RelativeLayout
Currency currency = Currency.getInstance(locale);
if (mSponsored.getType() == Sponsored.TYPE_BOOKING && mSponsored.getId() != null)
Sponsored.requestPrice(mSponsored.getId(), currency.getCurrencyCode(), policy);
// TODO: remove this after booking_api.cpp will be done
if (!USE_OLD_BOOKING)
Sponsored.requestInfo(mSponsored, locale.toString(), policy);
Sponsored.requestInfo(mSponsored, locale.toString(), policy);
}
String country = MapManager.nativeGetSelectedCountry();
@ -1081,8 +1076,7 @@ public class PlacePageView extends RelativeLayout
else
{
UiUtils.hide(mWebsite);
// TODO: remove this after booking_api.cpp will be done
UiUtils.showIf(USE_OLD_BOOKING, mHotelMore);
UiUtils.show(mHotelMore);
if (mSponsored.getType() != Sponsored.TYPE_BOOKING)
UiUtils.hide(mHotelMore);
@ -1423,9 +1417,7 @@ public class PlacePageView extends RelativeLayout
mFacilitiesAdapter.setShowAll(true);
break;
case R.id.tv__place_hotel_reviews_more:
ReviewActivity.start(getContext(), mReviewAdapter.getItems(), mMapObject.getTitle(),
mSponsored.mRating, mReviewAdapter.getItems()
.size(), mSponsored.mUrl);
Toast.makeText(getContext(), "Not implemented yet!", Toast.LENGTH_SHORT).show();
break;
case R.id.tv__place_page_order_taxi:
RoutingController.get().prepare(LocationHelper.INSTANCE.getMyPosition(), mMapObject,