Merge pull request #16 from Reline/development

Version 1.0.1

.gitignore

@@ -4,5 +4,4 @@ local.properties
 .idea
 build
 *.jks
-*.keystore
-keystore.properties
+projectFilesBackup*

jisho/build.gradle

@@ -0,0 +1,67 @@
+apply plugin: 'com.android.application'
+
+android {
+    signingConfigs {
+        release {
+            keyAlias 'android'
+            keyPassword 'android'
+            storeFile file('jisho.jks')
+            storePassword 'android'
+        }
+    }
+
+    compileSdkVersion 25
+    buildToolsVersion "25.0.2"
+
+    defaultConfig {
+        applicationId "com.github.reline.jisho"
+        minSdkVersion 19
+        targetSdkVersion 25
+        versionCode 2
+        versionName "1.0.1"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
+        }
+        debug {
+            applicationIdSuffix = ".debug"
+        }
+    }
+    lintOptions {
+        abortOnError false
+    }
+}
+
+configurations {
+    compile.exclude group: 'stax'
+    compile.exclude group: 'xpp3'
+}
+
+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:cardview-v7:25.2.0'
+    compile 'com.android.support:recyclerview-v7:25.2.0'
+    compile 'com.android.support:design:25.2.0'
+
+    compile 'com.bluelinelabs:conductor:2.1.1'
+
+    compile 'com.squareup.retrofit2:retrofit:2.2.0'
+    compile 'com.squareup.okhttp3:logging-interceptor:3.6.0'
+    compile 'com.squareup.retrofit2:adapter-rxjava2:2.2.0'
+    compile 'com.squareup.retrofit2:converter-moshi:2.2.0'
+
+    compile 'io.reactivex.rxjava2:rxjava:2.0.6'
+    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
+
+    compile 'com.jakewharton:butterknife:8.5.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
+
+    compile 'com.google.dagger:dagger:2.9'
+    annotationProcessor 'com.google.dagger:dagger-compiler:2.9'
+}

app/src/main/java/com/github/reline/jisho/injection/components/InjectionComponent.java → jisho/src/main/java/com/github/reline/jisho/injection/components/InjectionComponent.java

@@ -16,13 +16,14 @@
 
 package com.github.reline.jisho.injection.components;
 
-import javax.inject.Singleton;
-
-import dagger.Component;
 import com.github.reline.jisho.injection.modules.NetworkModule;
 import com.github.reline.jisho.injection.modules.PresenterModule;
 import com.github.reline.jisho.ui.controllers.HomeController;
 
+import javax.inject.Singleton;
+
+import dagger.Component;
+
 @Singleton
 @Component(modules = {PresenterModule.class, NetworkModule.class})
 public interface InjectionComponent {

app/src/main/java/com/github/reline/jisho/injection/modules/NetworkModule.java → jisho/src/main/java/com/github/reline/jisho/injection/modules/NetworkModule.java

@@ -18,18 +18,19 @@
 
 import android.support.annotation.NonNull;
 
+import com.github.reline.jisho.BuildConfig;
+import com.github.reline.jisho.network.services.SearchApi;
+
 import javax.inject.Singleton;
 
 import dagger.Module;
 import dagger.Provides;
+import io.reactivex.schedulers.Schedulers;
 import okhttp3.OkHttpClient;
 import okhttp3.logging.HttpLoggingInterceptor;
 import retrofit2.Retrofit;
-import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory;
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 import retrofit2.converter.moshi.MoshiConverterFactory;
-import rx.schedulers.Schedulers;
-import com.github.reline.jisho.BuildConfig;
-import com.github.reline.jisho.network.services.SearchApi;
 
 @Module
 public class NetworkModule {
@@ -59,7 +60,7 @@ static Retrofit provideRetrofit(@NonNull OkHttpClient okHttpClient) {
         if (retrofit == null) {
             retrofit = new Retrofit.Builder()
                     .baseUrl(BASE_URL)
-                    .addCallAdapterFactory(RxJavaCallAdapterFactory.createWithScheduler(Schedulers.io()))
+                    .addCallAdapterFactory(RxJava2CallAdapterFactory.createWithScheduler(Schedulers.io()))
                     .addConverterFactory(MoshiConverterFactory.create())
                     .callFactory(okHttpClient)
                     .build();

app/src/main/java/com/github/reline/jisho/injection/modules/PresenterModule.java → jisho/src/main/java/com/github/reline/jisho/injection/modules/PresenterModule.java

@@ -16,11 +16,12 @@
 
 package com.github.reline.jisho.injection.modules;
 
-import dagger.Module;
-import dagger.Provides;
 import com.github.reline.jisho.network.services.SearchApi;
 import com.github.reline.jisho.presenters.HomePresenter;
 
+import dagger.Module;
+import dagger.Provides;
+
 @Module
 public class PresenterModule {
     @Provides

app/src/main/java/com/github/reline/jisho/models/Attribution.java → jisho/src/main/java/com/github/reline/jisho/models/Attribution.java

@@ -16,11 +16,32 @@
 
 package com.github.reline.jisho.models;
 
-class Attribution {
+import android.os.Parcel;
+import android.os.Parcelable;
+
+class Attribution implements Parcelable {
     private boolean jmdict;
     private boolean jmnedict;
+    // Issue #14: data is lost when parceled
     private Object dbpedia; // String or boolean
 
+    private Attribution(Parcel in) {
+        jmdict = in.readByte() != 0;
+        jmnedict = in.readByte() != 0;
+    }
+
+    public static final Creator<Attribution> CREATOR = new Creator<Attribution>() {
+        @Override
+        public Attribution createFromParcel(Parcel in) {
+            return new Attribution(in);
+        }
+
+        @Override
+        public Attribution[] newArray(int size) {
+            return new Attribution[size];
+        }
+    };
+
     public boolean isJmdict() {
         return jmdict;
     }
@@ -32,4 +53,15 @@ public boolean isJmnedict() {
     public Object isDbpedia() {
         return dbpedia;
     }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeByte((byte) (jmdict ? 1 : 0));
+        dest.writeByte((byte) (jmnedict ? 1 : 0));
+    }
 }

app/src/main/java/com/github/reline/jisho/models/Japanese.java → jisho/src/main/java/com/github/reline/jisho/models/Japanese.java

@@ -16,15 +16,46 @@
 
 package com.github.reline.jisho.models;
 
-public class Japanese {
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class Japanese implements Parcelable {
     private String word;
     private String reading;
 
+    private Japanese(Parcel in) {
+        word = in.readString();
+        reading = in.readString();
+    }
+
+    public static final Creator<Japanese> CREATOR = new Creator<Japanese>() {
+        @Override
+        public Japanese createFromParcel(Parcel in) {
+            return new Japanese(in);
+        }
+
+        @Override
+        public Japanese[] newArray(int size) {
+            return new Japanese[size];
+        }
+    };
+
     public String getWord() {
         return word;
     }
 
     public String getReading() {
         return reading;
     }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(word);
+        dest.writeString(reading);
+    }
 }

app/src/main/java/com/github/reline/jisho/models/Link.java → jisho/src/main/java/com/github/reline/jisho/models/Link.java

@@ -16,15 +16,46 @@
 
 package com.github.reline.jisho.models;
 
-class Link {
+import android.os.Parcel;
+import android.os.Parcelable;
+
+class Link implements Parcelable {
     private String text;
     private String url;
 
+    private Link(Parcel in) {
+        text = in.readString();
+        url = in.readString();
+    }
+
+    public static final Creator<Link> CREATOR = new Creator<Link>() {
+        @Override
+        public Link createFromParcel(Parcel in) {
+            return new Link(in);
+        }
+
+        @Override
+        public Link[] newArray(int size) {
+            return new Link[size];
+        }
+    };
+
     public String getText() {
         return text;
     }
 
     public String getUrl() {
         return url;
     }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(text);
+        dest.writeString(url);
+    }
 }