diff --git a/app/src/androidTest/java/frogermcs/io/githubclient/inject/ApplicationMock.java b/app/src/androidTest/java/frogermcs/io/githubclient/inject/ApplicationMock.java index 0533059..9c3f351 100644 --- a/app/src/androidTest/java/frogermcs/io/githubclient/inject/ApplicationMock.java +++ b/app/src/androidTest/java/frogermcs/io/githubclient/inject/ApplicationMock.java @@ -1,7 +1,7 @@ package frogermcs.io.githubclient.inject; -import frogermcs.io.githubclient.AppComponent; -import frogermcs.io.githubclient.AppModule; +import frogermcs.io.githubclient.dependencyinjection.components.AppComponent; +import frogermcs.io.githubclient.dependencyinjection.modules.AppModule; import frogermcs.io.githubclient.DaggerAppComponent; import frogermcs.io.githubclient.GithubClientApplication; import frogermcs.io.githubclient.data.api.GithubApiModule; diff --git a/app/src/main/java/frogermcs/io/githubclient/GithubClientApplication.java b/app/src/main/java/frogermcs/io/githubclient/GithubClientApplication.java index 9830287..e27b386 100644 --- a/app/src/main/java/frogermcs/io/githubclient/GithubClientApplication.java +++ b/app/src/main/java/frogermcs/io/githubclient/GithubClientApplication.java @@ -2,12 +2,14 @@ import android.app.Application; import android.content.Context; -import android.support.annotation.VisibleForTesting; import com.frogermcs.dagger2metrics.Dagger2Metrics; -import frogermcs.io.githubclient.data.UserComponent; -import frogermcs.io.githubclient.data.api.UserModule; +import frogermcs.io.githubclient.dependencyinjection.components.AppComponent; +import frogermcs.io.githubclient.dependencyinjection.components.DaggerAppComponent; +import frogermcs.io.githubclient.dependencyinjection.components.UserComponent; +import frogermcs.io.githubclient.dependencyinjection.modules.AppModule; +import frogermcs.io.githubclient.dependencyinjection.modules.UserModule; import frogermcs.io.githubclient.data.model.User; import timber.log.Timber; diff --git a/app/src/main/java/frogermcs/io/githubclient/data/UserComponent.java b/app/src/main/java/frogermcs/io/githubclient/data/UserComponent.java deleted file mode 100644 index 046bf53..0000000 --- a/app/src/main/java/frogermcs/io/githubclient/data/UserComponent.java +++ /dev/null @@ -1,26 +0,0 @@ -package frogermcs.io.githubclient.data; - -import dagger.Subcomponent; -import frogermcs.io.githubclient.data.api.UserModule; -import frogermcs.io.githubclient.ui.activity.component.RepositoriesListActivityComponent; -import frogermcs.io.githubclient.ui.activity.component.RepositoryDetailsActivityComponent; -import frogermcs.io.githubclient.ui.activity.component.SplashActivityComponent; -import frogermcs.io.githubclient.ui.activity.module.RepositoriesListActivityModule; -import frogermcs.io.githubclient.ui.activity.module.RepositoryDetailsActivityModule; -import frogermcs.io.githubclient.ui.activity.module.SplashActivityModule; - -/** - * Created by Miroslaw Stanek on 23.06.15. - */ -@UserScope -@Subcomponent( - modules = { - UserModule.class - } -) -public interface UserComponent { - - RepositoriesListActivityComponent plus(RepositoriesListActivityModule module); - - RepositoryDetailsActivityComponent plus(RepositoryDetailsActivityModule module); -} \ No newline at end of file diff --git a/app/src/main/java/frogermcs/io/githubclient/AppComponent.java b/app/src/main/java/frogermcs/io/githubclient/dependencyinjection/components/AppComponent.java similarity index 59% rename from app/src/main/java/frogermcs/io/githubclient/AppComponent.java rename to app/src/main/java/frogermcs/io/githubclient/dependencyinjection/components/AppComponent.java index 0abd9dc..d1fab16 100644 --- a/app/src/main/java/frogermcs/io/githubclient/AppComponent.java +++ b/app/src/main/java/frogermcs/io/githubclient/dependencyinjection/components/AppComponent.java @@ -1,13 +1,12 @@ -package frogermcs.io.githubclient; +package frogermcs.io.githubclient.dependencyinjection.components; import javax.inject.Singleton; import dagger.Component; +import frogermcs.io.githubclient.dependencyinjection.modules.AppModule; import frogermcs.io.githubclient.data.api.GithubApiModule; -import frogermcs.io.githubclient.data.UserComponent; -import frogermcs.io.githubclient.data.api.UserModule; -import frogermcs.io.githubclient.ui.activity.component.SplashActivityComponent; -import frogermcs.io.githubclient.ui.activity.module.SplashActivityModule; +import frogermcs.io.githubclient.dependencyinjection.modules.UserModule; +import frogermcs.io.githubclient.dependencyinjection.modules.SplashActivityModule; /** * Created by Miroslaw Stanek on 22.04.15. diff --git a/app/src/main/java/frogermcs/io/githubclient/ui/activity/component/RepositoriesListActivityComponent.java b/app/src/main/java/frogermcs/io/githubclient/dependencyinjection/components/RepositoriesListActivityComponent.java similarity index 56% rename from app/src/main/java/frogermcs/io/githubclient/ui/activity/component/RepositoriesListActivityComponent.java rename to app/src/main/java/frogermcs/io/githubclient/dependencyinjection/components/RepositoriesListActivityComponent.java index 6469cd1..593fcc6 100644 --- a/app/src/main/java/frogermcs/io/githubclient/ui/activity/component/RepositoriesListActivityComponent.java +++ b/app/src/main/java/frogermcs/io/githubclient/dependencyinjection/components/RepositoriesListActivityComponent.java @@ -1,10 +1,9 @@ -package frogermcs.io.githubclient.ui.activity.component; +package frogermcs.io.githubclient.dependencyinjection.components; import dagger.Subcomponent; -import frogermcs.io.githubclient.ui.activity.ActivityScope; +import frogermcs.io.githubclient.dependencyinjection.scopes.ActivityScope; import frogermcs.io.githubclient.ui.activity.RepositoriesListActivity; -import frogermcs.io.githubclient.ui.activity.module.RepositoriesListActivityModule; -import frogermcs.io.githubclient.ui.activity.presenter.RepositoriesListActivityPresenter; +import frogermcs.io.githubclient.dependencyinjection.modules.RepositoriesListActivityModule; /** * Created by Miroslaw Stanek on 23.04.15. diff --git a/app/src/main/java/frogermcs/io/githubclient/ui/activity/component/RepositoryDetailsActivityComponent.java b/app/src/main/java/frogermcs/io/githubclient/dependencyinjection/components/RepositoryDetailsActivityComponent.java similarity index 62% rename from app/src/main/java/frogermcs/io/githubclient/ui/activity/component/RepositoryDetailsActivityComponent.java rename to app/src/main/java/frogermcs/io/githubclient/dependencyinjection/components/RepositoryDetailsActivityComponent.java index 9835b21..9ad7234 100644 --- a/app/src/main/java/frogermcs/io/githubclient/ui/activity/component/RepositoryDetailsActivityComponent.java +++ b/app/src/main/java/frogermcs/io/githubclient/dependencyinjection/components/RepositoryDetailsActivityComponent.java @@ -1,9 +1,9 @@ -package frogermcs.io.githubclient.ui.activity.component; +package frogermcs.io.githubclient.dependencyinjection.components; import dagger.Subcomponent; -import frogermcs.io.githubclient.ui.activity.ActivityScope; +import frogermcs.io.githubclient.dependencyinjection.scopes.ActivityScope; import frogermcs.io.githubclient.ui.activity.RepositoryDetailsActivity; -import frogermcs.io.githubclient.ui.activity.module.RepositoryDetailsActivityModule; +import frogermcs.io.githubclient.dependencyinjection.modules.RepositoryDetailsActivityModule; /** * Created by Miroslaw Stanek on 23.04.15. diff --git a/app/src/main/java/frogermcs/io/githubclient/ui/activity/component/SplashActivityComponent.java b/app/src/main/java/frogermcs/io/githubclient/dependencyinjection/components/SplashActivityComponent.java similarity index 54% rename from app/src/main/java/frogermcs/io/githubclient/ui/activity/component/SplashActivityComponent.java rename to app/src/main/java/frogermcs/io/githubclient/dependencyinjection/components/SplashActivityComponent.java index 5331445..326b5ba 100644 --- a/app/src/main/java/frogermcs/io/githubclient/ui/activity/component/SplashActivityComponent.java +++ b/app/src/main/java/frogermcs/io/githubclient/dependencyinjection/components/SplashActivityComponent.java @@ -1,10 +1,9 @@ -package frogermcs.io.githubclient.ui.activity.component; +package frogermcs.io.githubclient.dependencyinjection.components; import dagger.Subcomponent; -import frogermcs.io.githubclient.ui.activity.ActivityScope; +import frogermcs.io.githubclient.dependencyinjection.scopes.ActivityScope; import frogermcs.io.githubclient.ui.activity.SplashActivity; -import frogermcs.io.githubclient.ui.activity.module.SplashActivityModule; -import frogermcs.io.githubclient.ui.activity.presenter.SplashActivityPresenter; +import frogermcs.io.githubclient.dependencyinjection.modules.SplashActivityModule; /** * Created by Miroslaw Stanek on 23.04.15. diff --git a/app/src/main/java/frogermcs/io/githubclient/dependencyinjection/components/UserComponent.java b/app/src/main/java/frogermcs/io/githubclient/dependencyinjection/components/UserComponent.java new file mode 100644 index 0000000..b82fb0d --- /dev/null +++ b/app/src/main/java/frogermcs/io/githubclient/dependencyinjection/components/UserComponent.java @@ -0,0 +1,23 @@ +package frogermcs.io.githubclient.dependencyinjection.components; + +import dagger.Subcomponent; +import frogermcs.io.githubclient.dependencyinjection.scopes.UserScope; +import frogermcs.io.githubclient.dependencyinjection.modules.UserModule; +import frogermcs.io.githubclient.dependencyinjection.modules.RepositoriesListActivityModule; +import frogermcs.io.githubclient.dependencyinjection.modules.RepositoryDetailsActivityModule; + +/** + * Created by Miroslaw Stanek on 23.06.15. + */ +@UserScope +@Subcomponent( + modules = { + UserModule.class + } +) +public interface UserComponent { + + RepositoriesListActivityComponent plus(RepositoriesListActivityModule module); + + RepositoryDetailsActivityComponent plus(RepositoryDetailsActivityModule module); +} \ No newline at end of file diff --git a/app/src/main/java/frogermcs/io/githubclient/AppModule.java b/app/src/main/java/frogermcs/io/githubclient/dependencyinjection/modules/AppModule.java similarity index 87% rename from app/src/main/java/frogermcs/io/githubclient/AppModule.java rename to app/src/main/java/frogermcs/io/githubclient/dependencyinjection/modules/AppModule.java index 9bf6eac..3b73d14 100644 --- a/app/src/main/java/frogermcs/io/githubclient/AppModule.java +++ b/app/src/main/java/frogermcs/io/githubclient/dependencyinjection/modules/AppModule.java @@ -1,4 +1,4 @@ -package frogermcs.io.githubclient; +package frogermcs.io.githubclient.dependencyinjection.modules; import android.app.Application; @@ -6,6 +6,8 @@ import dagger.Module; import dagger.Provides; +import frogermcs.io.githubclient.HeavyExternalLibrary; +import frogermcs.io.githubclient.HeavyLibraryWrapper; import frogermcs.io.githubclient.utils.AnalyticsManager; import frogermcs.io.githubclient.utils.Validator; diff --git a/app/src/main/java/frogermcs/io/githubclient/ui/activity/module/RepositoriesListActivityModule.java b/app/src/main/java/frogermcs/io/githubclient/dependencyinjection/modules/RepositoriesListActivityModule.java similarity index 85% rename from app/src/main/java/frogermcs/io/githubclient/ui/activity/module/RepositoriesListActivityModule.java rename to app/src/main/java/frogermcs/io/githubclient/dependencyinjection/modules/RepositoriesListActivityModule.java index 83d463c..eeed2dd 100644 --- a/app/src/main/java/frogermcs/io/githubclient/ui/activity/module/RepositoriesListActivityModule.java +++ b/app/src/main/java/frogermcs/io/githubclient/dependencyinjection/modules/RepositoriesListActivityModule.java @@ -1,12 +1,11 @@ -package frogermcs.io.githubclient.ui.activity.module; +package frogermcs.io.githubclient.dependencyinjection.modules; import dagger.Module; import dagger.Provides; import frogermcs.io.githubclient.data.api.RepositoriesManager; -import frogermcs.io.githubclient.ui.activity.ActivityScope; +import frogermcs.io.githubclient.dependencyinjection.scopes.ActivityScope; import frogermcs.io.githubclient.ui.activity.RepositoriesListActivity; import frogermcs.io.githubclient.ui.activity.presenter.RepositoriesListActivityPresenter; -import frogermcs.io.githubclient.utils.AnalyticsManager; /** * Created by Miroslaw Stanek on 23.04.15. diff --git a/app/src/main/java/frogermcs/io/githubclient/ui/activity/module/RepositoryDetailsActivityModule.java b/app/src/main/java/frogermcs/io/githubclient/dependencyinjection/modules/RepositoryDetailsActivityModule.java similarity index 87% rename from app/src/main/java/frogermcs/io/githubclient/ui/activity/module/RepositoryDetailsActivityModule.java rename to app/src/main/java/frogermcs/io/githubclient/dependencyinjection/modules/RepositoryDetailsActivityModule.java index 0dfc078..d2e191b 100644 --- a/app/src/main/java/frogermcs/io/githubclient/ui/activity/module/RepositoryDetailsActivityModule.java +++ b/app/src/main/java/frogermcs/io/githubclient/dependencyinjection/modules/RepositoryDetailsActivityModule.java @@ -1,9 +1,9 @@ -package frogermcs.io.githubclient.ui.activity.module; +package frogermcs.io.githubclient.dependencyinjection.modules; import dagger.Module; import dagger.Provides; import frogermcs.io.githubclient.data.model.User; -import frogermcs.io.githubclient.ui.activity.ActivityScope; +import frogermcs.io.githubclient.dependencyinjection.scopes.ActivityScope; import frogermcs.io.githubclient.ui.activity.RepositoryDetailsActivity; import frogermcs.io.githubclient.ui.activity.presenter.RepositoryDetailsActivityPresenter; diff --git a/app/src/main/java/frogermcs/io/githubclient/ui/activity/module/SplashActivityModule.java b/app/src/main/java/frogermcs/io/githubclient/dependencyinjection/modules/SplashActivityModule.java similarity index 85% rename from app/src/main/java/frogermcs/io/githubclient/ui/activity/module/SplashActivityModule.java rename to app/src/main/java/frogermcs/io/githubclient/dependencyinjection/modules/SplashActivityModule.java index 94e13a4..0260a57 100644 --- a/app/src/main/java/frogermcs/io/githubclient/ui/activity/module/SplashActivityModule.java +++ b/app/src/main/java/frogermcs/io/githubclient/dependencyinjection/modules/SplashActivityModule.java @@ -1,11 +1,10 @@ -package frogermcs.io.githubclient.ui.activity.module; +package frogermcs.io.githubclient.dependencyinjection.modules; import dagger.Module; import dagger.Provides; -import frogermcs.io.githubclient.HeavyExternalLibrary; import frogermcs.io.githubclient.HeavyLibraryWrapper; import frogermcs.io.githubclient.data.api.UserManager; -import frogermcs.io.githubclient.ui.activity.ActivityScope; +import frogermcs.io.githubclient.dependencyinjection.scopes.ActivityScope; import frogermcs.io.githubclient.ui.activity.SplashActivity; import frogermcs.io.githubclient.ui.activity.presenter.SplashActivityPresenter; import frogermcs.io.githubclient.utils.Validator; diff --git a/app/src/main/java/frogermcs/io/githubclient/data/api/UserModule.java b/app/src/main/java/frogermcs/io/githubclient/dependencyinjection/modules/UserModule.java similarity index 68% rename from app/src/main/java/frogermcs/io/githubclient/data/api/UserModule.java rename to app/src/main/java/frogermcs/io/githubclient/dependencyinjection/modules/UserModule.java index c1b726b..7e76c95 100644 --- a/app/src/main/java/frogermcs/io/githubclient/data/api/UserModule.java +++ b/app/src/main/java/frogermcs/io/githubclient/dependencyinjection/modules/UserModule.java @@ -1,8 +1,10 @@ -package frogermcs.io.githubclient.data.api; +package frogermcs.io.githubclient.dependencyinjection.modules; import dagger.Module; import dagger.Provides; -import frogermcs.io.githubclient.data.UserScope; +import frogermcs.io.githubclient.dependencyinjection.scopes.UserScope; +import frogermcs.io.githubclient.data.api.GithubApiService; +import frogermcs.io.githubclient.data.api.RepositoriesManager; import frogermcs.io.githubclient.data.model.User; /** diff --git a/app/src/main/java/frogermcs/io/githubclient/ui/activity/ActivityScope.java b/app/src/main/java/frogermcs/io/githubclient/dependencyinjection/scopes/ActivityScope.java similarity index 66% rename from app/src/main/java/frogermcs/io/githubclient/ui/activity/ActivityScope.java rename to app/src/main/java/frogermcs/io/githubclient/dependencyinjection/scopes/ActivityScope.java index a6ecab7..1965269 100644 --- a/app/src/main/java/frogermcs/io/githubclient/ui/activity/ActivityScope.java +++ b/app/src/main/java/frogermcs/io/githubclient/dependencyinjection/scopes/ActivityScope.java @@ -1,4 +1,4 @@ -package frogermcs.io.githubclient.ui.activity; +package frogermcs.io.githubclient.dependencyinjection.scopes; import javax.inject.Scope; diff --git a/app/src/main/java/frogermcs/io/githubclient/data/UserScope.java b/app/src/main/java/frogermcs/io/githubclient/dependencyinjection/scopes/UserScope.java similarity index 79% rename from app/src/main/java/frogermcs/io/githubclient/data/UserScope.java rename to app/src/main/java/frogermcs/io/githubclient/dependencyinjection/scopes/UserScope.java index f68b24f..695236d 100644 --- a/app/src/main/java/frogermcs/io/githubclient/data/UserScope.java +++ b/app/src/main/java/frogermcs/io/githubclient/dependencyinjection/scopes/UserScope.java @@ -1,4 +1,4 @@ -package frogermcs.io.githubclient.data; +package frogermcs.io.githubclient.dependencyinjection.scopes; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/app/src/main/java/frogermcs/io/githubclient/ui/activity/BaseActivity.java b/app/src/main/java/frogermcs/io/githubclient/ui/activity/BaseActivity.java index b00bc17..7c92168 100644 --- a/app/src/main/java/frogermcs/io/githubclient/ui/activity/BaseActivity.java +++ b/app/src/main/java/frogermcs/io/githubclient/ui/activity/BaseActivity.java @@ -3,9 +3,6 @@ import android.os.Bundle; import android.support.v7.app.AppCompatActivity; -import frogermcs.io.githubclient.AppComponent; -import frogermcs.io.githubclient.GithubClientApplication; - /** * Created by Miroslaw Stanek on 23.04.15. */ diff --git a/app/src/main/java/frogermcs/io/githubclient/ui/activity/RepositoriesListActivity.java b/app/src/main/java/frogermcs/io/githubclient/ui/activity/RepositoriesListActivity.java index a6893ef..a4422bc 100644 --- a/app/src/main/java/frogermcs/io/githubclient/ui/activity/RepositoriesListActivity.java +++ b/app/src/main/java/frogermcs/io/githubclient/ui/activity/RepositoriesListActivity.java @@ -17,7 +17,7 @@ import frogermcs.io.githubclient.GithubClientApplication; import frogermcs.io.githubclient.R; import frogermcs.io.githubclient.data.model.Repository; -import frogermcs.io.githubclient.ui.activity.module.RepositoriesListActivityModule; +import frogermcs.io.githubclient.dependencyinjection.modules.RepositoriesListActivityModule; import frogermcs.io.githubclient.ui.activity.presenter.RepositoriesListActivityPresenter; import frogermcs.io.githubclient.ui.adapter.RepositoriesListAdapter; import frogermcs.io.githubclient.utils.AnalyticsManager; diff --git a/app/src/main/java/frogermcs/io/githubclient/ui/activity/RepositoryDetailsActivity.java b/app/src/main/java/frogermcs/io/githubclient/ui/activity/RepositoryDetailsActivity.java index 0e5b460..af79c43 100644 --- a/app/src/main/java/frogermcs/io/githubclient/ui/activity/RepositoryDetailsActivity.java +++ b/app/src/main/java/frogermcs/io/githubclient/ui/activity/RepositoryDetailsActivity.java @@ -12,7 +12,7 @@ import frogermcs.io.githubclient.GithubClientApplication; import frogermcs.io.githubclient.R; import frogermcs.io.githubclient.data.model.Repository; -import frogermcs.io.githubclient.ui.activity.module.RepositoryDetailsActivityModule; +import frogermcs.io.githubclient.dependencyinjection.modules.RepositoryDetailsActivityModule; import frogermcs.io.githubclient.ui.activity.presenter.RepositoryDetailsActivityPresenter; import frogermcs.io.githubclient.utils.AnalyticsManager; diff --git a/app/src/main/java/frogermcs/io/githubclient/ui/activity/SplashActivity.java b/app/src/main/java/frogermcs/io/githubclient/ui/activity/SplashActivity.java index 069feb5..6aa1705 100644 --- a/app/src/main/java/frogermcs/io/githubclient/ui/activity/SplashActivity.java +++ b/app/src/main/java/frogermcs/io/githubclient/ui/activity/SplashActivity.java @@ -2,7 +2,6 @@ import android.content.Intent; import android.os.Bundle; -import android.os.Debug; import android.view.View; import android.widget.Button; import android.widget.EditText; @@ -19,7 +18,7 @@ import frogermcs.io.githubclient.GithubClientApplication; import frogermcs.io.githubclient.R; import frogermcs.io.githubclient.data.model.User; -import frogermcs.io.githubclient.ui.activity.module.SplashActivityModule; +import frogermcs.io.githubclient.dependencyinjection.modules.SplashActivityModule; import frogermcs.io.githubclient.ui.activity.presenter.SplashActivityPresenter; import frogermcs.io.githubclient.utils.AnalyticsManager; import rx.Subscription; diff --git a/app/src/main/java/frogermcs/io/githubclient/utils/AnalyticsManager.java b/app/src/main/java/frogermcs/io/githubclient/utils/AnalyticsManager.java index 713e62a..9e5b2c4 100644 --- a/app/src/main/java/frogermcs/io/githubclient/utils/AnalyticsManager.java +++ b/app/src/main/java/frogermcs/io/githubclient/utils/AnalyticsManager.java @@ -2,11 +2,6 @@ import android.app.Application; -import javax.inject.Inject; -import javax.inject.Singleton; - -import frogermcs.io.githubclient.data.UserScope; -import frogermcs.io.githubclient.ui.activity.ActivityScope; import timber.log.Timber; /**