Added TheCatAPIService to the App lifetime

AllanHasegawa · Jul 31, 2017 · a8180a9 · a8180a9
1 parent e39ee8c
commit a8180a9
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
+        android:name=".App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"

diff --git a/app/src/main/java/io/catter2/App.java b/app/src/main/java/io/catter2/App.java
@@ -0,0 +1,25 @@
+package io.catter2;
+
+import android.app.Application;
+
+import io.catter2.cat_api.CacheTheCatAPI;
+import io.catter2.cat_api.RetrofitTheCatAPI;
+import io.catter2.cat_api.TheCatAPI;
+
+public class App extends Application {
+    private static TheCatAPI theCatAPI;
+
+    public static TheCatAPI getTheCatAPIService() {
+        return App.theCatAPI;
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        TheCatAPI theCatAPIService = new RetrofitTheCatAPI();
+        TheCatAPI theCatAPICache = new CacheTheCatAPI(theCatAPIService);
+        App.theCatAPI = theCatAPICache;
+    }
+
+}
diff --git a/app/src/main/java/io/catter2/ListActivity.java b/app/src/main/java/io/catter2/ListActivity.java
@@ -16,10 +16,7 @@
 
 import java.util.List;
 
-import io.catter2.cat_api.CacheTheCatAPI;
 import io.catter2.cat_api.FetchCatImagesUseCase;
-import io.catter2.cat_api.RetrofitTheCatAPI;
-import io.catter2.cat_api.TheCatAPI;
 import io.catter2.favorites.AddFavoriteUseCase;
 import io.catter2.favorites.FavoritesRepository;
 import io.catter2.favorites.SharedPrefFavoritesRepository;
@@ -67,9 +64,7 @@ public void imageClicked(ImageView view, String url) {
 
         FavoritesRepository favoritesRepository = new SharedPrefFavoritesRepository(this, userToken);
         addFavoriteUseCase = new AddFavoriteUseCase(favoritesRepository);
-        TheCatAPI catAPIService = new RetrofitTheCatAPI();
-        TheCatAPI catAPICached = new CacheTheCatAPI(catAPIService);
-        fetchCatImagesUseCase = new FetchCatImagesUseCase(catAPICached);
+        fetchCatImagesUseCase = new FetchCatImagesUseCase(App.getTheCatAPIService());
 
         fetchCatImagesUseCase.getImagesUrls(new FetchCatImagesUseCase.Callback() {
             @Override