From 4aa9ec8b02aa14f70090abbc4486c05a6efe7a8c Mon Sep 17 00:00:00 2001
From: Manas Chaudhari <chaudhari.manas@gmail.com>
Date: Mon, 5 Sep 2016 11:45:13 +0530
Subject: [PATCH 1/6] Setup mvvm library

---
 app/build.gradle                              |  4 ++
 app/src/main/AndroidManifest.xml              |  9 +--
 .../githubrxjava/GithubApplication.java       | 21 +++++++
 app/src/main/res/layout/activity_main.xml     | 59 +++++++++++--------
 4 files changed, 64 insertions(+), 29 deletions(-)
 create mode 100644 app/src/main/java/com/chrisarriola/githubrxjava/GithubApplication.java

diff --git a/app/build.gradle b/app/build.gradle
index d257451..80a4d2f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,6 +17,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    dataBinding {
+        enabled = true
+    }
 }
 
 dependencies {
@@ -33,4 +36,5 @@ dependencies {
     compile 'com.squareup.retrofit2:retrofit:2.0.2'
     compile 'io.reactivex:rxandroid:1.2.0'
     compile 'io.reactivex:rxjava:1.1.5'
+    compile 'com.manaschaudhari:android-mvvm:0.1.1'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 72ef30a..3ade24b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.chrisarriola.githubrxjava">
+    package="com.chrisarriola.githubrxjava">
 
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
+        android:name=".GithubApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -12,9 +13,9 @@
         android:theme="@style/AppTheme">
         <activity android:name=".MainActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
diff --git a/app/src/main/java/com/chrisarriola/githubrxjava/GithubApplication.java b/app/src/main/java/com/chrisarriola/githubrxjava/GithubApplication.java
new file mode 100644
index 0000000..e1f4554
--- /dev/null
+++ b/app/src/main/java/com/chrisarriola/githubrxjava/GithubApplication.java
@@ -0,0 +1,21 @@
+package com.chrisarriola.githubrxjava;
+
+import android.app.Application;
+import android.databinding.ViewDataBinding;
+
+import com.manaschaudhari.android_mvvm.ViewModel;
+import com.manaschaudhari.android_mvvm.adapters.ViewModelBinder;
+import com.manaschaudhari.android_mvvm.utils.BindingUtils;
+
+public class GithubApplication extends Application {
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        BindingUtils.setDefaultBinder(new ViewModelBinder() {
+            @Override
+            public void bind(ViewDataBinding viewDataBinding, ViewModel viewModel) {
+                viewDataBinding.setVariable(com.chrisarriola.githubrxjava.BR.vm, viewModel);
+            }
+        });
+    }
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d49371b..554c452 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,34 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <ListView
-        android:id="@+id/list_view_repos"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"/>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+        <variable
+            name="vm"
+            type="Integer" />
+    </data>
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-        <EditText
-            android:id="@+id/edit_text_username"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:hint="@string/username"/>
+        <ListView
+            android:id="@+id/list_view_repos"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
 
-        <Button
-            android:id="@+id/button_search"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/search"/>
+            android:orientation="horizontal">
 
-    </LinearLayout>
+            <EditText
+                android:id="@+id/edit_text_username"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:hint="@string/username" />
+
+            <Button
+                android:id="@+id/button_search"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/search" />
 
-</LinearLayout>
+        </LinearLayout>
+
+    </LinearLayout>
+</layout>

From b43e486a9219c94e6a6eda9b00e124a8fbf482dd Mon Sep 17 00:00:00 2001
From: Manas Chaudhari <chaudhari.manas@gmail.com>
Date: Mon, 5 Sep 2016 11:59:48 +0530
Subject: [PATCH 2/6] Implement viewmodels: MainViewModel and GithubRepoVM

---
 .../githubrxjava/GithubRepoVM.java            | 18 +++++++
 .../githubrxjava/MainViewModel.java           | 47 +++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 app/src/main/java/com/chrisarriola/githubrxjava/GithubRepoVM.java
 create mode 100644 app/src/main/java/com/chrisarriola/githubrxjava/MainViewModel.java

diff --git a/app/src/main/java/com/chrisarriola/githubrxjava/GithubRepoVM.java b/app/src/main/java/com/chrisarriola/githubrxjava/GithubRepoVM.java
new file mode 100644
index 0000000..f5dd96a
--- /dev/null
+++ b/app/src/main/java/com/chrisarriola/githubrxjava/GithubRepoVM.java
@@ -0,0 +1,18 @@
+package com.chrisarriola.githubrxjava;
+
+import com.manaschaudhari.android_mvvm.ViewModel;
+
+public class GithubRepoVM implements ViewModel {
+    public final String name;
+    public final String description;
+    public final String language;
+    public final String stars;
+
+    public GithubRepoVM(GitHubRepo repo) {
+        name = repo.name;
+        description = repo.description;
+        language = "Language: " + repo.language;
+        stars = "Stars: " + repo.stargazersCount;
+    }
+
+}
diff --git a/app/src/main/java/com/chrisarriola/githubrxjava/MainViewModel.java b/app/src/main/java/com/chrisarriola/githubrxjava/MainViewModel.java
new file mode 100644
index 0000000..9db710f
--- /dev/null
+++ b/app/src/main/java/com/chrisarriola/githubrxjava/MainViewModel.java
@@ -0,0 +1,47 @@
+package com.chrisarriola.githubrxjava;
+
+import android.databinding.ObservableField;
+
+import com.manaschaudhari.android_mvvm.ViewModel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import rx.Observable;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.functions.Func1;
+import rx.schedulers.Schedulers;
+import rx.subjects.PublishSubject;
+
+import static com.manaschaudhari.android_mvvm.FieldUtils.toObservable;
+
+public class MainViewModel implements ViewModel {
+    public final Observable<List<ViewModel>> repositories;
+    public final ObservableField<String> username = new ObservableField<>();
+    public final PublishSubject<Void> onSearchClick = PublishSubject.create();
+
+    public MainViewModel() {
+        repositories =
+                toObservable(this.username)
+                .sample(onSearchClick)
+                .flatMap(new Func1<String, Observable<List<ViewModel>>>() {
+            @Override
+            public Observable<List<ViewModel>> call(String username) {
+                return GitHubClient.getInstance()
+                        .getStarredRepos(username)
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .map(new Func1<List<GitHubRepo>, List<ViewModel>>() {
+                            @Override
+                            public List<ViewModel> call(List<GitHubRepo> gitHubRepos) {
+                                List<ViewModel> vms = new ArrayList<>();
+                                for (GitHubRepo repo : gitHubRepos) {
+                                    vms.add(new GithubRepoVM(repo));
+                                }
+                                return vms;
+                            }
+                        });
+            }
+        });
+    }
+}

From 16d869d1e81c474e3e94bff6a92824b188349610 Mon Sep 17 00:00:00 2001
From: Manas Chaudhari <chaudhari.manas@gmail.com>
Date: Mon, 5 Sep 2016 12:31:20 +0530
Subject: [PATCH 3/6] Update views to use Data Binding

---
 .../githubrxjava/BindingAdapters.java         |  24 +++++
 app/src/main/res/layout/activity_main.xml     |  16 ++-
 app/src/main/res/layout/item_github_repo.xml  | 101 ++++++++++--------
 3 files changed, 90 insertions(+), 51 deletions(-)
 create mode 100644 app/src/main/java/com/chrisarriola/githubrxjava/BindingAdapters.java

diff --git a/app/src/main/java/com/chrisarriola/githubrxjava/BindingAdapters.java b/app/src/main/java/com/chrisarriola/githubrxjava/BindingAdapters.java
new file mode 100644
index 0000000..4c00687
--- /dev/null
+++ b/app/src/main/java/com/chrisarriola/githubrxjava/BindingAdapters.java
@@ -0,0 +1,24 @@
+package com.chrisarriola.githubrxjava;
+
+import android.databinding.BindingConversion;
+import android.view.View;
+
+import rx.subjects.PublishSubject;
+
+@SuppressWarnings("unused")
+public class BindingAdapters {
+
+    @BindingConversion
+    public static View.OnClickListener subjectToListener(final PublishSubject<Void> subject) {
+        if (subject != null) {
+            return new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    subject.onNext(null);
+                }
+            };
+        } else {
+            return null;
+        }
+    }
+}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 554c452..9210c53 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:bind="http://schemas.android.com/apk/res-auto">
 
     <data>
 
         <variable
             name="vm"
-            type="Integer" />
+            type="com.chrisarriola.githubrxjava.MainViewModel" />
     </data>
 
     <LinearLayout
@@ -13,11 +14,14 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <ListView
+        <android.support.v7.widget.RecyclerView
             android:id="@+id/list_view_repos"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="1" />
+            android:layout_weight="1"
+            bind:items="@{vm.repositories}"
+            bind:layout_vertical="@{true}"
+            bind:view_provider="@{@layout/item_github_repo}" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -29,12 +33,14 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:hint="@string/username" />
+                android:hint="@string/username"
+                android:text="@={vm.username}" />
 
             <Button
                 android:id="@+id/button_search"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:onClick="@{vm.onSearchClick}"
                 android:text="@string/search" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/item_github_repo.xml b/app/src/main/res/layout/item_github_repo.xml
index c71f245..c47e1ca 100644
--- a/app/src/main/res/layout/item_github_repo.xml
+++ b/app/src/main/res/layout/item_github_repo.xml
@@ -1,50 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="6dp">
-
-    <TextView
-        android:id="@+id/text_repo_name"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="24sp"
-        android:textStyle="bold"
-        tools:text="Cropper"/>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
 
-    <TextView
-        android:id="@+id/text_repo_description"
+        <variable
+            name="vm"
+            type="com.chrisarriola.githubrxjava.GithubRepoVM" />
+    </data>
+
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:lines="2"
-        android:ellipsize="end"
-        android:textSize="16sp"
-        android:layout_below="@+id/text_repo_name"
-        tools:text="Android widget for cropping and rotating an image."/>
-
-    <TextView
-        android:id="@+id/text_language"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/text_repo_description"
-        android:layout_alignParentLeft="true"
-        android:textColor="?attr/colorPrimary"
-        android:textSize="14sp"
-        android:textStyle="bold"
-        tools:text="Language: Java"/>
-
-    <TextView
-        android:id="@+id/text_stars"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/text_repo_description"
-        android:layout_alignParentRight="true"
-        android:textColor="?attr/colorAccent"
-        android:textSize="14sp"
-        android:textStyle="bold"
-        tools:text="Stars: 1953"/>
-
-</RelativeLayout>
\ No newline at end of file
+        android:orientation="vertical"
+        android:padding="6dp">
+
+        <TextView
+            android:id="@+id/text_repo_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="24sp"
+            android:textStyle="bold"
+            tools:text="@{vm.name}" />
+
+        <TextView
+            android:id="@+id/text_repo_description"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/text_repo_name"
+            android:ellipsize="end"
+            android:lines="2"
+            android:textSize="16sp"
+            tools:text="@{vm.description}" />
+
+        <TextView
+            android:id="@+id/text_language"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_below="@+id/text_repo_description"
+            android:textColor="?attr/colorPrimary"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            tools:text="@{vm.language}" />
+
+        <TextView
+            android:id="@+id/text_stars"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_below="@+id/text_repo_description"
+            android:textColor="?attr/colorAccent"
+            android:textSize="14sp"
+            android:textStyle="bold"
+            tools:text="@{vm.stars}" />
+
+    </RelativeLayout>
+</layout>
\ No newline at end of file

