Skip to content

Add autocomplete #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add autocomplete #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d60918d
Add autocomplete
Franzaine Jan 31, 2015
560c03b
Updates the proto message class to contain autocomplete information f…
ovelius Feb 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,17 @@

<activity
android:name="se.poochoo.MainActivity"
android:label="@string/app_name" >
android:label="@string/app_name"
android:launchMode="singleTop">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>
<meta-data android:name="android.app.searchable"
android:resource="@xml/search_departures"/>
</activity>

<activity
Expand Down Expand Up @@ -54,6 +60,12 @@

<meta-data android:name="com.google.android.backup.api_key"
android:value="AEdPqrEAAAAIUnqlkoA7QCx0qneMxPuCabBj2wYhFfGFRgq1Tg" />

<meta-data android:name="android.app.default_searchable"
android:value=".MainActivity" />

<provider android:name=".search.CustomSuggestionProvider"
android:authorities="se.poochoo.search.CustomSuggestionProvider" />
</application>

</manifest>
107 changes: 37 additions & 70 deletions src/main/java/se/poochoo/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,23 @@
package se.poochoo;

import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
import android.animation.ObjectAnimator;
import android.app.Activity;
import android.app.SearchManager;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.preference.PreferenceManager;
import android.util.Log;
import android.provider.SearchRecentSuggestions;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.ScaleAnimation;
import android.view.inputmethod.EditorInfo;
import android.widget.ListView;
import android.widget.SearchView;
import android.widget.TextView;
import android.widget.Toast;

import se.poochoo.cardsui.views.CardUI;
Expand All @@ -36,6 +29,7 @@
import se.poochoo.proto.Messages;
import se.poochoo.proto.Messages.DataSelector;
import se.poochoo.proto.Messages.SmartRequest;
import se.poochoo.search.CustomSuggestionProvider;

public class MainActivity extends Activity implements CardHelper.RequestProvider, LocationHelper.LocationCallBack {
private final int SEARCH_QUERY_TYPE_DELAY = 700; // Milliseconds to wait before searching.
Expand Down Expand Up @@ -70,13 +64,32 @@ public void onCreate(Bundle savedInstanceState) {
//pull-down-to-refresh listener and action
mListView = (QuickReturnListView) findViewById(R.id.listView);
pullDownToRefreshFunction();

//Search
handleIntent(getIntent());
}

@Override
protected void onNewIntent(Intent intent) {
handleIntent(intent);
super.onNewIntent(intent);
}

private void handleIntent(Intent intent){
if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
String query = intent.getStringExtra(SearchManager.QUERY);
currentSearchQuery = query;
cardHelper.loadDataFromServer();
SearchRecentSuggestions suggestions = new SearchRecentSuggestions(this,
CustomSuggestionProvider.AUTHORITY, CustomSuggestionProvider.MODE);
suggestions.saveRecentQuery(query, null);
}
}

@Override
public void onStart() {
super.onStart();
locationHelper.connect();

}

@Override
Expand Down Expand Up @@ -122,68 +135,25 @@ public void run() {
}
});
}

@Override
public boolean onCreateOptionsMenu(Menu menu) {
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.main, menu);

final MenuItem refreshItem = menu.findItem(R.id.action_refresh);
final MenuItem betaItem = menu.findItem(R.id.action_beta);

MenuItem searchViewItem = menu.findItem(R.id.action_search);
SearchView searchView = (SearchView) searchViewItem.getActionView();
searchView.setQueryHint("Station name?");
searchView.setIconifiedByDefault(true);

final SearchView.OnQueryTextListener queryTextListener = new SearchView.OnQueryTextListener() {
SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
SearchView searchView = (SearchView) menu.findItem(R.id.action_search).getActionView();
searchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
searchView.setQueryRefinementEnabled(true);
searchView.setQueryHint(getString(R.string.LABEL_SEARCH_STATION));
searchView.setImeOptions(EditorInfo.IME_ACTION_SEARCH | EditorInfo.IME_FLAG_NO_EXTRACT_UI);
searchView.setOnCloseListener(new SearchView.OnCloseListener() {
@Override
public boolean onQueryTextChange(String newText) {
if (currentSearchQuery != null && newText.length() < currentSearchQuery.length()) {
// User is removing characters.
cardHelper.clearCards();
} else if (newText.length() >= SEARCH_MIN_QUERY_LENGTH) {
// User is typing new characters, schedule search with some delay.
nextAllowedSearch = System.currentTimeMillis() + SEARCH_QUERY_TYPE_DELAY;
lastPerformedSearch = null;
preformSearchLater();
} else if (newText.length() < SEARCH_MIN_QUERY_LENGTH){
// User needs to type more characters to continue.
cardHelper.clearCards();
}
currentSearchQuery = newText;
return true;
}

@Override
public boolean onQueryTextSubmit(String query) {
if (query.length() >= SEARCH_MIN_QUERY_LENGTH) {
currentSearchQuery = query;
cardHelper.loadDataFromServer();
} else {
cardHelper.clearCards();
currentSearchQuery = null;
}
return true;
}
};
searchView.setOnQueryTextListener(queryTextListener);

searchView.setOnQueryTextFocusChangeListener(new View.OnFocusChangeListener() {
@Override
public void onFocusChange(View view, boolean queryTextFocused) {
if(!queryTextFocused) {
//The searchview was closed, act accordingly
//update so that the list isn't empty
cardHelper.clearCards();
cardHelper.loadDataFromServer();
} else {
//The searchview was opened, act accordingly
}
public boolean onClose() {
currentSearchQuery = "";
cardHelper.loadDataFromServer();
return false;
}
});

return super.onCreateOptionsMenu(menu);
return true;
}

@Override
Expand All @@ -196,16 +166,13 @@ public boolean onOptionsItemSelected(MenuItem item) {
cardHelper.clearCards();
cardHelper.loadDataFromServer();
break;
case R.id.action_search:
break;
case R.id.action_settings:
startActivity(new Intent(this, SettingsActivity.class));
break;
case R.id.action_about:
Intent aboutintent = new Intent(this, AboutActivity.class);
startActivity(aboutintent);
break;

case R.id.action_help:
try{
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(youtubeVideo));
Expand Down
Loading