Merge pull request #4 from pulkitkumar/pk_dagger2

Dagger (Full DI)

Author: esoxjem

app/build.gradle

@@ -48,6 +48,10 @@ dependencies {
     compile 'com.github.bumptech.glide:glide:3.6.1'
     compile 'com.github.bumptech.glide:okhttp-integration:1.3.1'
 
+    // Dagger
+    compile 'com.google.dagger:dagger:2.5'
+    apt 'com.google.dagger:dagger-compiler:2.5'
+
     // Other
     compile 'net.jcip:jcip-annotations:1.0'
     compile 'com.squareup.picasso:picasso:2.5.2'

app/src/main/java/com/esoxjem/movieguide/AppComponent.java

@@ -3,35 +3,73 @@
 import android.app.Application;
 import android.content.Context;
 import android.os.StrictMode;
-import android.support.annotation.NonNull;
+
+import com.esoxjem.movieguide.di.AppComponent;
+import com.esoxjem.movieguide.di.AppModule;
+import com.esoxjem.movieguide.di.DaggerAppComponent;
+import com.esoxjem.movieguide.di.DetailsModule;
+import com.esoxjem.movieguide.di.FavoritesModule;
+import com.esoxjem.movieguide.di.ListingModule;
+import com.esoxjem.movieguide.di.NetworkModule;
+import com.esoxjem.movieguide.di.SortingModule;
 
 /**
  * @author arun
  */
 public class BaseApplication extends Application
 {
-    private static Context appContext;
-    private AppComponent appComponent;
+    private AppComponent component;
 
     @Override
     public void onCreate()
     {
         super.onCreate();
         StrictMode.enableDefaults();
-        appContext = getApplicationContext();
-        appComponent = DaggerAppComponent.builder()
-                .appnModule(new AppModule(this))
-                .build();
     }
 
-    @NonNull
-    public static Context getAppContext()
+    public static AppComponent getAppComponent(Context context) {
+        BaseApplication app = (BaseApplication) context.getApplicationContext();
+        if (app.component == null) {
+            app.component = DaggerAppComponent.builder()
+                    .appModule(app.getAppModule())
+                    .networkModule(app.getNetworkModule())
+                    .detailsModule(app.getDetailsModule())
+                    .favoritesModule(app.getFavoritesModule())
+                    .listingModule(app.getListingModule())
+                    .sortingModule(app.getSortingModule())
+                    .build();
+        }
+        return app.component;
+    }
+
+    private AppModule getAppModule()
+    {
+        return new AppModule(this);
+    }
+
+    private DetailsModule getDetailsModule()
+    {
+        return new DetailsModule();
+    }
+
+    private FavoritesModule getFavoritesModule()
+    {
+        return new FavoritesModule();
+    }
+
+    private ListingModule getListingModule()
     {
-        return appContext;
+        return new ListingModule();
     }
 
-    public AppComponent getAppComponent()
+    private SortingModule getSortingModule()
     {
-        return appComponent;
+        return new SortingModule();
     }
+
+    private NetworkModule getNetworkModule()
+    {
+        return new NetworkModule();
+    }
+
 }

app/src/main/java/com/esoxjem/movieguide/BaseApplication.java

@@ -14,4 +14,5 @@ public interface IMovieDetailsPresenter
     Subscription showReviews(Movie movie);
     void showFavoriteButton(Movie movie);
     void onFavoriteClick(Movie movie);
+    void setView(IMovieDetailsView view);
 }

app/src/main/java/com/esoxjem/movieguide/details/IMovieDetailsPresenter.java

@@ -21,6 +21,7 @@
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
+import com.esoxjem.movieguide.BaseApplication;
 import com.esoxjem.movieguide.R;
 import com.esoxjem.movieguide.constants.Constants;
 import com.esoxjem.movieguide.entities.Movie;
@@ -31,14 +32,17 @@
 
 import java.util.List;
 