From 9340f5daf85c9ae379ca88eb9a02361936907a2f Mon Sep 17 00:00:00 2001
From: Manas Chaudhari <chaudhari.manas@gmail.com>
Date: Mon, 5 Sep 2016 12:31:53 +0530
Subject: [PATCH 4/6] Remove adapters and activity boilerplate

---
 .../githubrxjava/GitHubRepoAdapter.java       | 85 -------------------
 .../githubrxjava/MainActivity.java            | 72 +++-------------
 2 files changed, 11 insertions(+), 146 deletions(-)
 delete mode 100644 app/src/main/java/com/chrisarriola/githubrxjava/GitHubRepoAdapter.java

diff --git a/app/src/main/java/com/chrisarriola/githubrxjava/GitHubRepoAdapter.java b/app/src/main/java/com/chrisarriola/githubrxjava/GitHubRepoAdapter.java
deleted file mode 100644
index c1efde0..0000000
--- a/app/src/main/java/com/chrisarriola/githubrxjava/GitHubRepoAdapter.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.chrisarriola.githubrxjava;
-
-import android.support.annotation.Nullable;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.TextView;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by chris on 6/1/16.
- */
-public class GitHubRepoAdapter extends BaseAdapter {
-
-    private List<GitHubRepo> gitHubRepos = new ArrayList<>();
-
-    @Override public int getCount() {
-        return gitHubRepos.size();
-    }
-
-    @Override public GitHubRepo getItem(int position) {
-        if (position < 0 || position >= gitHubRepos.size()) {
-            return null;
-        } else {
-            return gitHubRepos.get(position);
-        }
-    }
-
-    @Override public long getItemId(int position) {
-        return position;
-    }
-
-    @Override public View getView(int position, View convertView, ViewGroup parent) {
-        final View view = (convertView != null ? convertView : createView(parent));
-        final GitHubRepoViewHolder viewHolder = (GitHubRepoViewHolder) view.getTag();
-        viewHolder.setGitHubRepo(getItem(position));
-        return view;
-    }
-
-    public void setGitHubRepos(@Nullable List<GitHubRepo> repos) {
-        if (repos == null) {
-            return;
-        }
-        gitHubRepos.clear();
-        gitHubRepos.addAll(repos);
-        notifyDataSetChanged();
-    }
-
-    private View createView(ViewGroup parent) {
-        final LayoutInflater inflater = LayoutInflater.from(parent.getContext());
-        final View view = inflater.inflate(R.layout.item_github_repo, parent, false);
-        final GitHubRepoViewHolder viewHolder = new GitHubRepoViewHolder(view);
-        view.setTag(viewHolder);
-        return view;
-    }
-
-    public void add(GitHubRepo gitHubRepo) {
-        gitHubRepos.add(gitHubRepo);
-        notifyDataSetChanged();
-    }
-
-    private static class GitHubRepoViewHolder {
-
-        private TextView textRepoName;
-        private TextView textRepoDescription;
-        private TextView textLanguage;
-        private TextView textStars;
-
-        public GitHubRepoViewHolder(View view) {
-            textRepoName = (TextView) view.findViewById(R.id.text_repo_name);
-            textRepoDescription = (TextView) view.findViewById(R.id.text_repo_description);
-            textLanguage = (TextView) view.findViewById(R.id.text_language);
-            textStars = (TextView) view.findViewById(R.id.text_stars);
-        }
-
-        public void setGitHubRepo(GitHubRepo gitHubRepo) {
-            textRepoName.setText(gitHubRepo.name);
-            textRepoDescription.setText(gitHubRepo.description);
-            textLanguage.setText("Language: " + gitHubRepo.language);
-            textStars.setText("Stars: " + gitHubRepo.stargazersCount);
-        }
-    }
-}
diff --git a/app/src/main/java/com/chrisarriola/githubrxjava/MainActivity.java b/app/src/main/java/com/chrisarriola/githubrxjava/MainActivity.java
index 617f871..58025bd 100644
--- a/app/src/main/java/com/chrisarriola/githubrxjava/MainActivity.java
+++ b/app/src/main/java/com/chrisarriola/githubrxjava/MainActivity.java
@@ -1,70 +1,20 @@
 package com.chrisarriola.githubrxjava;
 
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ListView;
-import java.util.List;
-import rx.Observer;
-import rx.Subscription;
-import rx.android.schedulers.AndroidSchedulers;
-import rx.schedulers.Schedulers;
+import android.support.annotation.NonNull;
 
