Add rxjava2

app/build.gradle

@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.getkeepsafe.dexcount'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         applicationId "com.tapglue.example"
         minSdkVersion 15
-        targetSdkVersion 23
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
     }
@@ -23,9 +23,8 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.2.1'
-    compile 'com.android.support:design:23.2.1'
-    compile 'io.reactivex:rxandroid:1.1.0'
+    compile 'com.android.support:appcompat-v7:25.2.0'
+    compile 'com.android.support:design:25.2.0'
     compile 'io.reactivex:rxjava:1.1.2'
     compile project(':tapglue-android-sdk')
 }

app/src/main/java/com/tapglue/example/MainActivity.java

@@ -47,7 +47,7 @@ public void onCompleted() {
 
             @Override
             public void onError(Throwable e) {
-
+                Log.d("MainActivity", "onError");
             }
 
             @Override

core/.gitignore

@@ -0,0 +1 @@
+/build

core/build.gradle

@@ -0,0 +1,53 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
+
+    defaultConfig {
+        minSdkVersion 15
+        targetSdkVersion 25
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile project(':entities')
+    compile 'com.squareup.retrofit2:retrofit:2.2.0'
+    compile 'com.squareup.retrofit2:converter-gson:2.2.0'
+
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+    compile 'com.android.support:appcompat-v7:25.2.0'
+    compile 'com.google.firebase:firebase-messaging:9.0.2'
+    compile 'com.squareup.okhttp3:logging-interceptor:3.6.0'
+    compile 'com.squareup.okhttp3:okhttp:3.6.0'
+
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.hamcrest:hamcrest-all:1.3'
+    testCompile('org.mockito:mockito-core:1.10.8') {
+        exclude module: 'hamcrest-core'
+    }
+
+    testCompile('org.powermock:powermock-api-mockito:1.6.1') {
+        exclude module: 'mockito-all'
+    }
+    testCompile 'org.powermock:powermock-module-junit4-rule-agent:1.6.1'
+    testCompile 'org.powermock:powermock-module-junit4-rule:1.6.1'
+    testCompile('org.powermock:powermock-module-junit4:1.6.1') {
+        exclude module: 'hamcrest-core'
+    }
+
+}

core/proguard-rules.pro

@@ -0,0 +1,25 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/gauravvashisth/Library/Android/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

core/src/androidTest/java/com/tapglue/android/ExampleInstrumentedTest.java

@@ -0,0 +1,26 @@
+package com.tapglue.android;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumentation test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.tapglue.android.test", appContext.getPackageName());
+    }
+}

core/src/main/AndroidManifest.xml

@@ -0,0 +1,9 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+
+    package="com.tapglue.android">
+
+    <application android:allowBackup="true" android:label="@string/app_name" android:supportsRtl="true">
+
+    </application>
+
+</manifest>

core/src/main/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">core</string>
+</resources>

core/src/test/java/com/tapglue/android/ExampleUnitTest.java

@@ -0,0 +1,17 @@
+package com.tapglue.android;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}

entities/.gitignore

@@ -0,0 +1 @@
+/build

entities/build.gradle

@@ -0,0 +1,24 @@
+apply plugin: 'java'
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'com.google.code.gson:gson:2.7'
+
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.hamcrest:hamcrest-all:1.3'
+    testCompile('org.mockito:mockito-core:1.10.8') {
+        exclude module: 'hamcrest-core'
+    }
+
+    testCompile('org.powermock:powermock-api-mockito:1.6.1') {
+        exclude module: 'mockito-all'
+    }
+    testCompile 'org.powermock:powermock-module-junit4-rule-agent:1.6.1'
+    testCompile 'org.powermock:powermock-module-junit4-rule:1.6.1'
+    testCompile('org.powermock:powermock-module-junit4:1.6.1') {
+        exclude module: 'hamcrest-core'
+    }
+}
+
+sourceCompatibility = "1.7"
+targetCompatibility = "1.7"

tapglue-android-sdk/src/main/java/com/tapglue/android/entities/User.java → entities/src/main/java/com/tapglue/android/entities/User.java

@@ -16,10 +16,10 @@
  */
 package com.tapglue.android.entities;
 
-import java.util.Map;
-
 import com.google.gson.annotations.SerializedName;
 
