optimized di

Author: Pulkit Kumar

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

@@ -5,6 +5,7 @@
 import android.os.StrictMode;
 
 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;
@@ -17,7 +18,7 @@
  */
 public class BaseApplication extends Application
 {
-    AppComponent component;
+    private AppComponent component;
 
     @Override
     public void onCreate()
@@ -30,6 +31,7 @@ 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())
@@ -40,14 +42,19 @@ public static AppComponent getAppComponent(Context context) {
         return app.component;
     }
 
+    private AppModule getAppModule()
+    {
+        return new AppModule(this);
+    }
+
     private DetailsModule getDetailsModule()
     {
         return new DetailsModule();
     }
 
     private FavoritesModule getFavoritesModule()
     {
-        return new FavoritesModule(this);
+        return new FavoritesModule();
     }
 
     private ListingModule getListingModule()
@@ -57,7 +64,7 @@ private ListingModule getListingModule()
 
     private SortingModule getSortingModule()
     {
-        return new SortingModule(this);
+        return new SortingModule();
     }
 
     private NetworkModule getNetworkModule()

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

@@ -13,6 +13,7 @@
  */
 @Singleton
 @Component(modules = {
+        AppModule.class,
         NetworkModule.class,
         DetailsModule.class,
         FavoritesModule.class,

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

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

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

@@ -1,14 +1,9 @@
 package com.esoxjem.movieguide.di;
 
-import android.app.Application;
-import android.content.Context;
-import android.content.SharedPreferences;
-
 import com.esoxjem.movieguide.favorites.FavoritesInteractor;
 import com.esoxjem.movieguide.favorites.FavoritesStore;
 import com.esoxjem.movieguide.favorites.IFavoritesInteractor;
 
-import javax.inject.Named;
 import javax.inject.Singleton;
 
 import dagger.Module;
@@ -17,30 +12,13 @@
 /**
  * Created by pulkitkumar on 17/09/16.
  */
-@Module
+@Module (includes = AppModule.class)
 public class FavoritesModule
 {
-    private static final String PREF_NAME = "FavoritesStore";
-    public static final String FAVOURITES = "favourites";
-    private Application app;
-
-    public FavoritesModule (Application app)
-    {
-        this.app = app;
-    }
-
     @Provides
     @Singleton
     IFavoritesInteractor provideFavouritesInteractor(FavoritesStore store)
     {
         return new FavoritesInteractor(store);
     }
-
-    @Provides
-    @Singleton
-    FavoritesStore provideFavouritesStore()
-    {
-        SharedPreferences pref = app.getApplicationContext().getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
-        return new FavoritesStore(pref);
-    }
 }

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

@@ -19,25 +19,9 @@
 /**
  * Created by pulkitkumar on 17/09/16.
  */
-@Module
+@Module(includes = AppModule.class)
 public class SortingModule
 {
-    private Application app;
-    private static final String PREF_NAME = "SortingOptionStore";
-
-    public SortingModule(Application app)
-    {
-        this.app = app;
-    }
-
-    @Provides
-    @Singleton
-    SortingOptionStore providesSortingOptionStore()
-    {
-        SharedPreferences pref = app.getApplicationContext().getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
-        return new SortingOptionStore(pref);
-    }
-
     @Provides
     @Singleton
     ISortingDialogInteractor providesSortingDialogInteractor(SortingOptionStore store)

app/src/main/java/com/esoxjem/movieguide/favorites/FavoritesStore.java

@@ -1,9 +1,9 @@
 package com.esoxjem.movieguide.favorites;
 
+import android.content.Context;
 import android.content.SharedPreferences;
 import android.text.TextUtils;
 
-import com.esoxjem.movieguide.BaseApplication;
 import com.esoxjem.movieguide.entities.Movie;
 import com.squareup.moshi.JsonAdapter;
 import com.squareup.moshi.Moshi;
@@ -14,18 +14,21 @@
 import java.util.Map;
 
 import javax.inject.Inject;
-import javax.inject.Named;
+import javax.inject.Singleton;
 
 /**
  * @author arun
  */
+@Singleton
 public class FavoritesStore
 {
+    private static final String PREF_NAME = "FavoritesStore";
     private SharedPreferences pref;
 
-    public FavoritesStore(SharedPreferences pref)
+    @Inject
+    public FavoritesStore(Context context)
     {
-        this.pref = pref;
+        pref = context.getApplicationContext().getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
     }
 
     public void setFavorite(Movie movie)

app/src/main/java/com/esoxjem/movieguide/sorting/SortingOptionStore.java

@@ -1,5 +1,6 @@
 package com.esoxjem.movieguide.sorting;
 
+import android.content.Context;
 import android.content.SharedPreferences;
 
 import com.esoxjem.movieguide.BaseApplication;
@@ -17,9 +18,9 @@ public class SortingOptionStore
     private static final String SELECTED_OPTION = "selectedOption";
     private static final String PREF_NAME = "SortingOptionStore";
 
-    public SortingOptionStore(SharedPreferences pref)
+    @Inject public SortingOptionStore(Context context)
     {
-        this.pref = pref;
+        pref = context.getApplicationContext().getSharedPreferences(PREF_NAME, Context.MODE_PRIVATE);
     }
 
     public void setSelectedOption(SortType sortType)