Merge pull request #8 from szakitom/interactor

implements interactors

.idea/misc.xml

@@ -24,7 +24,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/src/main/java/me/szaki/xkcd/xkcdbrowser/interactor/InteractorModule.java

 package me.szaki.xkcd.xkcdbrowser.interactor;
 
+import javax.inject.Singleton;
+
 import dagger.Module;
 import dagger.Provides;
 import me.szaki.xkcd.xkcdbrowser.interactor.comics.ComicsInteractor;
+import me.szaki.xkcd.xkcdbrowser.interactor.comics.DBInteractor;
 
 @Module
 public class InteractorModule {
+    @Singleton
     @Provides
     public ComicsInteractor provideComicsInteractor() {
         return new ComicsInteractor();
     }
+
+    @Singleton
+    @Provides
+    public DBInteractor provideDBInteractor() {
+        return new DBInteractor();
+    }
 }

app/src/main/java/me/szaki/xkcd/xkcdbrowser/interactor/comics/ComicsInteractor.java

@@ -2,6 +2,8 @@ package me.szaki.xkcd.xkcdbrowser.interactor.comics;
 
 
 import java.io.IOException;
+import java.util.Date;
+import java.util.Random;
 
 import javax.inject.Inject;
 
@@ -20,4 +22,13 @@ public class ComicsInteractor {
     public Comic getComic(long id) throws IOException {
         return this.comicApi.getComic(id).execute().body();
     }
+
+    public Comic getRandomComic() throws IOException {
+        Random r = new Random(new Date().getTime());
+        return this.comicApi.getComic(r.nextLong()).execute().body();
+    }
+
+    public Comic getLatestComic() throws IOException {
+        return this.comicApi.getCurrentComic().execute().body();
+    }
 }

app/src/main/java/me/szaki/xkcd/xkcdbrowser/interactor/comics/DBInteractor.java

+package me.szaki.xkcd.xkcdbrowser.interactor.comics;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Random;
+
+import javax.inject.Inject;
+
+import me.szaki.xkcd.xkcdbrowser.database.ComicsDatabase;
+import me.szaki.xkcd.xkcdbrowser.model.ComicStrip;
+
+public class DBInteractor {
+    @Inject
+    ComicsDatabase db;
+
+    public List<ComicStrip> getComics() {
+        return db.getDAO().getAllComics();
+    }
+
+    public ComicStrip getComic(Long id) {
+        return db.getDAO().getComic(id);
+    }
+
+    public void deleteComic(ComicStrip c) {
+        db.getDAO().delete(c);
+    }
+
+    public void saveComic(ComicStrip c) {
+        db.getDAO().insertAll(c);
+    }
+
+
+}

app/src/main/java/me/szaki/xkcd/xkcdbrowser/network/StringUtil.java

 package me.szaki.xkcd.xkcdbrowser.network;
 
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2018-04-16T20:13:49.474+02:00")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2018-04-16T23:20:40.798+02:00")
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).

app/src/main/java/me/szaki/xkcd/xkcdbrowser/network/api/ComicApi.java

@@ -17,6 +17,17 @@ import java.util.Map;
 
 public interface ComicApi {
   
+  /**
+   * Get the current comic
+   * 
+   * @return Call<Comic>
+   */
+  
+  @GET("info.0.json")
+  Call<Comic> getCurrentComic();
+    
+
+  
   /**
    * Get a comic
    * 

app/src/main/java/me/szaki/xkcd/xkcdbrowser/ui/favorites/FavoritesPresenter.java

@@ -4,8 +4,8 @@ package me.szaki.xkcd.xkcdbrowser.ui.favorites;
 import javax.inject.Inject;
 
 import me.szaki.xkcd.xkcdbrowser.XKCDBrowserApplication;
-import me.szaki.xkcd.xkcdbrowser.database.ComicsDatabase;
 import me.szaki.xkcd.xkcdbrowser.interactor.comics.ComicsInteractor;
+import me.szaki.xkcd.xkcdbrowser.interactor.comics.DBInteractor;
 import me.szaki.xkcd.xkcdbrowser.ui.Presenter;
 
 public class FavoritesPresenter extends Presenter<FavoritesScreen> {
@@ -13,7 +13,7 @@ public class FavoritesPresenter extends Presenter<FavoritesScreen> {
     ComicsInteractor comicsInteractor;
 
     @Inject
-    ComicsDatabase db;
+    DBInteractor db;
 
     public FavoritesPresenter () {
         XKCDBrowserApplication.injector.inject(this);

app/src/main/java/me/szaki/xkcd/xkcdbrowser/ui/main/MainPresenter.java

@@ -3,9 +3,9 @@ package me.szaki.xkcd.xkcdbrowser.ui.main;
 
 import javax.inject.Inject;
 
-import me.szaki.xkcd.xkcdbrowser.database.ComicsDatabase;
 import me.szaki.xkcd.xkcdbrowser.XKCDBrowserApplication;
 import me.szaki.xkcd.xkcdbrowser.interactor.comics.ComicsInteractor;
+import me.szaki.xkcd.xkcdbrowser.interactor.comics.DBInteractor;
 import me.szaki.xkcd.xkcdbrowser.ui.Presenter;
 
 public class MainPresenter extends Presenter<MainScreen> {
@@ -13,7 +13,7 @@ public class MainPresenter extends Presenter<MainScreen> {
     ComicsInteractor comicsInteractor;
 
     @Inject
-    ComicsDatabase db;
+    DBInteractor db;
 
     public MainPresenter () {
         XKCDBrowserApplication.injector.inject(this);

swagger.yaml

@@ -40,7 +40,22 @@ paths:
           description: "successful operation"
           schema:
             $ref: "#/definitions/Comic"
-
+  /info.0.json:
+    get:
+      tags:
+      - "comic"
+      summary: "Get the current comic"
+      description: ""
+      operationId: "getCurrentComic"
+      consumes:
+      - "application/json"
+      produces:
+      - "application/json"
+      responses:
+        200:
+          description: "successful operation"
+          schema:
+            $ref: "#/definitions/Comic"
 definitions:
   Comic:
     type: "object"