Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rearranging the project to have Dependency Injection in one place #12

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Rearranging the project to have Dependency Injection in one place #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/androidTest/java/frogermcs/io/githubclient/inject/ApplicationMock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
8 changes: 5 additions & 3 deletions app/src/main/java/frogermcs/io/githubclient/GithubClientApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
26 changes: 0 additions & 26 deletions app/src/main/java/frogermcs/io/githubclient/data/UserComponent.java
View file
Open in desktop

This file was deleted.

9 changes: 4 additions & 5 deletions ...ogermcs/io/githubclient/AppComponent.java → ...ncyinjection/components/AppComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
7 changes: 3 additions & 4 deletions ...nt/RepositoriesListActivityComponent.java → ...ts/RepositoriesListActivityComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
6 changes: 3 additions & 3 deletions ...t/RepositoryDetailsActivityComponent.java → ...s/RepositoryDetailsActivityComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
7 changes: 3 additions & 4 deletions ...ty/component/SplashActivityComponent.java → ...n/components/SplashActivityComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
23 changes: 23 additions & 0 deletions ...src/main/java/frogermcs/io/githubclient/dependencyinjection/components/UserComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
}
4 changes: 3 additions & 1 deletion .../frogermcs/io/githubclient/AppModule.java → ...ependencyinjection/modules/AppModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package frogermcs.io.githubclient;
package frogermcs.io.githubclient.dependencyinjection.modules;

import android.app.Application;

import javax.inject.Singleton;

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;

Expand Down
5 changes: 2 additions & 3 deletions ...odule/RepositoriesListActivityModule.java → ...dules/RepositoriesListActivityModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions ...dule/RepositoryDetailsActivityModule.java → ...ules/RepositoryDetailsActivityModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
5 changes: 2 additions & 3 deletions ...activity/module/SplashActivityModule.java → ...jection/modules/SplashActivityModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 4 additions & 2 deletions .../io/githubclient/data/api/UserModule.java → ...pendencyinjection/modules/UserModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...thubclient/ui/activity/ActivityScope.java → ...ndencyinjection/scopes/ActivityScope.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package frogermcs.io.githubclient.ui.activity;
package frogermcs.io.githubclient.dependencyinjection.scopes;

import javax.inject.Scope;

Expand Down
2 changes: 1 addition & 1 deletion ...ermcs/io/githubclient/data/UserScope.java → ...dependencyinjection/scopes/UserScope.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/java/frogermcs/io/githubclient/ui/activity/BaseActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/frogermcs/io/githubclient/ui/activity/RepositoriesListActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/frogermcs/io/githubclient/ui/activity/RepositoryDetailsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/frogermcs/io/githubclient/ui/activity/SplashActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
5 changes: 0 additions & 5 deletions app/src/main/java/frogermcs/io/githubclient/utils/AnalyticsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down