+import java.util.Map;
+
 public class User {
     @SerializedName("id_string")
     private String id;

tapglue-android-sdk/src/main/java/com/tapglue/android/http/CommentsFeed.java → entities/src/main/java/com/tapglue/android/http/CommentsFeed.java

@@ -25,7 +25,7 @@
 import java.util.List;
 import java.util.Map;
 
-class CommentsFeed extends FlattenableFeed<List<Comment>> {
+public class CommentsFeed extends FlattenableFeed<List<Comment>> {
     List<Comment> comments;
     Map<String, User> users;
 

tapglue-android-sdk/src/main/java/com/tapglue/android/http/ConnectionsFeed.java → entities/src/main/java/com/tapglue/android/http/ConnectionsFeed.java

@@ -2,7 +2,6 @@
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-
 import com.tapglue.android.entities.Connection;
 import com.tapglue.android.entities.ConnectionList;
 import com.tapglue.android.entities.User;
@@ -12,7 +11,7 @@
 import java.util.List;
 import java.util.Map;
 
-class ConnectionsFeed extends FlattenableFeed<ConnectionList> {
+public class ConnectionsFeed extends FlattenableFeed<ConnectionList> {
     List<Connection> incoming;
     List<Connection> outgoing;
     List<User> users;

tapglue-android-sdk/src/main/java/com/tapglue/android/http/EventListFeed.java → entities/src/main/java/com/tapglue/android/http/EventListFeed.java

@@ -19,7 +19,6 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.SerializedName;
-
 import com.tapglue.android.entities.Event;
 import com.tapglue.android.entities.Post;
 import com.tapglue.android.entities.User;
@@ -28,7 +27,7 @@
 import java.util.List;
 import java.util.Map;
 
-class EventListFeed extends FlattenableFeed<List<Event>> {
+public class EventListFeed extends FlattenableFeed<List<Event>> {
     List<Event> events;
     Map<String, User> users;
     @SerializedName("post_map")

tapglue-android-sdk/src/main/java/com/tapglue/android/http/LikesFeed.java → entities/src/main/java/com/tapglue/android/http/LikesFeed.java

@@ -19,16 +19,15 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.SerializedName;
-
 import com.tapglue.android.entities.Like;
 import com.tapglue.android.entities.Post;
 import com.tapglue.android.entities.User;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
-class LikesFeed extends FlattenableFeed<List<Like>> {
+public class LikesFeed extends FlattenableFeed<List<Like>> {
     List<Like> likes;
     Map<String, User> users;
     @SerializedName("post_map")

tapglue-android-sdk/src/main/java/com/tapglue/android/http/PostListFeed.java → entities/src/main/java/com/tapglue/android/http/PostListFeed.java

@@ -2,15 +2,14 @@
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-
 import com.tapglue.android.entities.Post;
 import com.tapglue.android.entities.User;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-class PostListFeed extends FlattenableFeed<List<Post>> {
+public class PostListFeed extends FlattenableFeed<List<Post>> {
     List<Post> posts;
     Map<String, User> users;
 

tapglue-android-sdk/src/main/java/com/tapglue/android/http/UsersFeed.java → entities/src/main/java/com/tapglue/android/http/UsersFeed.java

@@ -2,14 +2,13 @@
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-import com.tapglue.android.entities.User;
-
 import com.google.gson.annotations.SerializedName;
+import com.tapglue.android.entities.User;
 
 import java.util.ArrayList;
 import java.util.List;
 
-class UsersFeed extends FlattenableFeed<List<User>> {
+public class UsersFeed extends FlattenableFeed<List<User>> {
     @SerializedName("users")
     private List<User> users;
 

tapglue-android-sdk/src/main/java/com/tapglue/android/http/payloads/SocialConnections.java → entities/src/main/java/com/tapglue/android/http/payloads/SocialConnections.java

@@ -16,10 +16,10 @@
 
 package com.tapglue.android.http.payloads;
 
-import java.util.List;
-
 import com.google.gson.annotations.SerializedName;
 
+import java.util.List;
+
 import static com.tapglue.android.entities.Connection.Type;
 
 public class SocialConnections {

rxjava2sample/.gitignore

@@ -0,0 +1 @@
+/build

rxjava2sample/build.gradle

@@ -0,0 +1,42 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
+
+    defaultConfig {
+        applicationId "com.tapglue.rxjava2sample"
+        minSdkVersion 15
+        targetSdkVersion 25
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+    compile 'com.android.support:appcompat-v7:25.2.0'
+    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    testCompile 'junit:junit:4.12'
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    testCompile 'junit:junit:4.12'
+    compile 'com.android.support:appcompat-v7:25.2.0'
+    compile 'com.android.support:design:25.2.0'
+    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
+    compile project(':tapglue-android-sdk-rxjava2')
+}

rxjava2sample/proguard-rules.pro

@@ -0,0 +1,25 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/gauravvashisth/Library/Android/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile