diff --git a/app/build.gradle b/app/build.gradle index 833decf..df6da1e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,8 +38,17 @@ dependencies { compile 'com.android.support:cardview-v7:25.3.1' //dagger - compile 'com.google.dagger:dagger:2.10' - annotationProcessor 'com.google.dagger:dagger-compiler:2.10' + + compile 'com.google.dagger:dagger:2.11' + compile 'com.google.dagger:dagger-android:2.11' + compile 'com.google.dagger:dagger-android-support:2.11' + annotationProcessor 'com.google.dagger:dagger-compiler:2.11' + annotationProcessor 'com.google.dagger:dagger-android-processor:2.11' + + /*compile 'com.google.dagger:dagger:2.11' + compile 'com.google.dagger:dagger-android:2.11' + compile 'com.google.dagger:dagger-android-support:2.11' + annotationProcessor 'com.google.dagger:dagger-compiler:2.11'*/ //rxjava compile 'io.reactivex.rxjava2:rxandroid:2.0.1' diff --git a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/TMDBApp.java b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/TMDBApp.java index 680e2cf..b3de430 100644 --- a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/TMDBApp.java +++ b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/TMDBApp.java @@ -1,19 +1,26 @@ package com.aac.andcun.themoviedb_mvvm; +import android.app.Activity; import android.app.Application; -import com.aac.andcun.themoviedb_mvvm.di.app.AppComponent; import com.aac.andcun.themoviedb_mvvm.di.app.AppModule; import com.aac.andcun.themoviedb_mvvm.di.app.DaggerAppComponent; import com.aac.andcun.themoviedb_mvvm.di.app.NetworkModule; +import javax.inject.Inject; + +import dagger.android.AndroidInjector; +import dagger.android.DispatchingAndroidInjector; +import dagger.android.HasActivityInjector; + /** * Created by cuneytcarikci on 24/07/2017. */ -public class TMDBApp extends Application { +public class TMDBApp extends Application implements HasActivityInjector { - private AppComponent appComponent; + @Inject + DispatchingAndroidInjector dispatchingAndroidInjector; @Override public void onCreate() { @@ -24,15 +31,18 @@ public void onCreate() { private void initAppComponent() { - appComponent = DaggerAppComponent.builder() + /*DaggerAppComponent + .builder() .appModule(new AppModule(this)) - .networkModule(new NetworkModule()).build(); - - appComponent.inject(this); + .networkModule(new NetworkModule()) + .build() + .inject(this);*/ } - public AppComponent getAppComponent() { - return appComponent; + @Override + public AndroidInjector activityInjector() { + return dispatchingAndroidInjector; } + } diff --git a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/app/ActivityBuilderModule.java b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/app/ActivityBuilderModule.java new file mode 100644 index 0000000..b97a2a1 --- /dev/null +++ b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/app/ActivityBuilderModule.java @@ -0,0 +1,22 @@ +package com.aac.andcun.themoviedb_mvvm.di.app; + +import com.aac.andcun.themoviedb_mvvm.ui.detail.MovieDetailActivity; +import com.aac.andcun.themoviedb_mvvm.ui.main.MainActivity; + +import dagger.Module; +import dagger.android.ContributesAndroidInjector; + +/** + * Created by andani on 19.09.2017. + */ + +@Module +public abstract class ActivityBuilderModule { + + @ContributesAndroidInjector(modules = FragmentBuilderModule.class) + abstract MainActivity mainActivity(); + + @ContributesAndroidInjector + abstract MovieDetailActivity movieDetailActivity(); + +} \ No newline at end of file diff --git a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/app/AppComponent.java b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/app/AppComponent.java index 4b55331..e4cff0d 100644 --- a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/app/AppComponent.java +++ b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/app/AppComponent.java @@ -1,26 +1,38 @@ package com.aac.andcun.themoviedb_mvvm.di.app; +import android.app.Application; import android.content.Context; + import com.aac.andcun.themoviedb_mvvm.TMDBApp; import com.aac.andcun.themoviedb_mvvm.repository.MovieRepository; import com.aac.andcun.themoviedb_mvvm.repository.TvRepository; import javax.inject.Singleton; + +import dagger.BindsInstance; import dagger.Component; +import dagger.android.AndroidInjectionModule; /** * Created by cuneytcarikci on 23/05/2017. */ @Singleton -@Component(modules = {AppModule.class, NetworkModule.class}) +@Component( + modules = { + AppModule.class, + AndroidInjectionModule.class, + ActivityBuilderModule.class + } +) public interface AppComponent { - Context context(); + @Component.Builder + interface Builder { - MovieRepository movieRepository(); + AppComponent build(); - TvRepository tvRepository(); + } void inject(TMDBApp app); diff --git a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/app/AppModule.java b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/app/AppModule.java index f4db59d..bbd72af 100644 --- a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/app/AppModule.java +++ b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/app/AppModule.java @@ -2,13 +2,25 @@ import android.app.Application; import android.content.Context; + +import com.aac.andcun.themoviedb_mvvm.api.TMDBService; +import com.aac.andcun.themoviedb_mvvm.repository.MovieRepository; +import com.aac.andcun.themoviedb_mvvm.repository.TvRepository; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import java.util.concurrent.TimeUnit; + import javax.inject.Singleton; import dagger.Module; import dagger.Provides; +import okhttp3.OkHttpClient; +import retrofit2.Retrofit; +import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory; +import retrofit2.converter.gson.GsonConverterFactory; + +import static com.aac.andcun.themoviedb_mvvm.api.ApiConstants.BASE_URL; /** * Created by cuneytcarikci on 23/05/2017. @@ -23,33 +35,42 @@ public AppModule(Application app) { this.app = app; } - @Provides - @Singleton - Application provideApplication() { - return app; + @Singleton @Provides + Gson provideGson() { + return new GsonBuilder().setDateFormat("yyyy-MM-dd").create(); } - @Provides - @Singleton - Context provideContext() { - return app.getApplicationContext(); + @Singleton @Provides + OkHttpClient provideOkHttpClient() { + return new OkHttpClient.Builder() + .connectTimeout(1, TimeUnit.MINUTES) + .readTimeout(1, TimeUnit.MINUTES) + .build(); } - @Provides - @Singleton - Gson provideGson() { - return new GsonBuilder().setDateFormat("yyyy-MM-dd").create(); + @Singleton @Provides + Retrofit provideRetrofit(OkHttpClient okHttpClient, Gson gson) { + return new Retrofit.Builder() + .baseUrl(BASE_URL) + .client(okHttpClient) + .addCallAdapterFactory(RxJava2CallAdapterFactory.create()) + .addConverterFactory(GsonConverterFactory.create(gson)) + .build(); + } + + @Singleton @Provides + TMDBService provideService(Retrofit retrofit) { + return retrofit.create(TMDBService.class); + } + + @Singleton @Provides + MovieRepository provideMovieRepository(TMDBService service) { + return new MovieRepository(service); } - /* @Provides - @Singleton - SharedPreferences providesSharedPreferences(Application application) { - return application.getSharedPreferences("the_movie_db_prefs", Context.MODE_PRIVATE); + @Singleton @Provides + TvRepository provideTvRepository(TMDBService service) { + return new TvRepository(service); } - @Provides - @Singleton - PreferencesHelper providePreferencesHelper(SharedPreferences preferences, Gson gson) { - return new PreferencesHelperImpl(preferences, gson); - }*/ -} +} \ No newline at end of file diff --git a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/app/FragmentBuilderModule.java b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/app/FragmentBuilderModule.java new file mode 100644 index 0000000..62d49cf --- /dev/null +++ b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/app/FragmentBuilderModule.java @@ -0,0 +1,30 @@ +package com.aac.andcun.themoviedb_mvvm.di.app; + +import com.aac.andcun.themoviedb_mvvm.ui.movie.MovieFragment; +import com.aac.andcun.themoviedb_mvvm.ui.movie.MoviePageFragment; +import com.aac.andcun.themoviedb_mvvm.ui.tv.TvFragment; +import com.aac.andcun.themoviedb_mvvm.ui.tv.TvPageFragment; + +import dagger.Module; +import dagger.android.ContributesAndroidInjector; + +/** + * Created by andani on 19.09.2017. + */ + +@Module +public abstract class FragmentBuilderModule { + + @ContributesAndroidInjector + abstract MovieFragment movieFragment(); + + @ContributesAndroidInjector + abstract MoviePageFragment moviePageFragment(); + + @ContributesAndroidInjector + abstract TvFragment tvFragment(); + + @ContributesAndroidInjector + abstract TvPageFragment tvPageFragment(); + +} \ No newline at end of file diff --git a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/app/NetworkModule.java b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/app/NetworkModule.java index 7d6782f..2ffe30f 100644 --- a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/app/NetworkModule.java +++ b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/app/NetworkModule.java @@ -27,50 +27,5 @@ public class NetworkModule { - @Provides - @Singleton - OkHttpClient provideOkHttpClient() { - return new OkHttpClient.Builder() - .connectTimeout(1, TimeUnit.MINUTES) - .readTimeout(1, TimeUnit.MINUTES) - .build(); - } - @Provides - @Singleton - Retrofit provideRetrofit(OkHttpClient okHttpClient, Gson gson) { - return new Retrofit.Builder() - .baseUrl(BASE_URL) - .client(okHttpClient) - .addCallAdapterFactory(RxJava2CallAdapterFactory.create()) - .addConverterFactory(GsonConverterFactory.create(gson)) - .build(); - } - - - @Provides - @Singleton - TMDBService provideService(Retrofit retrofit) { - return retrofit.create(TMDBService.class); - } - - - @Provides - @Singleton - MovieRepository provideMovieRepository(TMDBService service) { - return new MovieRepository(service); - } - - @Provides - @Singleton - TvRepository provideTvRepository(TMDBService service) { - return new TvRepository(service); - } -/* - @Provides - @Singleton - ApiSource provideApiSource(Retrofit retrofit) { - return new ApiSourceImpl(retrofit); - } - */ } diff --git a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/detail/DetailComponent.java b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/detail/DetailComponent.java deleted file mode 100644 index a96a26c..0000000 --- a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/detail/DetailComponent.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.aac.andcun.themoviedb_mvvm.di.detail; - -import com.aac.andcun.themoviedb_mvvm.di.PerActivity; -import com.aac.andcun.themoviedb_mvvm.di.app.AppComponent; -import com.aac.andcun.themoviedb_mvvm.ui.detail.MovieDetailActivity; - -import dagger.Component; - -/** - * Created by cuneytcarikci on 25/07/2017. - */ - -@Component(modules = DetailModule.class, dependencies = AppComponent.class) -@PerActivity -public interface DetailComponent { - - void inject(MovieDetailActivity activity); - -} diff --git a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/detail/DetailModule.java b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/detail/DetailModule.java deleted file mode 100644 index 3cfea04..0000000 --- a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/detail/DetailModule.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.aac.andcun.themoviedb_mvvm.di.detail; - -import dagger.Module; - -/** - * Created by cuneytcarikci on 25/07/2017. - */ - -@Module -public class DetailModule { - - -} diff --git a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/movie/MovieComponent.java b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/movie/MovieComponent.java deleted file mode 100644 index 0e4cb20..0000000 --- a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/movie/MovieComponent.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.aac.andcun.themoviedb_mvvm.di.movie; - -import com.aac.andcun.themoviedb_mvvm.di.PerFragment; -import com.aac.andcun.themoviedb_mvvm.di.app.AppComponent; -import com.aac.andcun.themoviedb_mvvm.ui.movie.MoviePageFragment; - -import dagger.Component; - -/** - * Created by cuneytcarikci on 25/07/2017. - */ - -@PerFragment -@Component(modules = MovieModule.class, dependencies = AppComponent.class) -public interface MovieComponent { - - void inject(MoviePageFragment fragment); - -} diff --git a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/movie/MovieModule.java b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/movie/MovieModule.java deleted file mode 100644 index e83dd14..0000000 --- a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/movie/MovieModule.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.aac.andcun.themoviedb_mvvm.di.movie; - -import com.aac.andcun.themoviedb_mvvm.di.PerFragment; - -import javax.inject.Singleton; - -import dagger.Module; -import dagger.Provides; - -/** - * Created by cuneytcarikci on 25/07/2017. - */ - -@Module -public class MovieModule { - - public MovieModule() { - } - - @Provides - @PerFragment - String provideDummyString(){ - return ""; - } - -} diff --git a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/tv/TvComponent.java b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/tv/TvComponent.java deleted file mode 100644 index a3e8064..0000000 --- a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/tv/TvComponent.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.aac.andcun.themoviedb_mvvm.di.tv; - -import com.aac.andcun.themoviedb_mvvm.di.PerFragment; -import com.aac.andcun.themoviedb_mvvm.di.app.AppComponent; -import com.aac.andcun.themoviedb_mvvm.ui.tv.TvPageFragment; - -import dagger.Component; - -/** - * Created by cuneytcarikci on 25/07/2017. - */ - -@Component(modules = TvModule.class,dependencies = AppComponent.class) -@PerFragment -public interface TvComponent { - - void inject(TvPageFragment tvPageFragment); - -} diff --git a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/tv/TvModule.java b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/tv/TvModule.java deleted file mode 100644 index 122196f..0000000 --- a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/di/tv/TvModule.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.aac.andcun.themoviedb_mvvm.di.tv; - -import com.aac.andcun.themoviedb_mvvm.di.PerFragment; - -import dagger.Module; -import dagger.Provides; - -/** - * Created by cuneytcarikci on 25/07/2017. - */ - -@Module -public class TvModule { - - public TvModule() { - } - - @Provides - @PerFragment - String provideDummyString(){ - return ""; - } -} diff --git a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/repository/TvRepository.java b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/repository/TvRepository.java index 39f20c2..dd28f95 100644 --- a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/repository/TvRepository.java +++ b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/repository/TvRepository.java @@ -7,7 +7,6 @@ import java.util.List; import java.util.Locale; -import java.util.function.Function; import javax.inject.Inject; diff --git a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/base/BaseActivity.java b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/base/BaseActivity.java index 4c56db2..6d29e82 100644 --- a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/base/BaseActivity.java +++ b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/base/BaseActivity.java @@ -5,29 +5,39 @@ import android.os.Bundle; import android.support.annotation.LayoutRes; import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; import android.support.v7.app.AppCompatActivity; -import com.aac.andcun.themoviedb_mvvm.TMDBApp; -import com.aac.andcun.themoviedb_mvvm.di.app.AppComponent; +import javax.inject.Inject; + +import dagger.android.AndroidInjection; +import dagger.android.AndroidInjector; +import dagger.android.DispatchingAndroidInjector; +import dagger.android.support.HasSupportFragmentInjector; /** * Created by cuneytcarikci on 24/07/2017. */ -public abstract class BaseActivity extends AppCompatActivity { +public abstract class BaseActivity extends AppCompatActivity implements HasSupportFragmentInjector { protected T binding; + @Inject + DispatchingAndroidInjector fragmentAndroidInjector; + @Override protected void onCreate(@Nullable Bundle savedInstanceState) { + AndroidInjection.inject(this); super.onCreate(savedInstanceState); binding = DataBindingUtil.setContentView(this,getLayoutId()); resolveDaggerDependency(); setUpUiComponents(); } - protected AppComponent getApplicationComponent() { - return ((TMDBApp) (getApplication())).getAppComponent(); + @Override + public AndroidInjector supportFragmentInjector() { + return fragmentAndroidInjector; } protected void resolveDaggerDependency() { @@ -38,4 +48,5 @@ protected void resolveDaggerDependency() { protected abstract int getLayoutId(); protected abstract void setUpUiComponents(); + } diff --git a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/base/BaseFragment.java b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/base/BaseFragment.java index 2bd79ac..bbeb9f1 100644 --- a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/base/BaseFragment.java +++ b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/base/BaseFragment.java @@ -14,6 +14,8 @@ import com.aac.andcun.themoviedb_mvvm.TMDBApp; import com.aac.andcun.themoviedb_mvvm.di.app.AppComponent; +import dagger.android.support.AndroidSupportInjection; + /** * Created by cuneytcarikci on 24/07/2017. */ @@ -22,6 +24,12 @@ public abstract class BaseFragment extends Fragment { protected T binding; + @Override + public void onCreate(@Nullable Bundle savedInstanceState) { + AndroidSupportInjection.inject(this); + super.onCreate(savedInstanceState); + } + @Nullable @Override public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { @@ -40,10 +48,6 @@ protected void resolveDaggerDependency() { } - protected AppComponent getAppComponent() { - return ((TMDBApp) ((Activity) getContext()).getApplication()).getAppComponent(); - } - @LayoutRes protected abstract int getLayoutId(); diff --git a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/common/MovieAdapter.java b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/common/MovieAdapter.java index 09d1dcc..41cb2c2 100644 --- a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/common/MovieAdapter.java +++ b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/common/MovieAdapter.java @@ -3,10 +3,8 @@ import android.databinding.ViewDataBinding; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; -import android.view.View; import android.view.ViewGroup; -import com.aac.andcun.themoviedb_mvvm.R; import com.aac.andcun.themoviedb_mvvm.databinding.ItemMovieBinding; import com.aac.andcun.themoviedb_mvvm.vo.ResultMovie; diff --git a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/detail/MovieDetailActivity.java b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/detail/MovieDetailActivity.java index c994af3..19f79c2 100644 --- a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/detail/MovieDetailActivity.java +++ b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/detail/MovieDetailActivity.java @@ -9,8 +9,6 @@ import com.aac.andcun.themoviedb_mvvm.R; import com.aac.andcun.themoviedb_mvvm.databinding.ActivityMovieDetailBinding; -import com.aac.andcun.themoviedb_mvvm.di.detail.DaggerDetailComponent; -import com.aac.andcun.themoviedb_mvvm.di.detail.DetailModule; import com.aac.andcun.themoviedb_mvvm.repository.MovieRepository; import com.aac.andcun.themoviedb_mvvm.ui.base.BaseActivity; import com.aac.andcun.themoviedb_mvvm.util.RxTransformer; @@ -111,10 +109,6 @@ protected void setUpUiComponents() { @Override protected void resolveDaggerDependency() { - DaggerDetailComponent.builder() - .appComponent(getApplicationComponent()) - .detailModule(new DetailModule()) - .build() - .inject(this); + } } diff --git a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/movie/MovieFragment.java b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/movie/MovieFragment.java index a6148d6..2c9f2d1 100644 --- a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/movie/MovieFragment.java +++ b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/movie/MovieFragment.java @@ -68,4 +68,5 @@ public int getCount() { return TAB_COUNT; } } -} + +} \ No newline at end of file diff --git a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/movie/MoviePageFragment.java b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/movie/MoviePageFragment.java index 3a6893e..4c17210 100644 --- a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/movie/MoviePageFragment.java +++ b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/movie/MoviePageFragment.java @@ -8,8 +8,6 @@ import com.aac.andcun.themoviedb_mvvm.R; import com.aac.andcun.themoviedb_mvvm.databinding.FragmentMoviePageBinding; -import com.aac.andcun.themoviedb_mvvm.di.movie.DaggerMovieComponent; -import com.aac.andcun.themoviedb_mvvm.di.movie.MovieModule; import com.aac.andcun.themoviedb_mvvm.repository.MovieRepository; import com.aac.andcun.themoviedb_mvvm.ui.base.BaseFragment; import com.aac.andcun.themoviedb_mvvm.ui.common.MovieAdapter; @@ -97,11 +95,7 @@ public void accept(Throwable throwable) throws Exception { @Override protected void resolveDaggerDependency() { - DaggerMovieComponent.builder() - .appComponent(getAppComponent()) - .movieModule(new MovieModule()) - .build() - .inject(this); + } @Override diff --git a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/tv/TvPageFragment.java b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/tv/TvPageFragment.java index 7784d9e..2067a5d 100644 --- a/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/tv/TvPageFragment.java +++ b/app/src/main/java/com/aac/andcun/themoviedb_mvvm/ui/tv/TvPageFragment.java @@ -8,8 +8,6 @@ import com.aac.andcun.themoviedb_mvvm.R; import com.aac.andcun.themoviedb_mvvm.databinding.FragmentTvPageBinding; -import com.aac.andcun.themoviedb_mvvm.di.tv.DaggerTvComponent; -import com.aac.andcun.themoviedb_mvvm.di.tv.TvModule; import com.aac.andcun.themoviedb_mvvm.repository.TvRepository; import com.aac.andcun.themoviedb_mvvm.ui.base.BaseFragment; import com.aac.andcun.themoviedb_mvvm.ui.common.TvAdapter; @@ -99,10 +97,7 @@ protected int getLayoutId() { @Override protected void resolveDaggerDependency() { - DaggerTvComponent.builder() - .appComponent(getAppComponent()) - .tvModule(new TvModule()) - .build().inject(this); + } @Override