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

[android] Add progress to SearchActivity.

Browse source
This commit is contained in:
vng 2012-07-09 15:02:13 -07:00 • committed by Alex Zolotarev
parent 6347a62935
commit d5340b7982
2 changed files with 42 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
android/res/layout/search_list_view.xml
View file

@ -6,10 +6,25 @@
android:paddingLeft="8dp"
android:paddingRight="8dp">
<EditText android:id="@+id/search_string"
android:inputType="text"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<RelativeLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText android:id="@+id/search_string"
android:inputType="text"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<ProgressBar android:id="@+id/search_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_alignParentRight="true"
style="@android:style/Widget.ProgressBar.Small"
android:layout_marginRight="8dp" />
</RelativeLayout>
<LinearLayout android:id="@+id/search_toolbar"
android:orientation="horizontal"

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

@ -2,6 +2,7 @@ package com.mapswithme.maps;
import java.util.Locale;
import android.annotation.SuppressLint;
import android.app.ListActivity;
import android.content.Context;
import android.os.Bundle;
@ -15,6 +16,7 @@ import android.widget.BaseAdapter;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.ProgressBar;
import android.widget.TextView;
import com.mapswithme.maps.location.LocationService;
@ -225,6 +227,7 @@ public class SearchActivity extends ListActivity implements LocationService.List
}
private LocationService m_location;
private ProgressBar m_progress;
@Override
protected void onCreate(Bundle savedInstanceState)
@ -237,6 +240,8 @@ public class SearchActivity extends ListActivity implements LocationService.List
setContentView(R.layout.search_list_view);
m_progress = (ProgressBar) findViewById(R.id.search_progress);
EditText v = getSearchBox();
v.addTextChangedListener(new TextWatcher()
{
@ -353,20 +358,29 @@ public class SearchActivity extends ListActivity implements LocationService.List
}
private int m_queryID = 0;
/// Make 5-step increment to leave space for middle queries.
/// This constant should be equal with native SearchAdapter::QUERY_STEP;
private final static int QUERY_STEP = 5;
private boolean isCurrentResult(int id)
{
return (id >= m_queryID && id < m_queryID + QUERY_STEP);
}
public void updateData(final int count, final int resultID)
{
runOnUiThread(new Runnable()
{
@SuppressLint("ParserError")
@Override
public void run()
{
Log.d(TAG, "Show " + count + " results for id = " + resultID);
// if this results for the last query - hide progress
if (isCurrentResult(resultID))
m_progress.setVisibility(View.GONE);
// update list view content
getSA().updateData(count, resultID);
@ -405,15 +419,21 @@ public class SearchActivity extends ListActivity implements LocationService.List
final String s = getSearchString();
m_queryID += QUERY_STEP;
if (nativeRunSearch(s, lang, m_lat, m_lon, m_mode, m_queryID))
final int id = m_queryID + QUERY_STEP;
if (nativeRunSearch(s, lang, m_lat, m_lon, m_mode, id))
{
// store current query
m_queryID = id;
// mark that it's not the first query already
if (m_mode % 2 == 0) ++m_mode;
// set toolbar visible only for empty search string
LinearLayout bar = getSearchToolbar();
bar.setVisibility(s.length() == 0 ? View.VISIBLE : View.GONE);
// show search progress
m_progress.setVisibility(View.VISIBLE);
}
}