diff --git a/android/jni/com/mapswithme/maps/SearchEngine.cpp b/android/jni/com/mapswithme/maps/SearchEngine.cpp index 3c86bbd360..53a8dd2ea5 100644 --- a/android/jni/com/mapswithme/maps/SearchEngine.cpp +++ b/android/jni/com/mapswithme/maps/SearchEngine.cpp @@ -130,6 +130,7 @@ jobject ToJavaResult(Result & result, search::ProductInfo const & productInfo, b dist.get(), cuisine.get(), brand.get(), airportIata.get(), roadShields.get(), static_cast(result.IsOpenNow()), + result.GetMinutesUntilOpen(),result.GetMinutesUntilClosed(), static_cast(popularityHasHigherPriority))); jni::TScopedLocalRef name(env, jni::ToJavaString(env, result.GetString())); @@ -267,13 +268,14 @@ extern "C" /* Description(FeatureId featureId, String featureType, String region, String distance, String cuisine, String brand, String airportIata, String roadShields, - int openNow, boolean hasPopularityHigherPriority) + int openNow, int minutesUntilOpen, int minutesUntilClosed, + boolean hasPopularityHigherPriority) */ g_descriptionConstructor = jni::GetConstructorID(env, g_descriptionClass, "(Lcom/mapswithme/maps/bookmarks/data/FeatureId;" "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;" "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;" - "Ljava/lang/String;IZ)V"); + "Ljava/lang/String;IIIZ)V"); g_popularityClass = jni::GetGlobalClassRef(env, "com/mapswithme/maps/search/Popularity"); g_popularityConstructor = jni::GetConstructorID(env, g_popularityClass, "(I)V"); diff --git a/android/res/layout/item_search_result.xml b/android/res/layout/item_search_result.xml index 005fa3743b..02fee36557 100644 --- a/android/res/layout/item_search_result.xml +++ b/android/res/layout/item_search_result.xml @@ -8,30 +8,12 @@ android:minHeight="@dimen/search_item_height" android:padding="@dimen/margin_base" tools:background="#20FF0000"> - - - + android:id="@+id/costopen" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:layout_alignTop="@id/description"> + + + + + + + + + android:text="@string/closed" + android:textAppearance="@style/MwmTextAppearance.Body3" /> - diff --git a/android/src/com/mapswithme/maps/search/SearchAdapter.java b/android/src/com/mapswithme/maps/search/SearchAdapter.java index 09efc726dd..3938bdacc2 100644 --- a/android/src/com/mapswithme/maps/search/SearchAdapter.java +++ b/android/src/com/mapswithme/maps/search/SearchAdapter.java @@ -1,6 +1,7 @@ package com.mapswithme.maps.search; import android.content.Context; +import android.content.res.Resources; import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.text.SpannableStringBuilder; @@ -32,8 +33,6 @@ class SearchAdapter extends RecyclerView.Adapter