Refactored

rejasupotaro · May 24, 2015 · 72681b0 · 72681b0
1 parent 19bd09e
commit 72681b0
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 16 deletions.
diff --git a/app/src/main/java/rejasupotaro/mds/activities/MainActivity.java b/app/src/main/java/rejasupotaro/mds/activities/MainActivity.java
@@ -16,24 +16,31 @@
 import butterknife.ButterKnife;
 import butterknife.InjectView;
 import rejasupotaro.mds.R;
-import rejasupotaro.mds.data.services.ChannelService;
 import rejasupotaro.mds.data.models.Channel;
+import rejasupotaro.mds.data.services.ChannelService;
+import rejasupotaro.mds.data.services.SuggestionService;
 import rejasupotaro.mds.view.adapters.RecipeListAdapter;
+import rejasupotaro.mds.view.components.SearchView;
 import rx.Subscription;
 import rx.android.app.AppObservable;
+import rx.functions.Action1;
 import rx.subscriptions.Subscriptions;
 
 public class MainActivity extends BaseActivity {
 
     @InjectView(R.id.drawer_layout)
     DrawerLayout drawerLayout;
+    @InjectView(R.id.search_view)
+    SearchView searchView;
     @InjectView(R.id.toolbar)
     Toolbar toolbar;
     @InjectView(R.id.channel_recipe_list)
     StaggeredGridView recipeListView;
 
     private RecipeListAdapter recipeListAdapter;
     private Subscription channelsSubscription = Subscriptions.empty();
+    private Subscription querySubscription = Subscriptions.empty();
+    private Subscription suggestionsSubscription = Subscriptions.empty();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -47,6 +54,8 @@ protected void onCreate(Bundle savedInstanceState) {
     @Override
     protected void onDestroy() {
         channelsSubscription.unsubscribe();
+        querySubscription.unsubscribe();
+        suggestionsSubscription.unsubscribe();
         super.onDestroy();
     }
 
@@ -87,6 +96,15 @@ private void setupActionBar() {
     private void setupViews() {
         channelsSubscription = AppObservable.bindActivity(this, new ChannelService().getList())
                 .subscribe(this::setupViews);
+
+        querySubscription = AppObservable.bindActivity(this, searchView.observe())
+                .subscribe(this::updateSuggestions);
+    }
+
+    private void updateSuggestions(String query) {
+        suggestionsSubscription.unsubscribe();
+        suggestionsSubscription = AppObservable.bindActivity(this, new SuggestionService().get(query))
+                .subscribe(searchView::updateSuggestions);
     }
 
     private void setupViews(List<Channel> channels) {

diff --git a/app/src/main/java/rejasupotaro/mds/data/services/SuggestionService.java b/app/src/main/java/rejasupotaro/mds/data/services/SuggestionService.java
@@ -6,6 +6,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import rx.Observable;
+
 public class SuggestionService {
     private static final List<String> DUMMY = new ArrayList<String>() {{
         add("apple");
@@ -23,15 +25,16 @@ public class SuggestionService {
         add("bbq sauce");
     }};
 
-    public List<String> get(String query) {
-        List<String> suggestions = new ArrayList<>();
+    public Observable<List<String>> get(String query) {
         if (TextUtils.isEmpty(query)) {
-            return suggestions;
+            return Observable.just(new ArrayList<>());
         }
+
+        List<String> suggestions = new ArrayList<>();
         int count = new SecureRandom().nextInt(DUMMY.size() - 1) + 1;
         for (int i = 0; i < count; i++) {
             suggestions.add(DUMMY.get(new SecureRandom().nextInt(DUMMY.size())));
         }
-        return suggestions;
+        return Observable.just(suggestions);
     }
 }
diff --git a/app/src/main/java/rejasupotaro/mds/view/adapters/SuggestionListAdapter.java b/app/src/main/java/rejasupotaro/mds/view/adapters/SuggestionListAdapter.java
@@ -6,15 +6,14 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import java.util.List;
+
 import butterknife.ButterKnife;
 import butterknife.InjectView;
 import rejasupotaro.mds.R;
-import rejasupotaro.mds.data.services.SuggestionService;
 
 public class SuggestionListAdapter extends BindableAdapter<String> {
 
-    private SuggestionService suggestionService = new SuggestionService();
-
     static class ViewHolder {
         @InjectView(R.id.suggestion_text)
         TextView suggestionText;
@@ -28,9 +27,9 @@ public SuggestionListAdapter(Context context) {
         super(context);
     }
 
-    public void append(String query) {
+    public void update(List<String> suggestions) {
         clear();
-        addAll(suggestionService.get(query));
+        addAll(suggestions);
         notifyDataSetChanged();
     }
 
@@ -47,5 +46,4 @@ public void bindView(String item, int position, View view) {
         ViewHolder holder = (ViewHolder) view.getTag();
         holder.suggestionText.setText(item);
     }
-
 }
diff --git a/app/src/main/java/rejasupotaro/mds/view/components/SearchView.java b/app/src/main/java/rejasupotaro/mds/view/components/SearchView.java
@@ -9,6 +9,7 @@
 import android.widget.FrameLayout;
 import android.widget.ListView;
 
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import butterknife.ButterKnife;
@@ -61,13 +62,10 @@ private void setup() {
 
         suggestionListAdapter = new SuggestionListAdapter(getContext());
         suggestionListView.setAdapter(suggestionListAdapter);
-
-        ViewObservable.bindView(this, observe())
-                .subscribe(this::updateSuggestions);
     }
 
-    private void updateSuggestions(String query) {
-        suggestionListAdapter.append(query);
+    public void updateSuggestions(List<String> suggestions) {
+        suggestionListAdapter.update(suggestions);
     }
 
     @Override