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

[android] Review fixes

Browse source
This commit is contained in:
Roman Romanov 2016-12-28 13:57:47 +04:00
parent 04eac1d610
commit c3bc3d4dee
52 changed files with 710 additions and 279 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
android/jni/com/mapswithme/maps/SearchEngine.cpp
View file

@ -272,7 +272,8 @@ jobject ToJavaResult(Result & result, bool hasPosition, double lat, double lon)
static_cast<jint>(result.IsOpenNow())));
jni::TScopedLocalRef name(env, jni::ToJavaString(env, result.GetString()));
jobject ret = env->NewObject(g_resultClass, g_resultConstructor, name.get(), desc.get(), ll.lat, ll.lon, ranges.get());
jobject ret = env->NewObject(g_resultClass, g_resultConstructor, name.get(), desc.get(), ll.lat,
ll.lon, ranges.get(), result.IsHotel());
ASSERT(ret, ());
return ret;
@ -307,7 +308,8 @@ void OnResults(Results const & results, long long timestamp, bool isMapAndTable,
{
jni::TScopedLocalObjectArrayRef jResults(env, BuildJavaResults(results, hasPosition, lat, lon));
env->CallVoidMethod(g_javaListener, g_updateResultsId, jResults.get(),
static_cast<jlong>(timestamp));
static_cast<jlong>(timestamp),
search::HotelsClassifier::IsHotelResults(results));
}
if (results.IsEndMarker())
@ -354,10 +356,13 @@ extern "C"
Java_com_mapswithme_maps_search_SearchEngine_nativeInit(JNIEnv * env, jobject thiz)
{
g_javaListener = env->NewGlobalRef(thiz);
g_updateResultsId = jni::GetMethodID(env, g_javaListener, "onResultsUpdate", "([Lcom/mapswithme/maps/search/SearchResult;J)V");
g_updateResultsId = jni::GetMethodID(env, g_javaListener, "onResultsUpdate",
"([Lcom/mapswithme/maps/search/SearchResult;JZ)V");
g_endResultsId = jni::GetMethodID(env, g_javaListener, "onResultsEnd", "(J)V");
g_resultClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/search/SearchResult");
g_resultConstructor = jni::GetConstructorID(env, g_resultClass, "(Ljava/lang/String;Lcom/mapswithme/maps/search/SearchResult$Description;DD[I)V");
g_resultConstructor = jni::GetConstructorID(
env, g_resultClass,
"(Ljava/lang/String;Lcom/mapswithme/maps/search/SearchResult$Description;DD[IZ)V");
g_suggestConstructor = jni::GetConstructorID(env, g_resultClass, "(Ljava/lang/String;Ljava/lang/String;DD[I)V");
g_descriptionClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/search/SearchResult$Description");
g_descriptionConstructor = jni::GetConstructorID(env, g_descriptionClass, "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;II)V");

19
android/res/layout/fragment_search.xml
View file

@ -73,18 +73,17 @@
layout="@layout/recycler_default"
app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
<include layout="@layout/placeholder"/>
<com.mapswithme.maps.widget.PlaceholderView
android:id="@+id/placeholder"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="@dimen/margin_double_and_half"
android:paddingRight="@dimen/margin_double_and_half"
android:paddingTop="@dimen/placeholder_margin_top"
android:visibility="gone"
tools:visibility="visible"/>
</FrameLayout>
<com.mapswithme.maps.widget.PlaceholderView
android:id="@+id/placeholder"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="@dimen/margin_double_and_half"
android:paddingRight="@dimen/margin_double_and_half"
android:paddingTop="@dimen/placeholder_margin_top"
android:visibility="gone"
tools:visibility="visible"/>
<!-- Country download suggest fragment -->
<FrameLayout
android:id="@+id/download_suggest_frame"

4
android/res/layout/hotels_filter.xml
View file

@ -41,6 +41,8 @@
android:layout_centerVertical="true"
android:layout_toRightOf="@id/cancel"
android:layout_toEndOf="@id/cancel"
android:layout_toStartOf="@id/done"
android:layout_toLeftOf="@id/done"
android:textAppearance="@style/MwmTextAppearance.Toolbar.Title"
android:fontFamily="@string/robotoMedium"
android:textColor="?android:textColorPrimary"
@ -113,4 +115,4 @@
</LinearLayout>
</ScrollView>
</RelativeLayout>
</merge>
</merge>

20
android/res/layout/price_filter.xml
View file

@ -6,20 +6,20 @@
android:layout_height="wrap_content"
tools:parentTag="LinearLayout">
<FrameLayout
android:id="@+id/one"
android:id="@+id/low"
android:layout_width="match_parent"
android:layout_height="72dp"
android:background="?clickableBackground"
android:layout_weight="1"
tools:background="?colorAccent">
<TextView
android:id="@+id/one_title"
android:id="@+id/low_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/MwmTextAppearance.Button"
android:textColor="?android:textColorPrimary"
android:layout_gravity="center"
android:text="@string/booking_filter_price_one"
android:text="@string/booking_filter_price_low"
android:fontFamily="@string/robotoMedium"
tools:textColor="?accentButtonTextColor"
tools:targetApi="jelly_bean"/>
@ -30,19 +30,19 @@
android:background="?dividerHorizontal"/>
</FrameLayout>
<FrameLayout
android:id="@+id/two"
android:id="@+id/medium"
android:layout_width="match_parent"
android:layout_height="72dp"
android:background="?clickableBackground"
android:layout_weight="1">
<TextView
android:id="@+id/two_title"
android:id="@+id/medium_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/MwmTextAppearance.Button"
android:textColor="?android:textColorPrimary"
android:layout_gravity="center"
android:text="@string/booking_filter_price_two"
android:text="@string/booking_filter_price_medium"
android:fontFamily="@string/robotoMedium"
tools:targetApi="jelly_bean"/>
<View
@ -52,20 +52,20 @@
android:background="?dividerHorizontal"/>
</FrameLayout>
<FrameLayout
android:id="@+id/three"
android:id="@+id/high"
android:layout_width="match_parent"
android:layout_height="72dp"
android:background="?clickableBackground"
android:layout_weight="1">
<TextView
android:id="@+id/three_title"
android:id="@+id/high_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/MwmTextAppearance.Button"
android:textColor="?android:textColorPrimary"
android:layout_gravity="center"
android:text="@string/booking_filter_price_three"
android:text="@string/booking_filter_price_high"
android:fontFamily="@string/robotoMedium"
tools:targetApi="jelly_bean"/>
</FrameLayout>
</merge>
</merge>

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

@ -132,4 +132,4 @@
android:gravity="center"/>
</LinearLayout>
</FrameLayout>
</merge>
</merge>

6
android/res/layout/search_filter_panel.xml
View file

@ -33,8 +33,10 @@
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:background="?clickableBackground"
android:visibility="gone"
tools:background="?accentButtonBackground"
tools:elevation="@dimen/margin_quarter">
tools:elevation="@dimen/margin_quarter"
tools:visibility="visible">
<ImageView
android:id="@+id/filter_icon"
android:layout_width="@dimen/margin_base_plus"
@ -71,4 +73,4 @@
android:layout_marginLeft="@dimen/neg_margin_half"
android:layout_marginRight="@dimen/neg_margin_half"
android:layout_marginBottom="@dimen/neg_margin_half"/>
</RelativeLayout>
</RelativeLayout>

11
android/res/values-w320dp/strings.xml Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Android Strings File -->
<!-- Generated by Twine 0.6.0 -->
<!-- Language: w320dp -->
<resources>
<!-- SECTION: Strings -->
<!-- SECTION: Routing dialogs strings -->
<!-- SECTION: Strings for downloading map from search -->
</resources>

11
android/res/values-w360dp/strings.xml Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Android Strings File -->
<!-- Generated by Twine 0.6.0 -->
<!-- Language: w360dp -->
<resources>
<!-- SECTION: Strings -->
<!-- SECTION: Routing dialogs strings -->
<!-- SECTION: Strings for downloading map from search -->
</resources>

7
android/res/values/donottranslate.xml
View file

@ -63,11 +63,4 @@
<!-- Tags -->
<string name="tag_menu_collapse" translatable="false">collapse</string>
<string name="tag_height_limited" translatable="false">height limited</string>
<string name="booking_filter_rating_num_good" translatable="false">7.0+</string>
<string name="booking_filter_rating_num_very_good" translatable="false">8.0+</string>
<string name="booking_filter_rating_num_excellent" translatable="false">9.0+</string>
<string name="booking_filter_price_one" translatable="false">$</string>
<string name="booking_filter_price_two" translatable="false">$$</string>
<string name="booking_filter_price_three" translatable="false">$$$</string>
</resources>

6
android/res/values/strings.xml
View file

@ -1065,4 +1065,10 @@
<string name="whatsnew_font_size_text">Labels on the map can be made bigger.</string>
<!-- "Translation is no needed, because it's a company name" -->
<string name="uber">Uber</string>
<string name="booking_filter_rating_num_good">7.0+</string>
<string name="booking_filter_rating_num_very_good">8.0+</string>
<string name="booking_filter_rating_num_excellent">9.0+</string>
<string name="booking_filter_price_low">$</string>
<string name="booking_filter_price_medium">$$</string>
<string name="booking_filter_price_high">$$$</string>
</resources>

100
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -63,10 +63,12 @@ import com.mapswithme.maps.routing.RoutingPlanInplaceController;
import com.mapswithme.maps.search.FloatingSearchToolbarController;
import com.mapswithme.maps.search.HotelsFilter;
import com.mapswithme.maps.search.HotelsFilterView;
import com.mapswithme.maps.search.NativeSearchListener;
import com.mapswithme.maps.search.SearchActivity;
import com.mapswithme.maps.search.SearchEngine;
import com.mapswithme.maps.search.SearchFilterPanelController;
import com.mapswithme.maps.search.SearchFilterController;
import com.mapswithme.maps.search.SearchFragment;
import com.mapswithme.maps.search.SearchResult;
import com.mapswithme.maps.settings.SettingsActivity;
import com.mapswithme.maps.settings.StoragePathManager;
import com.mapswithme.maps.settings.UnitLocale;
@ -98,8 +100,6 @@ import com.mapswithme.util.statistics.Statistics;
import java.io.Serializable;
import java.util.Stack;
import static com.mapswithme.maps.search.SearchActivity.EXTRA_HOTELS_FILTER;
public class MwmActivity extends BaseMwmFragmentActivity
implements MapObjectListener,
View.OnTouchListener,
@ -113,7 +113,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
LocationHelper.UiCallback,
RoutingPlanController.OnToggleListener,
RoutingPlanController.SearchPoiTransitionListener,
FloatingSearchToolbarController.VisibilityListener
FloatingSearchToolbarController.VisibilityListener,
NativeSearchListener
{
public static final String EXTRA_TASK = "map_task";
private static final String EXTRA_CONSUMED = "mwm.extra.intent.processed";
@ -159,9 +160,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
private ViewGroup mRootView;
@Nullable
private SearchFilterPanelController mFilterPanel;
@Nullable
private HotelsFilterView mHotelsFilter;
private SearchFilterController mFilterController;
private boolean mIsFragmentContainer;
private boolean mIsFullscreen;
@ -352,12 +351,14 @@ public class MwmActivity extends BaseMwmFragmentActivity
final Bundle args = new Bundle();
args.putString(SearchActivity.EXTRA_QUERY, query);
if (mFilterPanel != null)
args.putParcelable(EXTRA_HOTELS_FILTER, mFilterPanel.getFilter());
if (mFilterController != null)
args.putParcelable(SearchActivity.EXTRA_HOTELS_FILTER, mFilterController.getFilter());
replaceFragment(SearchFragment.class, args, null);
}
else
SearchActivity.start(this, query, mFilterPanel != null ? mFilterPanel.getFilter() : null);
{
SearchActivity.start(this, query, mFilterController != null ? mFilterController.getFilter() : null);
}
}
public void showEditor()
@ -446,6 +447,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
processIntent(getIntent());
SharingHelper.prepare();
SearchEngine.INSTANCE.addListener(this);
//TODO: uncomment after correct visible rect calculation.
//mVisibleRectMeasurer = new VisibleRectMeasurer(new VisibleRectListener() {
// @Override
@ -477,36 +480,17 @@ public class MwmActivity extends BaseMwmFragmentActivity
initMainMenu();
initOnmapDownloader();
initPositionChooser();
initFilterPanel();
initFilterViews();
}
private void initFilterPanel()
private void initFilterViews()
{
mHotelsFilter = (HotelsFilterView) findViewById(R.id.hotels_filter);
if (mHotelsFilter != null)
{
mHotelsFilter.setListener(new HotelsFilterView.HotelsFilterListener()
{
@Override
public void onCancel()
{
}
@Override
public void onDone(@Nullable HotelsFilter filter)
{
if (mFilterPanel != null)
mFilterPanel.setFilter(filter);
runSearch();
}
});
}
HotelsFilterView hotelsFilterView = (HotelsFilterView) findViewById(R.id.hotels_filter);
View frame = findViewById(R.id.filter_frame);
if (frame != null)
if (frame != null && hotelsFilterView != null)
{
mFilterPanel = new SearchFilterPanelController(
frame, new SearchFilterPanelController.FilterPanelListener()
mFilterController = new SearchFilterController(
frame, hotelsFilterView, new SearchFilterController.DefaultFilterListener()
{
@Override
public void onViewClick()
@ -515,22 +499,14 @@ public class MwmActivity extends BaseMwmFragmentActivity
}
@Override
public void onFilterClick()
public void onFilterClear()
{
if (mFilterPanel == null)
return;
if (mHotelsFilter != null)
mHotelsFilter.open(mFilterPanel.getFilter());
runSearch();
}
@Override
public void onFilterClear()
public void onFilterDone()
{
if (mFilterPanel == null)
return;
mFilterPanel.setFilter(null);
runSearch();
}
}, R.string.search_in_table);
@ -541,7 +517,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
{
SearchEngine.searchInteractive(mSearchController.getQuery(), System.nanoTime(),
false /* isMapAndTable */,
mFilterPanel != null ? mFilterPanel.getFilter() : null);
mFilterController != null ? mFilterController.getFilter() : null);
SearchEngine.showAllResults(mSearchController.getQuery());
}
@ -839,6 +815,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
// TODO move listeners attach-deattach to onStart-onStop since onDestroy isn't guaranteed.
Framework.nativeRemoveMapObjectListener();
BottomSheetHelper.free();
SearchEngine.INSTANCE.removeListener(this);
super.onDestroy();
}
@ -905,11 +882,11 @@ public class MwmActivity extends BaseMwmFragmentActivity
else if (intent.hasExtra(EXTRA_UPDATE_COUNTRIES))
showDownloader(true);
HotelsFilter filter = intent.getParcelableExtra(EXTRA_HOTELS_FILTER);
if (mFilterPanel != null)
HotelsFilter filter = intent.getParcelableExtra(SearchActivity.EXTRA_HOTELS_FILTER);
if (mFilterController != null)
{
mFilterPanel.show(filter != null || !TextUtils.isEmpty(SearchEngine.getQuery()), true);
mFilterPanel.setFilter(filter);
mFilterController.show(filter != null || !TextUtils.isEmpty(SearchEngine.getQuery()), true);
mFilterController.setFilter(filter);
}
}
@ -1047,7 +1024,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
@Override
public void onBackPressed()
{
if (mHotelsFilter != null && mHotelsFilter.close())
if (mFilterController != null && mFilterController.onBackPressed())
return;
if (getCurrentMenu().close(true))
@ -1620,11 +1597,20 @@ public class MwmActivity extends BaseMwmFragmentActivity
int toolbarHeight = mSearchController.getToolbar().getHeight();
adjustCompassAndTraffic(visible ? toolbarHeight : UiUtils.getStatusBarHeight(this));
setNavButtonsTopLimit(visible ? toolbarHeight : 0);
if (mFilterPanel != null)
{
mFilterPanel.show(visible && !TextUtils.isEmpty(SearchEngine.getQuery()), true);
mFilterPanel.updateFilterButtonVisibility(SearchEngine.getQuery());
}
if (mFilterController != null)
mFilterController.show(visible && !TextUtils.isEmpty(SearchEngine.getQuery()), true);
}
@Override
public void onResultsUpdate(SearchResult[] results, long timestamp, boolean isHotel)
{
if (mFilterController != null)
mFilterController.updateFilterButtonVisibility(isHotel);
}
@Override
public void onResultsEnd(long timestamp)
{
}
@Override

