Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move dagger classes to injection directory

Browse Source
This commit is contained in:
inorichi 2015-10-21 21:04:10 +02:00
parent 57290a5395
commit 38c6fac385
7 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/eu/kanade/mangafeed/App.java
View File

@ -5,6 +5,10 @@ import android.content.Context;
import org.acra.annotation.ReportsCrashes; import org.acra.annotation.ReportsCrashes;
import eu.kanade.mangafeed.injection.component.AppComponent;
import eu.kanade.mangafeed.injection.module.AppModule;
import eu.kanade.mangafeed.injection.ComponentReflectionInjector;
import eu.kanade.mangafeed.injection.component.DaggerAppComponent;
import timber.log.Timber; import timber.log.Timber;
@ReportsCrashes( @ReportsCrashes(
@ -46,14 +50,6 @@ public class App extends Application {
return mComponentInjector; return mComponentInjector;
} }
public static ComponentReflectionInjector<AppComponent> getComponentReflection(Context context) {
return get(context).getComponentReflection();
}
public static AppComponent getComponent(Context context) {
return get(context).getComponent();
}
// Needed to replace the component with a test specific one // Needed to replace the component with a test specific one
public void setComponent(AppComponent applicationComponent) { public void setComponent(AppComponent applicationComponent) {
mApplicationComponent = applicationComponent; mApplicationComponent = applicationComponent;

2
app/src/main/java/eu/kanade/mangafeed/ComponentReflectionInjector.java → app/src/main/java/eu/kanade/mangafeed/injection/ComponentReflectionInjector.java
View File

@ -1,4 +1,4 @@
package eu.kanade.mangafeed; package eu.kanade.mangafeed.injection;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.HashMap; import java.util.HashMap;

5
app/src/main/java/eu/kanade/mangafeed/AppComponent.java → app/src/main/java/eu/kanade/mangafeed/injection/component/AppComponent.java
View File

@ -1,11 +1,12 @@
package eu.kanade.mangafeed; package eu.kanade.mangafeed.injection.component;
import android.app.Application; import android.app.Application;
import javax.inject.Singleton; import javax.inject.Singleton;
import dagger.Component; import dagger.Component;
import eu.kanade.mangafeed.data.DataModule; import eu.kanade.mangafeed.injection.module.AppModule;
import eu.kanade.mangafeed.injection.module.DataModule;
import eu.kanade.mangafeed.presenter.CataloguePresenter; import eu.kanade.mangafeed.presenter.CataloguePresenter;
import eu.kanade.mangafeed.presenter.LibraryPresenter; import eu.kanade.mangafeed.presenter.LibraryPresenter;
import eu.kanade.mangafeed.presenter.MangaChaptersPresenter; import eu.kanade.mangafeed.presenter.MangaChaptersPresenter;

2
app/src/main/java/eu/kanade/mangafeed/AppModule.java → app/src/main/java/eu/kanade/mangafeed/injection/module/AppModule.java
View File

@ -1,4 +1,4 @@
package eu.kanade.mangafeed; package eu.kanade.mangafeed.injection.module;
import android.app.Application; import android.app.Application;

2
app/src/main/java/eu/kanade/mangafeed/data/DataModule.java → app/src/main/java/eu/kanade/mangafeed/injection/module/DataModule.java
View File

@ -1,4 +1,4 @@
package eu.kanade.mangafeed.data; package eu.kanade.mangafeed.injection.module;
import android.app.Application; import android.app.Application;

2
app/src/main/java/eu/kanade/mangafeed/ui/activity/base/BaseRxActivity.java
View File

@ -59,7 +59,7 @@ public abstract class BaseRxActivity<P extends Presenter> extends BaseActivity i
final PresenterFactory<P> superFactory = getPresenterFactory(); final PresenterFactory<P> superFactory = getPresenterFactory();
setPresenterFactory(() -> { setPresenterFactory(() -> {
P presenter = superFactory.createPresenter(); P presenter = superFactory.createPresenter();
App.getComponentReflection(getActivity()).inject(presenter); ((App)getApplication()).getComponentReflection().inject(presenter);
return presenter; return presenter;
}); });

2
app/src/main/java/eu/kanade/mangafeed/ui/fragment/base/BaseRxFragment.java
View File

@ -56,7 +56,7 @@ public abstract class BaseRxFragment<P extends Presenter> extends BaseFragment i
final PresenterFactory<P> superFactory = getPresenterFactory(); final PresenterFactory<P> superFactory = getPresenterFactory();
setPresenterFactory(() -> { setPresenterFactory(() -> {
P presenter = superFactory.createPresenter(); P presenter = superFactory.createPresenter();
App.getComponentReflection(getActivity()).inject(presenter); ((App)getActivity().getApplication()).getComponentReflection().inject(presenter);
return presenter; return presenter;
}); });