Removed all pokemon sprites and icons, load images from network with …

…Glide, some rx, new package structure and app id

README.md

@@ -45,7 +45,7 @@ Pokébase is simple Pokémon application to view information and save informatio
 * Images and cost
 * More coming soon!
 
-Internet connection is required for updates only.
+Internet connection is required for updates and images.
 
 ## Credits
 
@@ -58,12 +58,18 @@ Internet connection is required for updates only.
 * r0adkll/SlidableActivity
 * mancj/MaterialSearchBar
 * JakeWharton/butterknife
+* ReactiveX/RxJava
+* ReactiveX/RxAndroid
+* artem-zinnatullin/RxJavaProGuardRules
+* bumptech/glide
+
 
 ### Disclaimer
 
 This application has no affiliation with Nintendo, The Pokémon Company or Game Freak. All images and information used belong to ©1998-2016 The Pokémon Company. No copyright or trademark infringement is intended.
 
-Databases provided by www.serebii.net and www.veekun.com/dex
+* Databases provided by www.serebii.net and www.veekun.com/dex
+* Image provided by msikma/pokesprite and www.pokemondb.net
 
 ### License
 

app/build.gradle

@@ -32,11 +32,11 @@ android {
     buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
-        applicationId "com.app.main.pokebase"
+        applicationId "me.tylerbwong.pokebase"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "1.0.2"
+        versionName "1.1.0"
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -73,18 +73,48 @@ dependencies {
     androidTestCompile "com.android.support:support-annotations:$rootProject.supportLibVersion"
     androidTestCompile 'com.android.support.test:runner:0.5'
     androidTestCompile 'com.android.support.test:rules:0.5'
+
+    // Android Support Libraries
     compile "com.android.support:appcompat-v7:$rootProject.supportLibVersion"
     compile "com.android.support:design:$rootProject.supportLibVersion"
+
+    // Firebase
+    compile "com.google.firebase:firebase-core:$rootProject.playServicesVersion"
+    compile "com.google.firebase:firebase-crash:$rootProject.playServicesVersion"
+
+    // Glide
+    compile 'com.github.bumptech.glide:glide:3.7.0'
+
+    // RxJava
+    compile 'io.reactivex:rxandroid:1.2.1'
+    compile 'io.reactivex:rxjava:1.2.2'
+    compile 'com.artemzin.rxjava:proguard-rules:1.2.2.0'
+
+    // Circle Image View
     compile 'de.hdodenhof:circleimageview:2.1.0'
+
+    // Material Search Bar
     compile 'com.github.mancj:MaterialSearchBar:0.3.2'
+
+    // App Intro
     compile 'com.github.paolorotolo:appintro:4.0.0'
+
+    // FAB Transition
     compile 'com.github.coyarzun89:fabtransitionactivity:0.2.0'
+
+    // Material Dialogs
     compile 'com.yarolegovich:lovely-dialog:1.0.4'
+
+    // SQLite Asset Helper
     compile 'com.readystatesoftware.sqliteasset:sqliteassethelper:2.0.1'
+
+    // William Chart
     compile 'com.diogobernardino:williamchart:2.2'
+
+    // Slideable Activity
     compile 'com.r0adkll:slidableactivity:2.0.5'
-    compile 'com.google.firebase:firebase-core:9.6.1'
-    compile 'com.google.firebase:firebase-crash:9.6.1'
+
+    // Butterknife
     compile 'com.jakewharton:butterknife:8.3.0'
     apt 'com.jakewharton:butterknife-compiler:8.3.0'
 }

app/google-services.json

@@ -8,9 +8,9 @@
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:511344133435:android:af1af53e544b2c0d",
+        "mobilesdk_app_id": "1:511344133435:android:f96074ea6da5e920",
         "android_client_info": {
-          "package_name": "com.app.main.pokebase"
+          "package_name": "me.tylerbwong.pokebase"
         }
       },
       "oauth_client": [

app/proguard-rules.pro

@@ -32,4 +32,5 @@
 #   public *;
 #}
 
+#retrolambda
 -dontwarn java.lang.invoke**

app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
-          package="com.app.main.pokebase"
+          package="me.tylerbwong.pokebase"
           android:installLocation="auto">
 
     <uses-permission android:name="android.permission.INTERNET"/>

app/src/main/java/com/app/main/pokebase/gui/activities/GenderActivity.java → app/src/main/java/me/tylerbwong/pokebase/gui/activities/GenderActivity.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.app.main.pokebase.gui.activities;
+package me.tylerbwong.pokebase.gui.activities;
 
 import android.content.Context;
 import android.content.Intent;
@@ -26,8 +26,8 @@
 import android.widget.ImageButton;
 import android.widget.TextView;
 
-import com.app.main.pokebase.R;
-import com.app.main.pokebase.model.utilities.Typefaces;
+import me.tylerbwong.pokebase.R;
+import me.tylerbwong.pokebase.model.utilities.Typefaces;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -49,9 +49,9 @@ public class GenderActivity extends AppCompatActivity {
 
    private boolean mIsBoy = true;
 
-   public final static String GENDER = "gender";
-   public final static String MALE = "M";
-   public final static String FEMALE = "F";
+   public static final String GENDER = "gender";
+   public static final String MALE = "M";
+   public static final String FEMALE = "F";
 
    @Override
    public void onCreate(Bundle savedInstanceState) {

app/src/main/java/com/app/main/pokebase/gui/activities/IntroActivity.java → app/src/main/java/me/tylerbwong/pokebase/gui/activities/IntroActivity.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.app.main.pokebase.gui.activities;
+package me.tylerbwong.pokebase.gui.activities;
 
 import android.content.Context;
 import android.content.Intent;
@@ -23,20 +23,21 @@
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 
-import com.app.main.pokebase.gui.fragments.IntroMoveFragment;
-import com.app.main.pokebase.gui.fragments.IntroPokebaseFragment;
-import com.app.main.pokebase.gui.fragments.IntroTeamFragment;
 import com.github.paolorotolo.appintro.AppIntro2;
 import com.google.firebase.analytics.FirebaseAnalytics;
 
+import me.tylerbwong.pokebase.gui.fragments.IntroMoveFragment;
+import me.tylerbwong.pokebase.gui.fragments.IntroPokebaseFragment;
+import me.tylerbwong.pokebase.gui.fragments.IntroTeamFragment;
+
 /**
  * @author Tyler Wong
  */
 public class IntroActivity extends AppIntro2 {
    private FirebaseAnalytics mAnalytics;
 
-   private final static String SKIP_PRESSED = "skip_pressed";
-   private final static String INTRO_SKIPPED = "intro_skipped";
+   private static final String SKIP_PRESSED = "skip_pressed";
+   private static final String INTRO_SKIPPED = "intro_skipped";
 
    @Override
    protected void onCreate(Bundle savedInstanceState) {