Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
android-mvp
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Marcus Sales
android-mvp
Commits
8b7d1c44
Commit
8b7d1c44
authored
Mar 02, 2017
by
Isaac Pereira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adicionando dependências do RxJava e RxAndroid e CurioJava
parent
93243f7f
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
60 additions
and
30 deletions
+60
-30
build.gradle
app/build.gradle
+7
-2
MvpApp.java
app/src/main/java/br/com/evologica/mvp/MvpApp.java
+0
-5
AppDataManager.java
...c/main/java/br/com/evologica/mvp/data/AppDataManager.java
+10
-1
DataManager.java
app/src/main/java/br/com/evologica/mvp/data/DataManager.java
+4
-0
ActivityModule.java
...n/java/br/com/evologica/mvp/di/module/ActivityModule.java
+6
-0
ApplicationModule.java
...ava/br/com/evologica/mvp/di/module/ApplicationModule.java
+7
-0
BasePresenter.java
...main/java/br/com/evologica/mvp/ui/base/BasePresenter.java
+9
-5
LoginPresenter.java
...in/java/br/com/evologica/mvp/ui/login/LoginPresenter.java
+3
-2
MainPresenter.java
...main/java/br/com/evologica/mvp/ui/main/MainPresenter.java
+3
-6
SplashPresenter.java
.../java/br/com/evologica/mvp/ui/splash/SplashPresenter.java
+3
-6
build.gradle
build.gradle
+8
-3
No files found.
app/build.gradle
View file @
8b7d1c44
...
...
@@ -31,6 +31,8 @@ dependencies {
compile
"com.android.support:support-vector-drawable:$rootProject.supportLibraryVersion"
compile
"com.android.support:animated-vector-drawable:$rootProject.supportLibraryVersion"
compile
"br.com.evologica:curio-java:$rootProject.curioJavaVersion"
// font
compile
"uk.co.chrisjenx:calligraphy:$rootProject.calligraphyVersion"
...
...
@@ -49,8 +51,8 @@ dependencies {
compile
'javax.inject:javax.inject:1'
//
// // reactive
//
compile "io.reactivex.rxjava2:rxjava:$rootProject.rxjava2Version"
//
compile "io.reactivex.rxjava2:rxandroid:$rootProject.rxandroidVersion"
compile
"io.reactivex.rxjava2:rxjava:$rootProject.rxjava2Version"
compile
"io.reactivex.rxjava2:rxandroid:$rootProject.rxandroidVersion"
//
// // code generator for view
compile
"com.jakewharton:butterknife:$rootProject.butterKnifeVersion"
...
...
@@ -76,4 +78,7 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})
testCompile 'junit:junit:4.12'*/
}
app/src/main/java/br/com/evologica/mvp/MvpApp.java
View file @
8b7d1c44
...
...
@@ -30,11 +30,6 @@ public class MvpApp extends Application {
//AppDataManager.initInstance(this);
/* CalligraphyConfig.initDefault(new CalligraphyConfig.Builder()
.setDefaultFontPath("fonts/source-sans-pro/SourceSansPro-Regular.ttf")
.setFontAttrId(R.attr.fontPath)
.build());*/
mApplicationComponent
=
DaggerApplicationComponent
.
builder
()
.
applicationModule
(
new
ApplicationModule
(
this
)).
build
();
...
...
app/src/main/java/br/com/evologica/mvp/data/AppDataManager.java
View file @
8b7d1c44
...
...
@@ -5,6 +5,7 @@ import android.content.Context;
import
javax.inject.Inject
;
import
javax.inject.Singleton
;
import
br.com.evologica.curio.Service
;
import
br.com.evologica.mvp.data.prefs.PreferencesHelper
;
import
br.com.evologica.mvp.di.ApplicationContext
;
...
...
@@ -19,15 +20,23 @@ public class AppDataManager implements DataManager {
private
final
Context
mContext
;
private
final
PreferencesHelper
mPreferencesHelper
;
private
final
Service
mService
;
@Inject
public
AppDataManager
(
@ApplicationContext
Context
ctx
,
PreferencesHelper
preferencesHelper
)
{
PreferencesHelper
preferencesHelper
,
Service
service
)
{
mContext
=
ctx
;
mPreferencesHelper
=
preferencesHelper
;
mService
=
service
;
}
@Override
public
Service
getService
()
{
return
mService
;
}
@Override
public
void
setLoggedIn
()
{
mPreferencesHelper
.
setLoggedIn
();
...
...
app/src/main/java/br/com/evologica/mvp/data/DataManager.java
View file @
8b7d1c44
package
br
.
com
.
evologica
.
mvp
.
data
;
import
br.com.evologica.curio.Service
;
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
{
Service
getService
();
}
app/src/main/java/br/com/evologica/mvp/di/module/ActivityModule.java
View file @
8b7d1c44
...
...
@@ -16,6 +16,7 @@ import br.com.evologica.mvp.ui.splash.SplashMvpView;
import
br.com.evologica.mvp.ui.splash.SplashPresenter
;
import
dagger.Module
;
import
dagger.Provides
;
import
io.reactivex.disposables.CompositeDisposable
;
/**
* Created by marcussales on 02/03/2017.
...
...
@@ -41,6 +42,11 @@ public class ActivityModule {
return
mActivity
;
}
@Provides
CompositeDisposable
provideCompositeDisposable
()
{
return
new
CompositeDisposable
();
}
@Provides
@PerActivity
SplashMvpPresenter
<
SplashMvpView
>
provideSplashPresenter
(
SplashPresenter
<
SplashMvpView
>
presenter
){
...
...
app/src/main/java/br/com/evologica/mvp/di/module/ApplicationModule.java
View file @
8b7d1c44
...
...
@@ -5,6 +5,7 @@ import android.content.Context;
import
javax.inject.Singleton
;
import
br.com.evologica.curio.Service
;
import
br.com.evologica.mvp.R
;
import
br.com.evologica.mvp.data.AppDataManager
;
import
br.com.evologica.mvp.data.DataManager
;
...
...
@@ -67,4 +68,10 @@ public class ApplicationModule {
.
build
();
}
@Provides
@Singleton
Service
provideCurioService
()
{
return
new
Service
(
"CentralBonus"
,
"192.168.0.34"
,
"6161"
,
"72"
);
}
}
app/src/main/java/br/com/evologica/mvp/ui/base/BasePresenter.java
View file @
8b7d1c44
...
...
@@ -3,20 +3,19 @@ package br.com.evologica.mvp.ui.base;
import
javax.inject.Inject
;
import
br.com.evologica.mvp.data.DataManager
;
/**
* Created by marcussales on 01/03/2017.
*/
import
io.reactivex.disposables.CompositeDisposable
;
public
class
BasePresenter
<
V
extends
MvpView
>
implements
MvpPresenter
<
V
>
{
private
V
mMvpView
;
private
final
DataManager
mDataManager
;
private
final
CompositeDisposable
mCompositeDisposable
;
@Inject
public
BasePresenter
(
DataManager
mDataManager
)
{
public
BasePresenter
(
DataManager
mDataManager
,
CompositeDisposable
mCompositeDisposable
)
{
this
.
mDataManager
=
mDataManager
;
this
.
mCompositeDisposable
=
mCompositeDisposable
;
}
public
V
getMvpView
()
{
...
...
@@ -36,4 +35,9 @@ public class BasePresenter<V extends MvpView> implements MvpPresenter<V> {
public
DataManager
getDataManager
()
{
return
mDataManager
;
}
public
CompositeDisposable
getCompositeDisposable
()
{
return
mCompositeDisposable
;
}
}
app/src/main/java/br/com/evologica/mvp/ui/login/LoginPresenter.java
View file @
8b7d1c44
...
...
@@ -4,6 +4,7 @@ import javax.inject.Inject;
import
br.com.evologica.mvp.data.DataManager
;
import
br.com.evologica.mvp.ui.base.BasePresenter
;
import
io.reactivex.disposables.CompositeDisposable
;
/**
* Created by marcussales on 01/03/2017.
...
...
@@ -14,8 +15,8 @@ public class LoginPresenter<V extends LoginMvpView> extends BasePresenter<V> imp
private
static
final
String
TAG
=
"LoginPresenter"
;
@Inject
public
LoginPresenter
(
DataManager
dataManager
)
{
super
(
dataManager
);
public
LoginPresenter
(
DataManager
dataManager
,
CompositeDisposable
compositeDisposable
)
{
super
(
dataManager
,
compositeDisposable
);
}
@Override
...
...
app/src/main/java/br/com/evologica/mvp/ui/main/MainPresenter.java
View file @
8b7d1c44
...
...
@@ -4,16 +4,13 @@ import javax.inject.Inject;
import
br.com.evologica.mvp.data.DataManager
;
import
br.com.evologica.mvp.ui.base.BasePresenter
;
/**
* Created by marcussales on 01/03/2017.
*/
import
io.reactivex.disposables.CompositeDisposable
;
public
class
MainPresenter
<
V
extends
MainMvpView
>
extends
BasePresenter
<
V
>
implements
MainMvpPresenter
<
V
>
{
@Inject
public
MainPresenter
(
DataManager
dataManager
)
{
super
(
dataManager
);
public
MainPresenter
(
DataManager
dataManager
,
CompositeDisposable
compositeDisposable
)
{
super
(
dataManager
,
compositeDisposable
);
}
@Override
...
...
app/src/main/java/br/com/evologica/mvp/ui/splash/SplashPresenter.java
View file @
8b7d1c44
...
...
@@ -4,16 +4,13 @@ import javax.inject.Inject;
import
br.com.evologica.mvp.data.DataManager
;
import
br.com.evologica.mvp.ui.base.BasePresenter
;
/**
* Created by marcussales on 01/03/2017.
*/
import
io.reactivex.disposables.CompositeDisposable
;
public
class
SplashPresenter
<
V
extends
SplashMvpView
>
extends
BasePresenter
<
V
>
implements
SplashMvpPresenter
<
V
>
{
@Inject
public
SplashPresenter
(
DataManager
dataManager
)
{
super
(
dataManager
);
public
SplashPresenter
(
DataManager
dataManager
,
CompositeDisposable
compositeDisposable
)
{
super
(
dataManager
,
compositeDisposable
);
}
@Override
...
...
build.gradle
View file @
8b7d1c44
...
...
@@ -16,6 +16,9 @@ buildscript {
allprojects
{
repositories
{
jcenter
()
maven
{
url
'http://nexus.conexops.com.br/repository/maven-releases/'
}
}
}
...
...
@@ -31,6 +34,8 @@ ext {
compileSdkVersion
=
25
buildToolsVersion
=
'25.0.2'
curioJavaVersion
=
'0.4.0'
// App dependencies
supportLibraryVersion
=
'25.2.0'
//gsonVersion = '2.8.0'
...
...
@@ -38,9 +43,9 @@ ext {
//rx2AndroidNetworking = '0.0.1'
dagger2Version
=
'2.8'
//
rxjava2Version = '2.0.5'
//
rxandroidVersion = '2.0.1'
dagger2Version
=
'2.8'
rxjava2Version
=
'2.0.5'
rxandroidVersion
=
'2.0.1'
butterKnifeVersion
=
'8.5.1'
// greenDaoVersion = '3.2.0'
// placeholderviewVersion = '0.6.1'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment