MacBook-Pro.local push @ 2018-04-23_18-06-10

app/build.gradle

@@ -40,20 +40,26 @@ dependencies {
     api 'com.android.support:cardview-v7:27.1.1'
     api 'com.android.support:design:27.1.1'
 
+    api 'io.reactivex.rxjava2:rxandroid:2.0.2'
+    api 'io.reactivex.rxjava2:rxjava:2.1.12'
+
     api 'com.jakewharton:butterknife:8.5.1'
-    api 'com.google.dagger:dagger:2.8'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
-    annotationProcessor 'com.google.dagger:dagger-compiler:2.8'
-    compileOnly 'javax.annotation:jsr250-api:1.0'
-    api 'javax.inject:javax.inject:1'
 
-    api 'io.reactivex.rxjava2:rxandroid:2.0.2'
-    api 'io.reactivex.rxjava2:rxjava:2.1.12'
+    //api 'javax.inject:javax.inject:1'
+    //compileOnly 'javax.annotation:jsr250-api:1.0'
+
+    api "com.google.dagger:dagger:$rootProject.daggerVersion"
+    api "com.google.dagger:dagger-android:$rootProject.daggerVersion"
+    api "com.google.dagger:dagger-android-support:$rootProject.daggerVersion"
+    annotationProcessor "com.google.dagger:dagger-android-processor:$rootProject.daggerVersion"
+    annotationProcessor "com.google.dagger:dagger-compiler:$rootProject.daggerVersion"
 
     api 'org.greenrobot:greendao:3.2.2'
+    //数据库加密
     api 'net.zetetic:android-database-sqlcipher:3.5.1'
 
-    api 'com.google.guava:guava:22.0'
+    //api 'com.google.guava:guava:22.0'
 
     api 'com.jakewharton.timber:timber:4.5.1'
 

app/src/main/java/com/sunil/mvp/db/GreenDaoDatabase.java

@@ -15,7 +15,7 @@ import org.greenrobot.greendao.database.Database;
 public class GreenDaoDatabase {
 
     private static DaoSession mDaoSession;
-    public static final boolean ENCRYPTED = true;
+    public static final boolean ENCRYPTED = false;
 
     private GreenDaoDatabase() {
     }

app/src/main/java/com/sunil/mvp/di/module/ApplicationModule.java

@@ -1,6 +1,8 @@
 package com.sunil.mvp.di.module;
 
 import android.app.Application;
+import android.content.Context;
+import android.content.SharedPreferences;
 
 import com.sunil.mvp.MainApplication;
 
@@ -26,8 +28,8 @@ public class ApplicationModule {
     }
 
 
-   /* @Provides
-    SharedPreferences provideSharedPrefs() {
-        return mainApplication.getSharedPreferences("dragger-prefs", Context.MODE_PRIVATE);
-    }*/
+//   @Provides
+//   SharedPreferences provideSharedPrefs() {
+//        return mainApplication.getSharedPreferences("dragger-prefs", Context.MODE_PRIVATE);
+//    }
 }

app/src/main/java/com/sunil/mvp/ui/KickStarterList/KickStarterListPresenter.java

@@ -2,7 +2,6 @@ package com.sunil.mvp.ui.KickStarterList;
 
 import android.support.annotation.NonNull;
 
-import com.google.common.base.Preconditions;
 import com.sunil.mvp.api.APIService;
 import com.sunil.mvp.api.apiModel.KickStarterModel;
 import com.sunil.mvp.db.model.KickStarter;
@@ -94,7 +93,7 @@ public class KickStarterListPresenter implements KickStarterListContract.Present
         }, new Consumer<Throwable>() {
             @Override
             public void accept(@io.reactivex.annotations.NonNull Throwable throwable) throws Exception {
-                Preconditions.checkNotNull(throwable);
+                //Preconditions.checkNotNull(throwable);
                 mKickStartView.showLoadErrorMessage(throwable.getMessage());
             }
         }, new Action() {
@@ -126,7 +125,7 @@ public class KickStarterListPresenter implements KickStarterListContract.Present
         }, new Consumer<Throwable>() {
             @Override
             public void accept(@io.reactivex.annotations.NonNull Throwable throwable) throws Exception {
-                Preconditions.checkNotNull(throwable);
+                //Preconditions.checkNotNull(throwable);
                 mKickStartView.showLoadErrorMessage(throwable.getMessage());
             }
         }, new Action() {

app/src/main/java/com/sunil/mvp/ui/kiskstarterdetail/KickStarterDetailFragment.java

@@ -37,7 +37,6 @@ import butterknife.ButterKnife;
 /**
  * Created by sunil on 19-08-2017.
  */
-
 public class KickStarterDetailFragment extends Fragment implements KickStarterDetailContract.View {
 
     public static final String Tag = KickStarterDetailFragment.class.getSimpleName();

app/src/main/java/com/sunil/mvp/ui/kiskstarterdetail/KickStarterDetailPresenter.java

@@ -18,16 +18,16 @@ import io.reactivex.functions.Consumer;
  * Created by sunil on 19-08-2017.
  */
 
-public class KickStarterDetailPresenter implements KickStarterDetailContract.Presenter{
+public class KickStarterDetailPresenter implements KickStarterDetailContract.Presenter {
 
     @NonNull
     private KickStarterDetailContract.View mKickStartView;
     private Context context;
     private CompositeDisposable mCompositeDisposable;
-    private  KickStarterLocalSource kickStarterLocalSource;
+    private KickStarterLocalSource kickStarterLocalSource;
 
 
-    public KickStarterDetailPresenter(){
+    public KickStarterDetailPresenter() {
         kickStarterLocalSource = new KickStarterLocalSource();
     }
 
@@ -53,7 +53,7 @@ public class KickStarterDetailPresenter implements KickStarterDetailContract.Pre
     @Override
     public void loadDetailKickStarter(int s_n0) {
 
-        Log.v("", "S_SN: "+s_n0);
+        Log.v("", "S_SN: " + s_n0);
         Observable<KickStarter> kickStarterObservable = kickStarterLocalSource.getKickStarterById(s_n0);
         kickStarterObservable.doOnDispose(new Action() {
             @Override

app/src/main/java/com/sunil/mvp/util/ActivityUtil.java

@@ -5,7 +5,6 @@ import android.app.FragmentManager;
 import android.app.FragmentTransaction;
 import android.support.annotation.NonNull;
 
-import com.google.common.base.Preconditions;
 
 /**
  * Created by sunil on 12-08-2017.
@@ -15,8 +14,8 @@ public class ActivityUtil {
 
     public static void addFragmentToActivity(@NonNull FragmentManager fragmentManager,
                                              @NonNull Fragment fragment, int frameId, String fragmentTag) {
-        Preconditions.checkNotNull(fragmentManager);
-        Preconditions.checkNotNull(fragment);
+        //Preconditions.checkNotNull(fragmentManager);
+        //Preconditions.checkNotNull(fragment);
         FragmentTransaction transaction = fragmentManager.beginTransaction();
         transaction.replace(frameId, fragment, fragmentTag);
         transaction.commit();

build.gradle

@@ -25,3 +25,28 @@ allprojects {
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
+
+
+// Define versions in a single place
+ext {
+    // Sdk and tools
+    // Support library and architecture components support minSdk 14 and above.
+    minSdkVersion = 14
+    targetSdkVersion = 27
+    compileSdkVersion = 27
+    buildToolsVersion = '26.0.2'
+
+    // App dependencies
+    supportLibraryVersion = '26.1.0'
+    guavaVersion = '18.0'
+    junitVersion = '4.12'
+    mockitoVersion = '1.10.19'
+    powerMockito = '1.6.2'
+    hamcrestVersion = '1.3'
+    runnerVersion = '1.0.1'
+    rulesVersion = '1.0.1'
+    espressoVersion = '3.0.1'
+    roomVersion = "1.0.0"
+    daggerVersion = '2.15'
+    dexmakerVersion = '1.2'
+}

greendaodb/build.gradle

@@ -2,8 +2,8 @@ apply plugin: 'java'
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'org.greenrobot:greendao-generator:3.2.0'
+    compile 'org.greenrobot:greendao-generator:3.2.2'
 }
 
 sourceCompatibility = "1.7"
-targetCompatibility = "1.7"
+targetCompatibility = "1.7"

greendaodb/src/main/java/com/example/GreenDaoMain.java

@@ -9,7 +9,7 @@ public class GreenDaoMain {
     public static void main(String[] args) throws Exception {
         Schema schema = new Schema(5, "com.sunil.payuandroidchallenge.db.model");
         addKickStarter(schema);
-        new DaoGenerator().generateAll(schema, "../PayUAndroidChallenge/app/src/main/java/");
+        new DaoGenerator().generateAll(schema, "../MVPAndroid/app/src/main/java/");
     }
 
     private static void addKickStarter(Schema schema) {
@@ -29,6 +29,5 @@ public class GreenDaoMain {
         kickStarter.addStringProperty("title");
         kickStarter.addStringProperty("type");
         kickStarter.addStringProperty("url");
-
     }
 }