+import javax.inject.Inject;
+
 import rx.Subscription;
 
 /**
  * A simple {@link Fragment} subclass.
  */
 public class MovieDetailsFragment extends Fragment implements IMovieDetailsView, View.OnClickListener
 {
-    private MovieDetailsPresenter mMovieDetailsPresenter;
+    @Inject
+    IMovieDetailsPresenter mMovieDetailsPresenter;
     private ImageView mMoviePoster;
     private TextView mMovieTitle;
     private TextView mMovieReleaseDate;
@@ -71,7 +75,9 @@ public static MovieDetailsFragment getInstance(@NonNull Movie movie)
     public void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
-        mMovieDetailsPresenter = new MovieDetailsPresenter(this);
+        setRetainInstance(true);
+        BaseApplication.getAppComponent(getContext()).inject(this);
+        mMovieDetailsPresenter.setView(this);
     }
 
     @Override

app/src/main/java/com/esoxjem/movieguide/details/MovieDetailsFragment.java

@@ -12,6 +12,8 @@
 import java.io.IOException;
 import java.util.List;
 
+import javax.inject.Inject;
+
 import rx.Observable;
 import rx.functions.Func0;
 
@@ -20,6 +22,13 @@
  */
 public class MovieDetailsInteractor implements IMovieDetailsInteractor
 {
+    private RequestHandler mRequestHandler;
+
+    public MovieDetailsInteractor(RequestHandler requestHandler)
+    {
+        mRequestHandler = requestHandler;
+    }
+
     @Override
     public Observable<List<Video>> getTrailers(final String id)
     {
@@ -41,7 +50,7 @@ private List<Video> get(String id) throws IOException, JSONException
             {
                 String url = String.format(Api.GET_TRAILERS, id);
                 Request request = RequestGenerator.get(url);
-                String body = RequestHandler.request(request);
+                String body = mRequestHandler.request(request);
                 return MovieDetailsParser.parseTrailers(body);
             }
         });
@@ -68,7 +77,7 @@ private List<Review> get(String id) throws IOException, JSONException
             {
                 String url = String.format(Api.GET_REVIEWS, id);
                 Request request = RequestGenerator.get(url);
-                String body = RequestHandler.request(request);
+                String body = mRequestHandler.request(request);
                 return MovieDetailsParser.parseReviews(body);
             }
         });

app/src/main/java/com/esoxjem/movieguide/details/MovieDetailsInteractor.java

@@ -22,11 +22,16 @@ public class MovieDetailsPresenter implements IMovieDetailsPresenter
     private IMovieDetailsInteractor mMovieDetailsInteractor;
     private IFavoritesInteractor mFavoritesInteractor;
 
-    public MovieDetailsPresenter(IMovieDetailsView movieDetailsView)
+    public MovieDetailsPresenter(IMovieDetailsInteractor movieDetailsInteractor, IFavoritesInteractor favoritesInteractor)
     {
-        mMovieDetailsView = movieDetailsView;
-        mMovieDetailsInteractor = new MovieDetailsInteractor();
-        mFavoritesInteractor = new FavoritesInteractor();
+        mMovieDetailsInteractor = movieDetailsInteractor;
+        mFavoritesInteractor = favoritesInteractor;
+    }
+
+    @Override
+    public void setView(IMovieDetailsView view)
+    {
+        mMovieDetailsView = view;
     }
 
     @Override

app/src/main/java/com/esoxjem/movieguide/details/MovieDetailsPresenter.java

@@ -0,0 +1,27 @@
+package com.esoxjem.movieguide.di;
+
+import com.esoxjem.movieguide.details.MovieDetailsFragment;
+import com.esoxjem.movieguide.listing.MoviesListingFragment;
+import com.esoxjem.movieguide.sorting.SortingDialogFragment;
+
+import javax.inject.Singleton;
+
+import dagger.Component;
+
+/**
+ * Created by pulkitkumar on 17/09/16.
+ */
+@Singleton
+@Component(modules = {
+        AppModule.class,
+        NetworkModule.class,
+        DetailsModule.class,
+        FavoritesModule.class,
+        ListingModule.class,
+        SortingModule.class})
+public interface AppComponent
+{
+    MovieDetailsFragment inject(MovieDetailsFragment fragment);
+    MoviesListingFragment inject(MoviesListingFragment fragment);
+    SortingDialogFragment inject(SortingDialogFragment fragment);
+}

app/src/main/java/com/esoxjem/movieguide/di/AppComponent.java

@@ -1,30 +1,29 @@
-package com.esoxjem.movieguide;
+package com.esoxjem.movieguide.di;
 
 import android.app.Application;
 import android.content.Context;
 
