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

[android] Highlight search result's strings.

Browse source
This commit is contained in:
Denis Koronchik 2014-06-25 13:31:53 +03:00 • committed by Alex Zolotarev
parent 318cfd6634
commit 01672155fa
2 changed files with 60 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
android/jni/com/mapswithme/maps/SearchActivity.cpp
View file

@ -239,6 +239,17 @@ Java_com_mapswithme_maps_SearchActivity_nativeGetResult(
search::Result const * res = SearchAdapter::Instance().GetResult(position, queryID);
if (res == 0) return 0;
jintArray ranges = env->NewIntArray(res->GetHighlightRangesCount() * 2);
jint * narr = env->GetIntArrayElements(ranges, NULL);
for (int i = 0, j = 0; i < res->GetHighlightRangesCount(); ++i)
{
pair<uint16_t, uint16_t> const & range = res->GetHighlightRange(i);
narr[j++] = range.first;
narr[j++] = range.second;
}
env->ReleaseIntArrayElements(ranges, narr, 0);
jclass klass = env->FindClass("com/mapswithme/maps/SearchActivity$SearchAdapter$SearchResult");
ASSERT ( klass, () );
@ -246,7 +257,7 @@ Java_com_mapswithme_maps_SearchActivity_nativeGetResult(
{
jmethodID methodID = env->GetMethodID(
klass, "<init>",
"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;D)V");
"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;D[I)V");
ASSERT ( methodID, () );
string distance;
@ -267,16 +278,18 @@ Java_com_mapswithme_maps_SearchActivity_nativeGetResult(
jni::ToJavaString(env, res->GetFeatureType()),
jni::ToJavaString(env, res->GetRegionFlag()),
jni::ToJavaString(env, distance.c_str()),
static_cast<jdouble>(azimut));
static_cast<jdouble>(azimut),
static_cast<jintArray>(ranges));
}
else
{
jmethodID methodID = env->GetMethodID(klass, "<init>", "(Ljava/lang/String;Ljava/lang/String;)V");
jmethodID methodID = env->GetMethodID(klass, "<init>", "(Ljava/lang/String;Ljava/lang/String;[I)V");
ASSERT ( methodID, () );
return env->NewObject(klass, methodID,
jni::ToJavaString(env, res->GetString()),
jni::ToJavaString(env, res->GetSuggestionString()));
jni::ToJavaString(env, res->GetSuggestionString()),
static_cast<jintArray>(ranges));
}
}

46
android/src/com/mapswithme/maps/SearchActivity.java
View file

@ -9,6 +9,9 @@ import android.content.res.Resources;
import android.location.Location;
import android.os.Bundle;
import android.text.Editable;
import android.text.Html;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.TextWatcher;
import android.util.Log;
import android.view.KeyEvent;
@ -38,6 +41,9 @@ import com.mapswithme.util.UiUtils;
import com.mapswithme.util.Utils;
import com.mapswithme.util.statistics.Statistics;
import java.util.ArrayList;
import java.util.List;
public class SearchActivity extends MapsWithMeBaseListActivity implements LocationService.Listener
{
@ -217,20 +223,25 @@ public class SearchActivity extends MapsWithMeBaseListActivity implements Locati
/// 0 - suggestion result
/// 1 - feature result
public int m_type;
public int[] m_highlightRanges;
// Called from native code
@SuppressWarnings("unused")
public SearchResult(String name, String suggestion)
public SearchResult(String name, String suggestion, int[] highlightRanges)
{
m_name = name;
m_suggestion = suggestion;
m_type = 0;
m_highlightRanges = highlightRanges;
}
// Called from native code
@SuppressWarnings("unused")
public SearchResult(String name, String country, String amenity,
String flag, String distance, double azimut)
String flag, String distance, double azimut,
int[] highlightRanges)
{
m_name = name;
m_country = country;
@ -238,7 +249,10 @@ public class SearchActivity extends MapsWithMeBaseListActivity implements Locati
m_distance = distance;
m_type = 1;
m_highlightRanges = highlightRanges;
}
}
private String getCategoryName(String strID)
@ -317,7 +331,33 @@ public class SearchActivity extends MapsWithMeBaseListActivity implements Locati
final SearchResult r = m_context.getResult(position, m_resultID);
if (r != null)
{
UiUtils.setTextAndShow(holder.m_name, r.m_name);
Spanned s = null;
if (r.m_highlightRanges.length > 0)
{
StringBuilder builder = new StringBuilder();
int pos = 0, j = 0, n = r.m_highlightRanges.length / 2;
for (int i = 0; i < n; ++i)
{
int start = r.m_highlightRanges[j++];
int len = r.m_highlightRanges[j++];
builder.append(r.m_name.substring(pos, start));
builder.append("<font color=\"green\">");
builder.append(r.m_name.substring(start, start + len));
builder.append("</font>");
pos = start + len;
}
builder.append(r.m_name.substring(pos));
s = Html.fromHtml(builder.toString());
}
else
s = Html.fromHtml(r.m_name);
UiUtils.setTextAndShow(holder.m_name, s);
String type = null;
String dist = null;