9
android/src/com/mapswithme/maps/search/HotelsFilterHolder.java Normal file
View file

@ -0,0 +1,9 @@
package com.mapswithme.maps.search;
import android.support.annotation.Nullable;
interface HotelsFilterHolder
{
@Nullable
HotelsFilter getHotelsFilter();
}

22
android/src/com/mapswithme/maps/search/HotelsFilterView.java
View file

@ -144,6 +144,18 @@ public class HotelsFilterView extends FrameLayout
Animations.appearSliding(mFrame, Animations.BOTTOM, null);
}
/**
* Update views state according with current {@link #mFilter}
*
* mFilter may be null or {@link HotelsFilter.RatingFilter} or {@link HotelsFilter.PriceRateFilter}
* or {@link HotelsFilter.And} or {@link HotelsFilter.Or}.
*
* if mFilter is {@link HotelsFilter.And} then mLhs must be {@link HotelsFilter.RatingFilter} and
* mRhs must be {@link HotelsFilter.PriceRateFilter} or {@link HotelsFilter.Or} with mLhs and mRhs -
* {@link HotelsFilter.PriceRateFilter}
*
* if mFilter is {@link HotelsFilter.Or} then mLhs and mRhs must be {@link HotelsFilter.PriceRateFilter}
*/
private void updateViews()
{
if (mFilter == null)
@ -166,11 +178,11 @@ public class HotelsFilterView extends FrameLayout
else if (mFilter instanceof HotelsFilter.And)
{
HotelsFilter.And and = (HotelsFilter.And) mFilter;
if (and.mLhs instanceof HotelsFilter.RatingFilter)
{
rating = (HotelsFilter.RatingFilter) and.mLhs;
price = ((HotelsFilter.And) mFilter).mRhs;
}
if (!(and.mLhs instanceof HotelsFilter.RatingFilter))
throw new AssertionError("And.mLhs must be RatingFilter");
rating = (HotelsFilter.RatingFilter) and.mLhs;
price = and.mRhs;
}
else if (mFilter instanceof HotelsFilter.Or)
{

2
android/src/com/mapswithme/maps/search/NativeSearchListener.java
View file

@ -10,7 +10,7 @@ public interface NativeSearchListener
* @param results Search results.
* @param timestamp Timestamp of search request.
*/
void onResultsUpdate(SearchResult[] results, long timestamp);
void onResultsUpdate(SearchResult[] results, long timestamp, boolean isHotel);
/**
* @param timestamp Timestamp of search request.

139
android/src/com/mapswithme/maps/search/PriceFilterView.java
View file

@ -5,6 +5,8 @@ import android.content.Context;
import android.os.Build;
import android.support.annotation.ColorRes;
import android.support.annotation.DrawableRes;
import android.support.annotation.IdRes;
import android.support.annotation.IntDef;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
@ -18,6 +20,8 @@ import android.widget.TextView;
import com.mapswithme.maps.R;
import com.mapswithme.util.UiUtils;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
import java.util.List;
@ -25,9 +29,15 @@ import static com.mapswithme.maps.search.HotelsFilter.Op.OP_EQ;
public class PriceFilterView extends LinearLayout implements View.OnClickListener
{
private static final int ONE = 1;
private static final int TWO = 2;
private static final int THREE = 3;
private static final int LOW = 1;
private static final int MEDIUM = 2;
private static final int HIGH = 3;
@Retention(RetentionPolicy.SOURCE)
@IntDef({ LOW, MEDIUM, HIGH })
public @interface PriceDef
{
}
private static class Item
{
@ -70,7 +80,7 @@ public class PriceFilterView extends LinearLayout implements View.OnClickListene
private HotelsFilter mFilter;
@NonNull
private SparseArray<Item> mItems = new SparseArray<>();
private final SparseArray<Item> mItems = new SparseArray<>();
public PriceFilterView(Context context)
{
@ -98,15 +108,15 @@ public class PriceFilterView extends LinearLayout implements View.OnClickListene
@Override
protected void onFinishInflate()
{
View one = findViewById(R.id.one);
one.setOnClickListener(this);
mItems.append(R.id.one, new Item(one, (TextView) findViewById(R.id.one_title)));
View two = findViewById(R.id.two);
two.setOnClickListener(this);
mItems.append(R.id.two, new Item(two, (TextView) findViewById(R.id.two_title)));
View three = findViewById(R.id.three);
three.setOnClickListener(this);
mItems.append(R.id.three, new Item(three, (TextView) findViewById(R.id.three_title)));
View low = findViewById(R.id.low);
low.setOnClickListener(this);
mItems.append(R.id.low, new Item(low, (TextView) findViewById(R.id.low_title)));
View medium = findViewById(R.id.medium);
medium.setOnClickListener(this);
mItems.append(R.id.medium, new Item(medium, (TextView) findViewById(R.id.medium_title)));
View high = findViewById(R.id.high);
high.setOnClickListener(this);
mItems.append(R.id.high, new Item(high, (TextView) findViewById(R.id.high_title)));
}
public void update(@Nullable HotelsFilter filter)
@ -118,45 +128,25 @@ public class PriceFilterView extends LinearLayout implements View.OnClickListene
return;
}
if (mFilter instanceof HotelsFilter.PriceRateFilter)
updateRecursive(mFilter);
}
private void updateRecursive(@NonNull HotelsFilter filter)
{
if (filter instanceof HotelsFilter.PriceRateFilter)
{
HotelsFilter.PriceRateFilter price = (HotelsFilter.PriceRateFilter) mFilter;
HotelsFilter.PriceRateFilter price = (HotelsFilter.PriceRateFilter) filter;
selectByValue(price.mValue);
return;
}
if (!(mFilter instanceof HotelsFilter.Or))
return;
HotelsFilter.Or or = (HotelsFilter.Or) mFilter;
if (or.mLhs instanceof HotelsFilter.PriceRateFilter)
else if (filter instanceof HotelsFilter.Or)
{
HotelsFilter.PriceRateFilter price = (HotelsFilter.PriceRateFilter) or.mLhs;
selectByValue(price.mValue);
HotelsFilter.Or or = (HotelsFilter.Or) filter;
updateRecursive(or.mLhs);
updateRecursive(or.mRhs);
}
else
{
return;
}
if (or.mRhs instanceof HotelsFilter.PriceRateFilter)
{
HotelsFilter.PriceRateFilter price = (HotelsFilter.PriceRateFilter) or.mRhs;
selectByValue(price.mValue);
}
else if (or.mRhs instanceof HotelsFilter.Or)
{
or = (HotelsFilter.Or) or.mRhs;
if (or.mLhs instanceof HotelsFilter.PriceRateFilter)
{
HotelsFilter.PriceRateFilter price = (HotelsFilter.PriceRateFilter) or.mLhs;
selectByValue(price.mValue);
}
if (or.mRhs instanceof HotelsFilter.PriceRateFilter)
{
HotelsFilter.PriceRateFilter price = (HotelsFilter.PriceRateFilter) or.mRhs;
selectByValue(price.mValue);
}
throw new AssertionError("Wrong hotels filter type");
}
}
@ -169,23 +159,23 @@ public class PriceFilterView extends LinearLayout implements View.OnClickListene
}
}
private void selectByValue(int value)
private void selectByValue(@PriceDef int value)
{
switch (value)
{
case ONE:
select(R.id.one, true);
case LOW:
select(R.id.low, true);
break;
case TWO:
select(R.id.two, true);
case MEDIUM:
select(R.id.medium, true);
break;
case THREE:
select(R.id.three, true);
case HIGH:
select(R.id.high, true);
break;
}
}
private void select(int id, boolean force)
private void select(@IdRes int id, boolean force)
{
for (int i = 0; i < mItems.size(); ++i)
{
@ -193,10 +183,7 @@ public class PriceFilterView extends LinearLayout implements View.OnClickListene
Item item = mItems.valueAt(i);
if (key == id)
{
if (!force)
item.select(!item.mSelected);
else
item.select(true);
item.select(force || !item.mSelected);
return;
}
}
@ -218,40 +205,34 @@ public class PriceFilterView extends LinearLayout implements View.OnClickListene
Item item = mItems.valueAt(i);
if (item.mSelected)
{
int value = ONE;
@PriceDef
int value = LOW;
switch (key)
{
case R.id.one:
value = ONE;
case R.id.low:
value = LOW;
break;
case R.id.two:
value = TWO;
case R.id.medium:
value = MEDIUM;
break;
case R.id.three:
value = THREE;
case R.id.high:
value = HIGH;
break;
}
filters.add(new HotelsFilter.PriceRateFilter(OP_EQ, value));
}
}
if (filters.isEmpty())
if (filters.size() > 3)
throw new AssertionError("Wrong filters count");
mFilter = null;
for (HotelsFilter filter : filters)
{
mFilter = null;
return;
if (mFilter == null)
mFilter = filter;
else
mFilter = new HotelsFilter.Or(mFilter, filter);
}
if (filters.size() == 1)
{
mFilter = filters.get(0);
return;
}
if (filters.size() > 2)
mFilter =
new HotelsFilter.Or(filters.get(0), new HotelsFilter.Or(filters.get(1), filters.get(2)));
else
mFilter = new HotelsFilter.Or(filters.get(0), filters.get(1));
}
@Nullable

2
android/src/com/mapswithme/maps/search/RatingFilterView.java
View file

@ -69,7 +69,7 @@ public class RatingFilterView extends LinearLayout implements View.OnClickListen
private HotelsFilter.RatingFilter mFilter;
@NonNull
private SparseArray<Item> mItems = new SparseArray<>();
private final SparseArray<Item> mItems = new SparseArray<>();
public RatingFilterView(Context context)
{

20
android/src/com/mapswithme/maps/search/SearchActivity.java
View file

@ -1,7 +1,6 @@
package com.mapswithme.maps.search;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@ -61,17 +60,18 @@ public class SearchActivity extends BaseMwmFragmentActivity implements CustomNav
final FragmentManager manager = getSupportFragmentManager();
if (manager.getBackStackEntryCount() == 0)
{
SearchFragment fragment =
(SearchFragment) manager.findFragmentByTag(SearchFragment.class.getName());
if (fragment != null)
for (Fragment fragment : manager.getFragments())
{
HotelsFilter filter = fragment.getHotelsFilter();
if (filter != null)
if (fragment instanceof HotelsFilterHolder)
{
Intent intent = NavUtils.getParentActivityIntent(this);
intent.putExtra(EXTRA_HOTELS_FILTER, filter);
NavUtils.navigateUpTo(this, intent);
return;
HotelsFilter filter = ((HotelsFilterHolder) fragment).getHotelsFilter();
if (filter != null)
{
Intent intent = NavUtils.getParentActivityIntent(this);
intent.putExtra(EXTRA_HOTELS_FILTER, filter);
NavUtils.navigateUpTo(this, intent);
return;
}
}
}
NavUtils.navigateUpFromSameTask(this);

5
android/src/com/mapswithme/maps/search/SearchEngine.java
View file

@ -19,7 +19,8 @@ public enum SearchEngine implements NativeSearchListener,
private static String sSavedQuery;
@Override
public void onResultsUpdate(final SearchResult[] results, final long timestamp)
public void onResultsUpdate(final SearchResult[] results, final long timestamp,
final boolean isHotel)
{
UiThread.run(new Runnable()
{
@ -27,7 +28,7 @@ public enum SearchEngine implements NativeSearchListener,
public void run()
{
for (NativeSearchListener listener : mListeners)
listener.onResultsUpdate(results, timestamp);
listener.onResultsUpdate(results, timestamp, isHotel);
mListeners.finishIterate();
}
});

113
android/src/com/mapswithme/maps/search/SearchFilterPanelController.java → android/src/com/mapswithme/maps/search/SearchFilterController.java
View file

@ -6,7 +6,6 @@ import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.StringRes;
import android.support.v4.content.ContextCompat;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
@ -14,7 +13,7 @@ import android.widget.TextView;
import com.mapswithme.maps.R;
import com.mapswithme.util.UiUtils;
public class SearchFilterPanelController
public class SearchFilterController
{
@NonNull
private final View mFrame;
@ -28,46 +27,51 @@ public class SearchFilterPanelController
private final TextView mFilterText;
@NonNull
private final View mDivider;
@NonNull
private final HotelsFilterView mFilterView;
@Nullable
private HotelsFilter mFilter;
private final float mElevation;
@NonNull
private final String mCategory;
private View.OnClickListener mClearListener = new View.OnClickListener()
@NonNull
private final View.OnClickListener mClearListener = new View.OnClickListener()
{
@Override
public void onClick(View v)
{
if (mFilterPanelListener != null)
mFilterPanelListener.onFilterClear();
setFilter(null);
if (mFilterListener != null)
mFilterListener.onFilterClear();
}
};
public interface FilterPanelListener
@Nullable
private final FilterListener mFilterListener;
interface FilterListener
{
void onViewClick();
void onFilterClick();
void onFilterClear();
void onFilterCancel();
void onFilterDone();
}
@Nullable
private final FilterPanelListener mFilterPanelListener;
public SearchFilterPanelController(@NonNull View frame,
@Nullable FilterPanelListener listener)
SearchFilterController(@NonNull View frame, @NonNull HotelsFilterView filter,
@Nullable FilterListener listener)
{
this(frame, listener, R.string.search_show_on_map);
this(frame, filter, listener, R.string.search_show_on_map);
}
public SearchFilterPanelController(@NonNull View frame,
@Nullable FilterPanelListener listener,
@StringRes int populateButtonText)
public SearchFilterController(@NonNull View frame, @NonNull HotelsFilterView filter,
@Nullable FilterListener listener,
@StringRes int populateButtonText)
{
mFrame = frame;
mFilterPanelListener = listener;
mFilterView = filter;
mFilterListener = listener;
mShowOnMap = (TextView) mFrame.findViewById(R.id.show_on_map);
mShowOnMap.setText(populateButtonText);
mFilterButton = mFrame.findViewById(R.id.filter_button);
@ -77,7 +81,6 @@ public class SearchFilterPanelController
Resources res = mFrame.getResources();
mElevation = res.getDimension(R.dimen.margin_quarter);
mCategory = res.getString(R.string.hotel).toLowerCase();
initListeners();
}
@ -88,23 +91,19 @@ public class SearchFilterPanelController
showPopulateButton(showPopulateButton);
}
public void showPopulateButton(boolean show)
void showPopulateButton(boolean show)
{
UiUtils.showIf(show, mShowOnMap);
}
public void showDivider(boolean show)
void showDivider(boolean show)
{
UiUtils.showIf(show, mDivider);
}
public boolean updateFilterButtonVisibility(@Nullable String category)
public void updateFilterButtonVisibility(boolean isHotel)
{
boolean show = !TextUtils.isEmpty(category)
&& category.trim().toLowerCase().equals(mCategory);
UiUtils.showIf(show, mFilterButton);
return show;
UiUtils.showIf(isHotel, mFilterButton);
}
private void initListeners()
@ -114,8 +113,8 @@ public class SearchFilterPanelController
@Override
public void onClick(View v)
{
if (mFilterPanelListener != null)
mFilterPanelListener.onViewClick();
if (mFilterListener != null)
mFilterListener.onViewClick();
}
});
mFilterButton.setOnClickListener(new View.OnClickListener()
@ -123,8 +122,27 @@ public class SearchFilterPanelController
@Override
public void onClick(View v)
{
if (mFilterPanelListener != null)
mFilterPanelListener.onFilterClick();
mFilterView.open(getFilter());
if (mFilterListener != null)
mFilterListener.onFilterClick();
}
});
mFilterView.setListener(new HotelsFilterView.HotelsFilterListener()
{
@Override
public void onCancel()
{
if (mFilterListener != null)
mFilterListener.onFilterCancel();
}
@Override
public void onDone(@Nullable HotelsFilter filter)
{
setFilter(filter);
if (mFilterListener != null)
mFilterListener.onFilterDone();
}
});
}
@ -163,4 +181,37 @@ public class SearchFilterPanelController
UiUtils.getStyledResourceId(mFrame.getContext(), R.attr.colorAccent)));
}
}
public boolean onBackPressed()
{
return mFilterView.close();
}
public static class DefaultFilterListener implements FilterListener
{
@Override
public void onViewClick()
{
}
@Override
public void onFilterClick()
{
}
@Override
public void onFilterClear()
{
}
@Override
public void onFilterCancel()
{
}
@Override
public void onFilterDone()
{
}
}
}

105
android/src/com/mapswithme/maps/search/SearchFragment.java
View file

@ -45,7 +45,8 @@ public class SearchFragment extends BaseMwmFragment
implements OnBackPressListener,
NativeSearchListener,
SearchToolbarController.Container,
CategoriesAdapter.OnCategorySelectedListener
CategoriesAdapter.OnCategorySelectedListener,
HotelsFilterHolder
{
private static final float NESTED_SCROLL_DELTA =
-MwmApplication.get().getResources().getDimension(R.dimen.margin_half);
@ -131,16 +132,26 @@ public class SearchFragment extends BaseMwmFragment
if (!onBackPressed())
super.onUpClick();
}
@Override
public void clear()
{
super.clear();
if (mFilterController != null)
{
mFilterController.setFilter(null);
mFilterController.updateFilterButtonVisibility(false);
}
}
}
private View mTabFrame;
private View mResultsFrame;
private PlaceholderView mResultsPlaceholder;
private RecyclerView mResults;
private HotelsFilterView mFilterView;
private AppBarLayout mAppBarLayout;
@Nullable
private SearchFilterPanelController mFilterPanel;
private SearchFilterController mFilterController;
private SearchToolbarController mToolbarController;
@ -160,7 +171,8 @@ public class SearchFragment extends BaseMwmFragment
private final LastPosition mLastPosition = new LastPosition();
private boolean mSearchRunning;
private String mInitialQuery;
private @Nullable HotelsFilter mInitialHotelsFilter;
@Nullable
private HotelsFilter mInitialHotelsFilter;
private boolean mFromRoutePlan;
private final LocationListener mLocationListener = new LocationListener.Simple()
@ -180,10 +192,10 @@ public class SearchFragment extends BaseMwmFragment
@Override
public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset)
{
if (mFilterPanel == null)
if (mFilterController == null)
return;
mFilterPanel.showDivider(
mFilterController.showDivider(
!(Math.abs(verticalOffset) == appBarLayout.getTotalScrollRange()));
}
};
@ -193,13 +205,14 @@ public class SearchFragment extends BaseMwmFragment
return (MapManager.nativeGetDownloadedCount() == 0 && !MapManager.nativeIsDownloading());
}
@Override
@Nullable
public HotelsFilter getHotelsFilter()
{
if (mFilterPanel == null)
if (mFilterController == null)
return null;
return mFilterPanel.getFilter();
return mFilterController.getFilter();
}
private void showDownloadSuggest()
@ -231,8 +244,9 @@ public class SearchFragment extends BaseMwmFragment
{
final boolean hasQuery = mToolbarController.hasQuery();
UiUtils.showIf(hasQuery, mResultsFrame);
if (mFilterPanel != null)
mFilterPanel.show(hasQuery, mSearchAdapter.showPopulateButton());
if (mFilterController != null)
mFilterController.show(hasQuery && mSearchAdapter.getItemCount() != 0,
mSearchAdapter.showPopulateButton());
if (hasQuery)
hideDownloadSuggest();
@ -249,8 +263,8 @@ public class SearchFragment extends BaseMwmFragment
mToolbarController.hasQuery());
UiUtils.showIf(show, mResultsPlaceholder);
if (mFilterPanel != null)
mFilterPanel.showPopulateButton(mSearchAdapter.showPopulateButton());
if (mFilterController != null)
mFilterController.showPopulateButton(mSearchAdapter.showPopulateButton());
}
@Override
@ -276,32 +290,15 @@ public class SearchFragment extends BaseMwmFragment
final TabAdapter tabAdapter = new TabAdapter(getChildFragmentManager(), pager, tabLayout);
mResultsFrame = root.findViewById(R.id.results_frame);
RecyclerView results = (RecyclerView) mResultsFrame.findViewById(R.id.recycler);
setRecyclerScrollListener(results);
mResults = (RecyclerView) mResultsFrame.findViewById(R.id.recycler);
setRecyclerScrollListener(mResults);
mResultsPlaceholder = (PlaceholderView) mResultsFrame.findViewById(R.id.placeholder);
mResultsPlaceholder.setContent(R.drawable.img_search_nothing_found_light,
R.string.search_not_found, R.string.search_not_found_query);
mFilterView = (HotelsFilterView) view.findViewById(R.id.filter);
mFilterView.setListener(new HotelsFilterView.HotelsFilterListener()
{
@Override
public void onCancel()
{
}
@Override
public void onDone(@Nullable HotelsFilter filter)
{
if (mFilterPanel != null)
mFilterPanel.setFilter(filter);
runSearch();
}
});
mFilterPanel = new SearchFilterPanelController(root.findViewById(R.id.filter_frame),
new SearchFilterPanelController.FilterPanelListener()
mFilterController = new SearchFilterController(root.findViewById(R.id.filter_frame),
(HotelsFilterView) view.findViewById(R.id.filter),
new SearchFilterController.DefaultFilterListener()
{
@Override
public void onViewClick()
@ -310,24 +307,20 @@ public class SearchFragment extends BaseMwmFragment
}
@Override
public void onFilterClick()
public void onFilterClear()
{
mFilterView.open(mFilterPanel == null ? null : mFilterPanel.getFilter());
runSearch();
}
@Override
public void onFilterClear()
public void onFilterDone()
{
if (mFilterPanel == null)
return;
mFilterPanel.setFilter(null);
runSearch();
}
});
if (mInitialHotelsFilter != null)
mFilterPanel.setFilter(mInitialHotelsFilter);
mFilterPanel.updateFilterButtonVisibility(null);
mFilterController.setFilter(mInitialHotelsFilter);
mFilterController.updateFilterButtonVisibility(false);
if (mSearchAdapter == null)
{
@ -351,7 +344,6 @@ public class SearchFragment extends BaseMwmFragment
if (mInitialQuery != null)
{
setQuery(mInitialQuery);
updateFilterButton(mInitialQuery);
}
mToolbarController.activate();
@ -484,8 +476,8 @@ public class SearchFragment extends BaseMwmFragment
mLastQueryTimestamp = System.nanoTime();
HotelsFilter hotelsFilter = null;
if (mFilterPanel != null)
hotelsFilter = mFilterPanel.getFilter();
if (mFilterController != null)
hotelsFilter = mFilterController.getFilter();
SearchEngine.searchInteractive(
query, mLastQueryTimestamp, false /* isMapAndTable */, hotelsFilter);
@ -512,10 +504,9 @@ public class SearchFragment extends BaseMwmFragment
private void runSearch()
{
updateFilterButton(getQuery());
HotelsFilter hotelsFilter = null;
if (mFilterPanel != null)
hotelsFilter = mFilterPanel.getFilter();
if (mFilterController != null)
hotelsFilter = mFilterController.getFilter();
mLastQueryTimestamp = System.nanoTime();
// TODO @yunitsky Implement more elegant solution.
@ -540,7 +531,7 @@ public class SearchFragment extends BaseMwmFragment
}
@Override
public void onResultsUpdate(SearchResult[] results, long timestamp)
public void onResultsUpdate(SearchResult[] results, long timestamp, boolean isHotel)
{
if (!isAdded() || !mToolbarController.hasQuery())
return;
@ -550,6 +541,7 @@ public class SearchFragment extends BaseMwmFragment
updateFrames();
mSearchAdapter.refreshData(results);
mToolbarController.showProgress(true);
updateFilterButton(isHotel);
}
@Override
@ -563,16 +555,15 @@ public class SearchFragment extends BaseMwmFragment
public void onCategorySelected(String category)
{
mToolbarController.setQuery(category);
updateFilterButton(category);
}
private void updateFilterButton(@Nullable String category)
private void updateFilterButton(boolean isHotel)
{
if (mFilterPanel != null)
if (mFilterController != null)
{
boolean show = mFilterPanel.updateFilterButtonVisibility(category);
if (!show)
mFilterPanel.setFilter(null);
mFilterController.updateFilterButtonVisibility(isHotel);
if (!isHotel)
mFilterController.setFilter(null);
}
}
@ -586,7 +577,7 @@ public class SearchFragment extends BaseMwmFragment
@Override
public boolean onBackPressed()
{
if (mFilterView.close())
if (mFilterController != null && mFilterController.onBackPressed())
return true;
if (mToolbarController.hasQuery())
{

6
android/src/com/mapswithme/maps/search/SearchResult.java
View file

@ -50,21 +50,25 @@ public class SearchResult
// Consecutive pairs of indexes (each pair contains : start index, length), specifying highlighted matches of original query in result
public final int[] highlightRanges;
public final boolean isHotel;
public SearchResult(String name, String suggestion, double lat, double lon, int[] highlightRanges)
{
this.name = name;
this.suggestion = suggestion;
this.lat = lat;
this.lon = lon;
this.isHotel = false;
description = null;
type = TYPE_SUGGEST;
this.highlightRanges = highlightRanges;
}
public SearchResult(String name, Description description, double lat, double lon, int[] highlightRanges)
public SearchResult(String name, Description description, double lat, double lon, int[] highlightRanges, boolean isHotel)
{
this.name = name;
this.isHotel = isHotel;
suggestion = null;
this.lat = lat;
this.lon = lon;

12
iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

12
iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
View file

@ -1794,3 +1794,15 @@
/* "Translation is no needed, because it's a company name" */
"uber" = "Uber";
"booking_filter_rating_num_good" = "7.0+";
"booking_filter_rating_num_very_good" = "8.0+";
"booking_filter_rating_num_excellent" = "9.0+";
"booking_filter_price_low" = "$";
"booking_filter_price_medium" = "$$";
"booking_filter_price_high" = "$$$";

1
search/result.hpp
View file

@ -65,6 +65,7 @@ public:
string const & GetCuisine() const { return m_metadata.m_cuisine; }
string const & GetHotelRating() const { return m_metadata.m_hotelRating; }
string const & GetHotelApproximatePricing() const { return m_metadata.m_hotelApproximatePricing; }
bool IsHotel() const { return m_metadata.m_isHotel; }
//@}
osm::YesNoUnknown IsOpenNow() const { return m_metadata.m_isOpenNow; }

18
strings.txt
View file

@ -22509,3 +22509,21 @@
[uber]
comment = "Translation is no needed, because it's a company name"
en = Uber
[booking_filter_rating_num_good]
en = 7.0+
[booking_filter_rating_num_very_good]
en = 8.0+
[booking_filter_rating_num_excellent]
en = 9.0+
[booking_filter_price_low]
en = $
[booking_filter_price_medium]
en = $$
[booking_filter_price_high]
en = $$$