-import javax.inject.Singleton;
+import com.esoxjem.movieguide.BaseApplication;
 
 import dagger.Module;
 import dagger.Provides;
 
 /**
- * @author arun
+ * Created by pulkitkumar on 17/09/16.
  */
 @Module
 public class AppModule
 {
-    private final Application application;
+    private Application app;
 
     public AppModule(Application application)
     {
-        this.application = application;
+        app = application;
     }
 
     @Provides
-    @Singleton
-    Context providesContext()
+    public Context provideContext()
     {
-        return application;
+        return app;
     }
 }

app/src/main/java/com/esoxjem/movieguide/AppModule.java renamed to app/src/main/java/com/esoxjem/movieguide/di/AppModule.java

@@ -0,0 +1,34 @@
+package com.esoxjem.movieguide.di;
+
+import com.esoxjem.movieguide.details.IMovieDetailsInteractor;
+import com.esoxjem.movieguide.details.IMovieDetailsPresenter;
+import com.esoxjem.movieguide.details.MovieDetailsInteractor;
+import com.esoxjem.movieguide.details.MovieDetailsPresenter;
+import com.esoxjem.movieguide.favorites.IFavoritesInteractor;
+import com.esoxjem.movieguide.network.RequestHandler;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+/**
+ * Created by pulkitkumar on 17/09/16.
+ */
+@Module (includes = {NetworkModule.class, FavoritesModule.class})
+public class DetailsModule
+{
+    @Provides
+    @Singleton
+    IMovieDetailsInteractor provideInteractor(RequestHandler requestHandler)
+    {
+        return new MovieDetailsInteractor(requestHandler);
+    }
+
+    @Provides
+    IMovieDetailsPresenter providePresenter(IMovieDetailsInteractor detailsInteractor,
+                                            IFavoritesInteractor favoritesInteractor)
+    {
+        return new MovieDetailsPresenter(detailsInteractor, favoritesInteractor);
+    }
+}

app/src/main/java/com/esoxjem/movieguide/di/DetailsModule.java

@@ -0,0 +1,24 @@
+package com.esoxjem.movieguide.di;
+
+import com.esoxjem.movieguide.favorites.FavoritesInteractor;
+import com.esoxjem.movieguide.favorites.FavoritesStore;
+import com.esoxjem.movieguide.favorites.IFavoritesInteractor;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+/**
+ * Created by pulkitkumar on 17/09/16.
+ */
+@Module (includes = AppModule.class)
+public class FavoritesModule
+{
+    @Provides
+    @Singleton
+    IFavoritesInteractor provideFavouritesInteractor(FavoritesStore store)
+    {
+        return new FavoritesInteractor(store);
+    }
+}

app/src/main/java/com/esoxjem/movieguide/di/FavoritesModule.java

@@ -0,0 +1,36 @@
+package com.esoxjem.movieguide.di;
+
+import com.esoxjem.movieguide.favorites.IFavoritesInteractor;
+import com.esoxjem.movieguide.listing.IMoviesListingInteractor;
+import com.esoxjem.movieguide.listing.IMoviesListingPresenter;
+import com.esoxjem.movieguide.listing.MoviesListingInteractor;
+import com.esoxjem.movieguide.listing.MoviesListingPresenter;
+import com.esoxjem.movieguide.network.RequestHandler;
+import com.esoxjem.movieguide.sorting.SortingOptionStore;
+
+import javax.inject.Singleton;
+
+import dagger.Module;
+import dagger.Provides;
+
+/**
+ * Created by pulkitkumar on 17/09/16.
+ */
+@Module(includes = {NetworkModule.class, SortingModule.class, FavoritesModule.class})
+public class ListingModule
+{
+    @Provides
+    @Singleton
+    IMoviesListingInteractor provideMovieListingInteractor(IFavoritesInteractor favoritesInteractor,
+                                                           RequestHandler requestHandler,
+                                                           SortingOptionStore sortingOptionStore)
+    {
+        return new MoviesListingInteractor(favoritesInteractor, requestHandler, sortingOptionStore);
+    }
+
+    @Provides
+    IMoviesListingPresenter provideMovieListingPresenter(IMoviesListingInteractor interactor)
+    {
+        return new MoviesListingPresenter(interactor);
+    }
+}