Commit 8b7d1c44 authored by Isaac Pereira's avatar Isaac Pereira

Adicionando dependências do RxJava e RxAndroid e CurioJava

parent 93243f7f
...@@ -31,6 +31,8 @@ dependencies { ...@@ -31,6 +31,8 @@ dependencies {
compile "com.android.support:support-vector-drawable:$rootProject.supportLibraryVersion" compile "com.android.support:support-vector-drawable:$rootProject.supportLibraryVersion"
compile "com.android.support:animated-vector-drawable:$rootProject.supportLibraryVersion" compile "com.android.support:animated-vector-drawable:$rootProject.supportLibraryVersion"
compile "br.com.evologica:curio-java:$rootProject.curioJavaVersion"
// font // font
compile "uk.co.chrisjenx:calligraphy:$rootProject.calligraphyVersion" compile "uk.co.chrisjenx:calligraphy:$rootProject.calligraphyVersion"
...@@ -49,8 +51,8 @@ dependencies { ...@@ -49,8 +51,8 @@ dependencies {
compile 'javax.inject:javax.inject:1' compile 'javax.inject:javax.inject:1'
// //
// // reactive // // reactive
// compile "io.reactivex.rxjava2:rxjava:$rootProject.rxjava2Version" compile "io.reactivex.rxjava2:rxjava:$rootProject.rxjava2Version"
// compile "io.reactivex.rxjava2:rxandroid:$rootProject.rxandroidVersion" compile "io.reactivex.rxjava2:rxandroid:$rootProject.rxandroidVersion"
// //
// // code generator for view // // code generator for view
compile "com.jakewharton:butterknife:$rootProject.butterKnifeVersion" compile "com.jakewharton:butterknife:$rootProject.butterKnifeVersion"
...@@ -76,4 +78,7 @@ dependencies { ...@@ -76,4 +78,7 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations' exclude group: 'com.android.support', module: 'support-annotations'
}) })
testCompile 'junit:junit:4.12'*/ testCompile 'junit:junit:4.12'*/
} }
...@@ -30,11 +30,6 @@ public class MvpApp extends Application { ...@@ -30,11 +30,6 @@ public class MvpApp extends Application {
//AppDataManager.initInstance(this); //AppDataManager.initInstance(this);
/* CalligraphyConfig.initDefault(new CalligraphyConfig.Builder()
.setDefaultFontPath("fonts/source-sans-pro/SourceSansPro-Regular.ttf")
.setFontAttrId(R.attr.fontPath)
.build());*/
mApplicationComponent = DaggerApplicationComponent.builder() mApplicationComponent = DaggerApplicationComponent.builder()
.applicationModule(new ApplicationModule(this)).build(); .applicationModule(new ApplicationModule(this)).build();
......
...@@ -5,6 +5,7 @@ import android.content.Context; ...@@ -5,6 +5,7 @@ import android.content.Context;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import br.com.evologica.curio.Service;
import br.com.evologica.mvp.data.prefs.PreferencesHelper; import br.com.evologica.mvp.data.prefs.PreferencesHelper;
import br.com.evologica.mvp.di.ApplicationContext; import br.com.evologica.mvp.di.ApplicationContext;
...@@ -19,15 +20,23 @@ public class AppDataManager implements DataManager { ...@@ -19,15 +20,23 @@ public class AppDataManager implements DataManager {
private final Context mContext; private final Context mContext;
private final PreferencesHelper mPreferencesHelper; private final PreferencesHelper mPreferencesHelper;
private final Service mService;
@Inject @Inject
public AppDataManager(@ApplicationContext Context ctx, public AppDataManager(@ApplicationContext Context ctx,
PreferencesHelper preferencesHelper) { PreferencesHelper preferencesHelper,
Service service) {
mContext = ctx; mContext = ctx;
mPreferencesHelper = preferencesHelper; mPreferencesHelper = preferencesHelper;
mService = service;
} }
@Override
public Service getService() {
return mService;
}
@Override @Override
public void setLoggedIn() { public void setLoggedIn() {
mPreferencesHelper.setLoggedIn(); mPreferencesHelper.setLoggedIn();
......
package br.com.evologica.mvp.data; package br.com.evologica.mvp.data;
import br.com.evologica.curio.Service;
import br.com.evologica.mvp.data.prefs.PreferencesHelper; import br.com.evologica.mvp.data.prefs.PreferencesHelper;
/** /**
...@@ -7,4 +8,7 @@ import br.com.evologica.mvp.data.prefs.PreferencesHelper; ...@@ -7,4 +8,7 @@ import br.com.evologica.mvp.data.prefs.PreferencesHelper;
*/ */
public interface DataManager extends PreferencesHelper { public interface DataManager extends PreferencesHelper {
Service getService();
} }
...@@ -16,6 +16,7 @@ import br.com.evologica.mvp.ui.splash.SplashMvpView; ...@@ -16,6 +16,7 @@ import br.com.evologica.mvp.ui.splash.SplashMvpView;
import br.com.evologica.mvp.ui.splash.SplashPresenter; import br.com.evologica.mvp.ui.splash.SplashPresenter;
import dagger.Module; import dagger.Module;
import dagger.Provides; import dagger.Provides;
import io.reactivex.disposables.CompositeDisposable;
/** /**
* Created by marcussales on 02/03/2017. * Created by marcussales on 02/03/2017.
...@@ -41,6 +42,11 @@ public class ActivityModule { ...@@ -41,6 +42,11 @@ public class ActivityModule {
return mActivity; return mActivity;
} }
@Provides
CompositeDisposable provideCompositeDisposable() {
return new CompositeDisposable();
}
@Provides @Provides
@PerActivity @PerActivity
SplashMvpPresenter<SplashMvpView> provideSplashPresenter(SplashPresenter<SplashMvpView> presenter){ SplashMvpPresenter<SplashMvpView> provideSplashPresenter(SplashPresenter<SplashMvpView> presenter){
......
...@@ -5,6 +5,7 @@ import android.content.Context; ...@@ -5,6 +5,7 @@ import android.content.Context;
import javax.inject.Singleton; import javax.inject.Singleton;
import br.com.evologica.curio.Service;
import br.com.evologica.mvp.R; import br.com.evologica.mvp.R;
import br.com.evologica.mvp.data.AppDataManager; import br.com.evologica.mvp.data.AppDataManager;
import br.com.evologica.mvp.data.DataManager; import br.com.evologica.mvp.data.DataManager;
...@@ -67,4 +68,10 @@ public class ApplicationModule { ...@@ -67,4 +68,10 @@ public class ApplicationModule {
.build(); .build();
} }
@Provides
@Singleton
Service provideCurioService() {
return new Service("CentralBonus", "192.168.0.34", "6161", "72");
}
} }
...@@ -3,20 +3,19 @@ package br.com.evologica.mvp.ui.base; ...@@ -3,20 +3,19 @@ package br.com.evologica.mvp.ui.base;
import javax.inject.Inject; import javax.inject.Inject;
import br.com.evologica.mvp.data.DataManager; import br.com.evologica.mvp.data.DataManager;
import io.reactivex.disposables.CompositeDisposable;
/**
* Created by marcussales on 01/03/2017.
*/
public class BasePresenter<V extends MvpView> implements MvpPresenter<V> { public class BasePresenter<V extends MvpView> implements MvpPresenter<V> {
private V mMvpView; private V mMvpView;
private final DataManager mDataManager; private final DataManager mDataManager;
private final CompositeDisposable mCompositeDisposable;
@Inject @Inject
public BasePresenter(DataManager mDataManager) { public BasePresenter(DataManager mDataManager, CompositeDisposable mCompositeDisposable) {
this.mDataManager = mDataManager; this.mDataManager = mDataManager;
this.mCompositeDisposable = mCompositeDisposable;
} }
public V getMvpView() { public V getMvpView() {
...@@ -36,4 +35,9 @@ public class BasePresenter<V extends MvpView> implements MvpPresenter<V> { ...@@ -36,4 +35,9 @@ public class BasePresenter<V extends MvpView> implements MvpPresenter<V> {
public DataManager getDataManager() { public DataManager getDataManager() {
return mDataManager; return mDataManager;
} }
public CompositeDisposable getCompositeDisposable() {
return mCompositeDisposable;
}
} }
...@@ -4,6 +4,7 @@ import javax.inject.Inject; ...@@ -4,6 +4,7 @@ import javax.inject.Inject;
import br.com.evologica.mvp.data.DataManager; import br.com.evologica.mvp.data.DataManager;
import br.com.evologica.mvp.ui.base.BasePresenter; import br.com.evologica.mvp.ui.base.BasePresenter;
import io.reactivex.disposables.CompositeDisposable;
/** /**
* Created by marcussales on 01/03/2017. * Created by marcussales on 01/03/2017.
...@@ -14,8 +15,8 @@ public class LoginPresenter<V extends LoginMvpView> extends BasePresenter<V> imp ...@@ -14,8 +15,8 @@ public class LoginPresenter<V extends LoginMvpView> extends BasePresenter<V> imp
private static final String TAG = "LoginPresenter"; private static final String TAG = "LoginPresenter";
@Inject @Inject
public LoginPresenter(DataManager dataManager) { public LoginPresenter(DataManager dataManager, CompositeDisposable compositeDisposable) {
super(dataManager); super(dataManager, compositeDisposable);
} }
@Override @Override
......
...@@ -4,16 +4,13 @@ import javax.inject.Inject; ...@@ -4,16 +4,13 @@ import javax.inject.Inject;
import br.com.evologica.mvp.data.DataManager; import br.com.evologica.mvp.data.DataManager;
import br.com.evologica.mvp.ui.base.BasePresenter; import br.com.evologica.mvp.ui.base.BasePresenter;
import io.reactivex.disposables.CompositeDisposable;
/**
* Created by marcussales on 01/03/2017.
*/
public class MainPresenter<V extends MainMvpView> extends BasePresenter<V> implements MainMvpPresenter<V> { public class MainPresenter<V extends MainMvpView> extends BasePresenter<V> implements MainMvpPresenter<V> {
@Inject @Inject
public MainPresenter(DataManager dataManager) { public MainPresenter(DataManager dataManager, CompositeDisposable compositeDisposable) {
super(dataManager); super(dataManager, compositeDisposable);
} }
@Override @Override
......
...@@ -4,16 +4,13 @@ import javax.inject.Inject; ...@@ -4,16 +4,13 @@ import javax.inject.Inject;
import br.com.evologica.mvp.data.DataManager; import br.com.evologica.mvp.data.DataManager;
import br.com.evologica.mvp.ui.base.BasePresenter; import br.com.evologica.mvp.ui.base.BasePresenter;
import io.reactivex.disposables.CompositeDisposable;
/**
* Created by marcussales on 01/03/2017.
*/
public class SplashPresenter<V extends SplashMvpView> extends BasePresenter<V> implements SplashMvpPresenter<V> { public class SplashPresenter<V extends SplashMvpView> extends BasePresenter<V> implements SplashMvpPresenter<V> {
@Inject @Inject
public SplashPresenter(DataManager dataManager) { public SplashPresenter(DataManager dataManager, CompositeDisposable compositeDisposable) {
super(dataManager); super(dataManager, compositeDisposable);
} }
@Override @Override
......
...@@ -16,6 +16,9 @@ buildscript { ...@@ -16,6 +16,9 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
jcenter() jcenter()
maven {
url 'http://nexus.conexops.com.br/repository/maven-releases/'
}
} }
} }
...@@ -31,6 +34,8 @@ ext { ...@@ -31,6 +34,8 @@ ext {
compileSdkVersion = 25 compileSdkVersion = 25
buildToolsVersion = '25.0.2' buildToolsVersion = '25.0.2'
curioJavaVersion = '0.4.0'
// App dependencies // App dependencies
supportLibraryVersion = '25.2.0' supportLibraryVersion = '25.2.0'
//gsonVersion = '2.8.0' //gsonVersion = '2.8.0'
...@@ -39,8 +44,8 @@ ext { ...@@ -39,8 +44,8 @@ ext {
//rx2AndroidNetworking = '0.0.1' //rx2AndroidNetworking = '0.0.1'
dagger2Version = '2.8' dagger2Version = '2.8'
//rxjava2Version = '2.0.5' rxjava2Version = '2.0.5'
//rxandroidVersion = '2.0.1' rxandroidVersion = '2.0.1'
butterKnifeVersion = '8.5.1' butterKnifeVersion = '8.5.1'
// greenDaoVersion = '3.2.0' // greenDaoVersion = '3.2.0'
// placeholderviewVersion = '0.6.1' // placeholderviewVersion = '0.6.1'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment