Switch Marvel API to star wars because it's completely public

Author: hitherejoe

README.md

@@ -1,32 +1,31 @@
 Android Boilerplate
 ===================
 
-After finding no examples online of Espresso / Robolectric setup in Android Studio with the new Unit Testing feature
-(without using a third party plugin) I decided to create this boilerplate project to document the setup. After 
-recreating the same project setup over and over again I decided it was also about time to do so! The project structure is as follows:
-
-<p align="center"><img src="http://i617.photobucket.com/albums/tt254/joeyerrr/project_structure.png" /></p>
-
-All ready to go with:
-
-- Espresso testing
-- Robolectric testing
-- Network requests using retrofit and Rx Java
-- Database management using Rx java and pure SQLite
-- Holders for list items using EasyAdapter
+A simple boilerplate application which demonstrates the downloading, persisting and syncing of data - displayed with a common layout used amongst applications.
+
+The project is setup to use:
+
+- Espresso automated tests, contained in a seperate androidTest module
+- Robolectric Unit tests
+- Dagger 2 for dependancy injection
+- Networking using retrofit with Rx Java
+- Database management using Rx java, SQLBrite and pure SQLite
+- Data Sync Service
+- Design Support library integrated for Material Style view animations (includes TabLayout, CollapsingToolbar & CoordinatorLayout implementations)
+- Holders (adapters) for recycler views using EasyAdapter
 - Butterknife for easy view injection