-public class MainActivity extends AppCompatActivity {
+import com.manaschaudhari.android_mvvm.MvvmActivity;
+import com.manaschaudhari.android_mvvm.ViewModel;
 
-    private static final String TAG = MainActivity.class.getSimpleName();
-    private GitHubRepoAdapter adapter = new GitHubRepoAdapter();
-    private Subscription subscription;
+public class MainActivity extends MvvmActivity {
 
-    @Override protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        final ListView listView = (ListView) findViewById(R.id.list_view_repos);
-        listView.setAdapter(adapter);
-
-        final EditText editTextUsername = (EditText) findViewById(R.id.edit_text_username);
-        final Button buttonSearch = (Button) findViewById(R.id.button_search);
-        buttonSearch.setOnClickListener(new View.OnClickListener() {
-            @Override public void onClick(View v) {
-                final String username = editTextUsername.getText().toString();
-                if (!TextUtils.isEmpty(username)) {
-                    getStarredRepos(username);
-                }
-            }
-        });
-    }
-
-    @Override protected void onDestroy() {
-        if (subscription != null && !subscription.isUnsubscribed()) {
-            subscription.unsubscribe();
-        }
-        super.onDestroy();
+    @NonNull
+    @Override
+    public ViewModel createViewModel() {
+        return new MainViewModel();
     }
 
-    private void getStarredRepos(String username) {
-        subscription = GitHubClient.getInstance()
-                                   .getStarredRepos(username)
-                                   .subscribeOn(Schedulers.io())
-                                   .observeOn(AndroidSchedulers.mainThread())
-                                   .subscribe(new Observer<List<GitHubRepo>>() {
-                                       @Override public void onCompleted() {
-                                           Log.d(TAG, "In onCompleted()");
-                                       }
-
-                                       @Override public void onError(Throwable e) {
-                                           e.printStackTrace();
-                                           Log.d(TAG, "In onError()");
-                                       }
-
-                                       @Override public void onNext(List<GitHubRepo> gitHubRepos) {
-                                           Log.d(TAG, "In onNext()");
-                                           adapter.setGitHubRepos(gitHubRepos);
-                                       }
-                                   });
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_main;
     }
 }

From 42b6150811723e2a61cbf717e45255b9410bd9aa Mon Sep 17 00:00:00 2001
From: --replace-all <chaudhari.manas@gmail.com>
Date: Fri, 9 Sep 2016 12:17:22 +0530
Subject: [PATCH 5/6] Use switchMap to prevent previous results from overriding
 new results

---
 .../main/java/com/chrisarriola/githubrxjava/MainViewModel.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/chrisarriola/githubrxjava/MainViewModel.java b/app/src/main/java/com/chrisarriola/githubrxjava/MainViewModel.java
index 9db710f..e9eebfc 100644
--- a/app/src/main/java/com/chrisarriola/githubrxjava/MainViewModel.java
+++ b/app/src/main/java/com/chrisarriola/githubrxjava/MainViewModel.java
@@ -24,7 +24,7 @@ public MainViewModel() {
         repositories =
                 toObservable(this.username)
                 .sample(onSearchClick)
-                .flatMap(new Func1<String, Observable<List<ViewModel>>>() {
+                .switchMap(new Func1<String, Observable<List<ViewModel>>>() {
             @Override
             public Observable<List<ViewModel>> call(String username) {
                 return GitHubClient.getInstance()

From 91390093c92de33e19480da2ddab10b407c738e5 Mon Sep 17 00:00:00 2001
From: --replace-all <chaudhari.manas@gmail.com>
Date: Mon, 12 Sep 2016 13:42:50 +0530
Subject: [PATCH 6/6] Use List<GithubRepoVM> in MainViewModel

---
 app/build.gradle                                     |  2 +-
 .../com/chrisarriola/githubrxjava/MainViewModel.java | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 80a4d2f..e77ec5c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -36,5 +36,5 @@ dependencies {
     compile 'com.squareup.retrofit2:retrofit:2.0.2'
     compile 'io.reactivex:rxandroid:1.2.0'
     compile 'io.reactivex:rxjava:1.1.5'
-    compile 'com.manaschaudhari:android-mvvm:0.1.1'
+    compile 'com.manaschaudhari:android-mvvm:0.1.2'
 }
diff --git a/app/src/main/java/com/chrisarriola/githubrxjava/MainViewModel.java b/app/src/main/java/com/chrisarriola/githubrxjava/MainViewModel.java
index e9eebfc..558e8cc 100644
--- a/app/src/main/java/com/chrisarriola/githubrxjava/MainViewModel.java
+++ b/app/src/main/java/com/chrisarriola/githubrxjava/MainViewModel.java
@@ -16,7 +16,7 @@
 import static com.manaschaudhari.android_mvvm.FieldUtils.toObservable;
 
 public class MainViewModel implements ViewModel {
-    public final Observable<List<ViewModel>> repositories;
+    public final Observable<List<GithubRepoVM>> repositories;
     public final ObservableField<String> username = new ObservableField<>();
     public final PublishSubject<Void> onSearchClick = PublishSubject.create();
 
@@ -24,17 +24,17 @@ public MainViewModel() {
         repositories =
                 toObservable(this.username)
                 .sample(onSearchClick)
-                .switchMap(new Func1<String, Observable<List<ViewModel>>>() {
+                .switchMap(new Func1<String, Observable<List<GithubRepoVM>>>() {
             @Override
-            public Observable<List<ViewModel>> call(String username) {
+            public Observable<List<GithubRepoVM>> call(String username) {
                 return GitHubClient.getInstance()
                         .getStarredRepos(username)
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
-                        .map(new Func1<List<GitHubRepo>, List<ViewModel>>() {
+                        .map(new Func1<List<GitHubRepo>, List<GithubRepoVM>>() {
                             @Override
-                            public List<ViewModel> call(List<GitHubRepo> gitHubRepos) {
-                                List<ViewModel> vms = new ArrayList<>();
+                            public List<GithubRepoVM> call(List<GitHubRepo> gitHubRepos) {
+                                List<GithubRepoVM> vms = new ArrayList<>();
                                 for (GitHubRepo repo : gitHubRepos) {
                                     vms.add(new GithubRepoVM(repo));
                                 }