-- Picasso for easy image downloading / display
+- Glide for easy image downloading / display
+- Timber for simple Debug logging
 
 Requirements
 ------------
 
  - [Android SDK](http://developer.android.com/sdk/index.html).
  - Android [5.1 (API 22) ](http://developer.android.com/tools/revisions/platforms.html#5.1).
  - Android SDK Tools
- - Android SDK Build tools 22.0.1 
+ - Android SDK Build tools 23.0.0.0 rc3
  - Android Support Repository
  - Android Support library
- - Enabled [Unit Test support] (http://tools.android.com/tech-docs/unit-testing-support)
 
 Building
 --------

app/build.gradle

@@ -37,33 +37,27 @@ dependencies {
     final DAGGER_VERSION = '2.0.1'
     final HAMCREST_VERSION = '1.3'
     final MOCKITO_VERSION = '1.10.19'
-
     compile fileTree(dir: 'libs', include: ['*.jar'])
-
     compile 'com.android.support:support-v4:22.2.1'
     compile "com.android.support:appcompat-v7:$SUPPORT_LIBRARY_VERSION"
     compile "com.android.support:cardview-v7:$SUPPORT_LIBRARY_VERSION"
     compile "com.android.support:design:$SUPPORT_LIBRARY_VERSION"
     compile "com.android.support:recyclerview-v7:$SUPPORT_LIBRARY_VERSION"
     compile "com.android.support:support-annotations:$SUPPORT_LIBRARY_VERSION"
-
     compile 'com.squareup.sqlbrite:sqlbrite:0.2.1'
     compile 'com.squareup.retrofit:retrofit:1.9.0'
     compile 'com.squareup.okhttp:okhttp-urlconnection:2.4.0'
     compile 'com.squareup.okhttp:okhttp:2.4.0'
     compile 'com.squareup:otto:1.3.8'
     compile 'com.github.bumptech.glide:glide:3.6.1'
     compile 'de.hdodenhof:circleimageview:1.3.0'
-
     compile 'io.reactivex:rxandroid:0.25.0'
     compile 'com.jakewharton:butterknife:7.0.1'
     compile 'com.jakewharton.timber:timber:3.1.0'
     compile 'uk.co.ribot:easyadapter:1.5.0@aar'
-
-    compile  "com.google.dagger:dagger:$DAGGER_VERSION"
-    apt      "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
+    compile "com.google.dagger:dagger:$DAGGER_VERSION"
+    apt "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
     provided 'org.glassfish:javax.annotation:10.0-b28'
-
     testCompile 'junit:junit:4.12'
     testCompile "org.hamcrest:hamcrest-core:$HAMCREST_VERSION"
     testCompile "org.hamcrest:hamcrest-library:$HAMCREST_VERSION"
@@ -73,6 +67,6 @@ dependencies {
         exclude group: 'commons-logging', module: 'commons-logging'
         exclude group: 'org.apache.httpcomponents', module: 'httpclient'
     }
-
     androidTestApt "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
+    compile 'com.google.dexmaker:dexmaker:1.2'
 }

app/src/main/java/com/hitherejoe/androidboilerplate/data/DataManager.java

@@ -69,30 +69,22 @@ public Scheduler getScheduler() {
     }
 
     public Observable<Character> syncCharacters(int[] ids) {
-        return getAvengers(ids).toList().concatMap(new Func1<List<Character>, Observable<? extends Character>>() {
+        return getCharacters(ids).toList().concatMap(new Func1<List<Character>, Observable<? extends Character>>() {
             @Override
             public Observable<? extends Character> call(List<Character> characters) {
                 return mDatabaseHelper.setCharacters(characters);
             }
         });
     }
 
-    public Observable<Character> getAvengers(int[] ids) {
+    public Observable<Character> getCharacters(int[] ids) {
         List<Integer> characterIds = new ArrayList<>(ids.length);
         for (int id : ids) characterIds.add(id);
-        return Observable.from(characterIds).concatMap(new Func1<Integer, Observable<AndroidBoilerplateService.CharacterResponse>>() {
+        return Observable.from(characterIds).concatMap(new Func1<Integer, Observable<Character>>() {
             @Override
-            public Observable<AndroidBoilerplateService.CharacterResponse> call(Integer integer) {
+            public Observable<Character> call(Integer integer) {
                 return mAndroidBoilerplateService.getCharacter(integer);
             }
-        }).concatMap(new Func1<AndroidBoilerplateService.CharacterResponse, Observable<Character>>() {
-            @Override
-            public Observable<Character> call(AndroidBoilerplateService.CharacterResponse characterResponse) {
-                if (characterResponse.data.results != null && !characterResponse.data.results.isEmpty()) {
-                    return Observable.just(characterResponse.data.results.get(0));
-                }
-                return Observable.empty();
-            }
         });
     }
 
@@ -107,7 +99,7 @@ public Observable<? extends Character> call(List<Character> characters) {
             public Observable<? extends Character> call(Character character) {
                 return Observable.just(character);
             }
-        });
+        }).distinct();
     }
 
 }

app/src/main/java/com/hitherejoe/androidboilerplate/data/SyncService.java

@@ -24,8 +24,6 @@
 
 public class SyncService extends Service {
 
-    public static final String TAG = "SyncService";
-
     @Inject DataManager mDataManager;
     private Subscription mSubscription;
 
@@ -55,7 +53,7 @@ public int onStartCommand(Intent intent, int flags, final int startId) {
         }
 
         if (mSubscription != null && !mSubscription.isUnsubscribed()) mSubscription.unsubscribe();
-        int[] characterIds = getResources().getIntArray(R.array.avengers);
+        int[] characterIds = getResources().getIntArray(R.array.characters);
 
         mSubscription = mDataManager.syncCharacters(characterIds)
                 .observeOn(AndroidSchedulers.mainThread())

app/src/main/java/com/hitherejoe/androidboilerplate/data/local/Db.java

@@ -6,9 +6,10 @@
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.hitherejoe.androidboilerplate.data.model.Character;
-import com.hitherejoe.androidboilerplate.data.model.Collection;
 import com.hitherejoe.androidboilerplate.util.DataUtils;
 
+import java.util.List;
+
 public class Db {
 
     public Db() { }
@@ -17,50 +18,71 @@ public static abstract class CharacterTable {
         public static final String TABLE_NAME = "characters";
         public static final String COLUMN_ID = "id";
         public static final String COLUMN_NAME = "name";
-        public static final String COLUMN_DESCRIPTION = "description";
-        public static final String COLUMN_THUMBNAIL = "thumbnail";
-        public static final String COLUMN_COMICS = "comics";
-        public static final String COLUMN_SERIES = "series";
-        public static final String COLUMN_STORIES = "stories";
-        public static final String COLUMN_EVENTS = "events";
+        public static final String COLUMN_HEIGHT = "height";
+        public static final String COLUMN_MASS = "mass";
+        public static final String COLUMN_HAIR_COLOR = "hair_color";
+        public static final String COLUMN_SKIN_COLOR = "skin_color";
+        public static final String COLUMN_EYE_COLOR = "eye_color";
+        public static final String COLUMN_BIRTH_YEAR = "birth_year";
+        public static final String COLUMN_GENDER = "gender";
+        public static final String COLUMN_HOME_WORLD = "home_world";
+        public static final String COLUMN_FILMS = "films";
+        public static final String COLUMN_SPECIES = "species";
+        public static final String COLUMN_VEHICLES = "vehicles";
+        public static final String COLUMN_STARSHIPS = "starships";
 
         public static final String CREATE =
                 "CREATE TABLE " + TABLE_NAME + " (" +
-                        COLUMN_ID + " INTEGER PRIMARY KEY," +
+                        COLUMN_ID + " INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL," +
                         COLUMN_NAME + " TEXT NOT NULL," +
-                        COLUMN_DESCRIPTION + " TEXT," +
-                        COLUMN_THUMBNAIL + " TEXT," +
-                        COLUMN_COMICS + " TEXT," +
-                        COLUMN_SERIES + " TEXT," +
-                        COLUMN_STORIES + " TEXT," +
-                        COLUMN_EVENTS + " TEXT" +
+                        COLUMN_HEIGHT + " TEXT," +
+                        COLUMN_MASS + " TEXT," +
+                        COLUMN_HAIR_COLOR + " TEXT," +
+                        COLUMN_SKIN_COLOR + " TEXT," +
+                        COLUMN_EYE_COLOR + " TEXT," +
+                        COLUMN_BIRTH_YEAR + " TEXT," +
+                        COLUMN_GENDER + " TEXT," +
+                        COLUMN_HOME_WORLD + " TEXT," +
+                        COLUMN_FILMS + " TEXT," +
+                        COLUMN_SPECIES + " TEXT," +
+                        COLUMN_VEHICLES + " TEXT," +
+                        COLUMN_STARSHIPS + " TEXT" +
                         " ); ";
 
         public static ContentValues toContentValues(Character character) {
             Gson gson = DataUtils.getGsonInstance();
             ContentValues values = new ContentValues();
-            values.put(COLUMN_ID, character.id);
             values.put(COLUMN_NAME, character.name);
-            values.put(COLUMN_DESCRIPTION, character.description);
-            values.put(COLUMN_THUMBNAIL, gson.toJson(character.thumbnail, new TypeToken<Character.Thumbnail>(){}.getType()));
-            values.put(COLUMN_COMICS, gson.toJson(character.comics, new TypeToken<Collection>(){}.getType()));
-            values.put(COLUMN_SERIES, gson.toJson(character.series, new TypeToken<Collection>(){}.getType()));
-            values.put(COLUMN_STORIES, gson.toJson(character.stories, new TypeToken<Collection>(){}.getType()));
-            values.put(COLUMN_EVENTS, gson.toJson(character.events, new TypeToken<Collection>(){}.getType()));
+            values.put(COLUMN_HEIGHT, character.height);
+            values.put(COLUMN_MASS, character.mass);
+            values.put(COLUMN_HAIR_COLOR, character.hairColor);
+            values.put(COLUMN_SKIN_COLOR, character.skinColor);
+            values.put(COLUMN_EYE_COLOR, character.eyeColor);
+            values.put(COLUMN_BIRTH_YEAR, character.birthYear);
+            values.put(COLUMN_GENDER, character.gender);
+            values.put(COLUMN_HOME_WORLD, character.homeworld);
+            values.put(COLUMN_FILMS, gson.toJson(character.films, new TypeToken<List<String>>(){}.getType()));
+            values.put(COLUMN_SPECIES, gson.toJson(character.species, new TypeToken<List<String>>(){}.getType()));
+            values.put(COLUMN_VEHICLES, gson.toJson(character.vehicles, new TypeToken<List<String>>(){}.getType()));
+            values.put(COLUMN_STARSHIPS, gson.toJson(character.starships, new TypeToken<List<String>>(){}.getType()));
             return values;
         }
 
         public static Character parseCursor(Cursor cursor) {
             Gson gson = DataUtils.getGsonInstance();
             Character character = new Character();
-            character.id = cursor.getInt(cursor.getColumnIndexOrThrow(COLUMN_ID));
             character.name = cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_NAME));
-            character.description = cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_DESCRIPTION));
-            character.thumbnail = gson.fromJson(cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_THUMBNAIL)), new TypeToken<Character.Thumbnail>() {}.getType());
-            character.comics = gson.fromJson(cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_COMICS)), new TypeToken<Collection>() {}.getType());
-            character.series = gson.fromJson(cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_SERIES)), new TypeToken<Collection>() {}.getType());
-            character.stories = gson.fromJson(cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_STORIES)), new TypeToken<Collection>() {}.getType());
-            character.events = gson.fromJson(cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_EVENTS)), new TypeToken<Collection>() {}.getType());
+            character.height = cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_HEIGHT));
+            character.mass = cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_MASS));
+            character.hairColor = cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_SKIN_COLOR));
+            character.eyeColor = cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_EYE_COLOR));
+            character.birthYear = cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_BIRTH_YEAR));
+            character.gender = cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_GENDER));
+            character.homeworld = cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_HOME_WORLD));
+            character.films = gson.fromJson(cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_FILMS)), new TypeToken<List<String>>() {}.getType());
+            character.species = gson.fromJson(cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_SPECIES)), new TypeToken<List<String>>() {}.getType());
+            character.vehicles = gson.fromJson(cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_VEHICLES)), new TypeToken<List<String>>() {}.getType());
+            character.starships = gson.fromJson(cursor.getString(cursor.getColumnIndexOrThrow(COLUMN_STARSHIPS)), new TypeToken<List<String>>() {}.getType());
             return character;
         }
     }