update: Release 1.0.0

caravancodes · Mar 18, 2020 · f6ddd45 · f6ddd45
1 parent 9144d33
commit f6ddd45
Show file tree

Hide file tree

Showing 9 changed files with 76 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # consumable-code-covid-19-api By AmirIsBack
-- v1.0.0 - Development
+- v1.0.1 - Development
 - Stable Version
 
 # About This Project
@@ -22,6 +22,10 @@ https://covid19api.com/
     // Switch For Using Chuck Interceptor
     fun usingChuckInterceptor(context: Context)
 
+    // List Routes
+    // List all routes with parameters and descriptions.
+    fun getRoutes(callback: Covid19ResultCallback<List<Route>>)
+
     // Get Summary Data
     // Return new cases and total cases per country.
     fun getSummaryData(callback: Covid19ResultCallback<ReponseSummary>)
@@ -80,11 +84,11 @@ https://covid19api.com/
 # Version Release
 This Is Latest Release
 
-    $version_release = 1.0.0
+    $version_release = 1.0.1
 
 What's New??
 
-    * Consumable Code Covid 19 API*
+    * Adding Get Routes *
 
 # How To Use This Project
 <h3>Step 1. Add the JitPack repository to your build file</h3>

diff --git a/frogocovid19api/src/main/java/com/frogobox/frogocovid19api/ConsumeCovid19Api.kt b/frogocovid19api/src/main/java/com/frogobox/frogocovid19api/ConsumeCovid19Api.kt
@@ -3,6 +3,7 @@ package com.frogobox.frogocovid19api
 import android.content.Context
 import com.frogobox.frogocovid19api.callback.Covid19ResultCallback
 import com.frogobox.frogocovid19api.data.model.Country
+import com.frogobox.frogocovid19api.data.model.Route
 import com.frogobox.frogocovid19api.data.model.Status
 import com.frogobox.frogocovid19api.data.reponse.ReponseSummary
 import com.frogobox.frogocovid19api.data.source.Covid19DataSource
@@ -34,6 +35,27 @@ class ConsumeCovid19Api : ConsumeCovid19ApiView {
         covid19Repository.usingChuckInterceptor(context)
     }
 
+    override fun getRoutes(callback: Covid19ResultCallback<List<Route>>) {
+        covid19Repository.getRoutes(object :
+            Covid19DataSource.GetRemoteCallback<List<Route>> {
+            override fun onSuccess(data: List<Route>) {
+                callback.getResultData(data)
+            }
+
+            override fun onFailed(statusCode: Int, errorMessage: String?) {
+                callback.failedResult(statusCode, errorMessage)
+            }
+
+            override fun onShowProgress() {
+                callback.onShowProgress()
+            }
+
+            override fun onHideProgress() {
+                callback.onHideProgress()
+            }
+        })
+    }
+
     override fun getSummaryData(callback: Covid19ResultCallback<ReponseSummary>) {
         covid19Repository.getSummaryData(object :
             Covid19DataSource.GetRemoteCallback<ReponseSummary> {

diff --git a/frogocovid19api/src/main/java/com/frogobox/frogocovid19api/ConsumeCovid19ApiView.kt b/frogocovid19api/src/main/java/com/frogobox/frogocovid19api/ConsumeCovid19ApiView.kt
@@ -3,6 +3,7 @@ package com.frogobox.frogocovid19api
 import android.content.Context
 import com.frogobox.frogocovid19api.callback.Covid19ResultCallback
 import com.frogobox.frogocovid19api.data.model.Country
+import com.frogobox.frogocovid19api.data.model.Route
 import com.frogobox.frogocovid19api.data.model.Status
 import com.frogobox.frogocovid19api.data.reponse.ReponseSummary
 
@@ -28,6 +29,10 @@ interface ConsumeCovid19ApiView {
     // Switch For Using Chuck Interceptor
     fun usingChuckInterceptor(context: Context)
 
+    // List Routes
+    // List all routes with parameters and descriptions.
+    fun getRoutes(callback: Covid19ResultCallback<List<Route>>)
+
     // Get Summary Data
     // Return new cases and total cases per country.
     fun getSummaryData(callback: Covid19ResultCallback<ReponseSummary>)

diff --git a/...box/frogocovid19api/data/model/Postman.kt → ...gobox/frogocovid19api/data/model/Route.kt b/...box/frogocovid19api/data/model/Postman.kt → ...gobox/frogocovid19api/data/model/Route.kt
@@ -19,7 +19,7 @@ import com.google.gson.annotations.SerializedName
  * com.frogobox.frogocovid19api.data.model
  *
  */
-data class Postman(
+data class Route(
 
     @SerializedName("Name")
     var name : String? = null,

diff --git a/frogocovid19api/src/main/java/com/frogobox/frogocovid19api/data/source/Covid19ApiService.kt b/frogocovid19api/src/main/java/com/frogobox/frogocovid19api/data/source/Covid19ApiService.kt
@@ -2,6 +2,7 @@ package com.frogobox.frogocovid19api.data.source
 
 import android.content.Context
 import com.frogobox.frogocovid19api.data.model.Country
+import com.frogobox.frogocovid19api.data.model.Route
 import com.frogobox.frogocovid19api.data.model.Status
 import com.frogobox.frogocovid19api.data.reponse.ReponseSummary
 import com.frogobox.frogocovid19api.util.Covid19Constant
@@ -35,7 +36,12 @@ import java.util.concurrent.TimeUnit
  *
  */
 interface Covid19ApiService {
-
+
+    // List Routes
+    // List all routes with parameters and descriptions.
+    @GET(Covid19Url.URL_ROUTE)
+    fun getRoutes(): Observable<List<Route>>
+
     // Get Summary Data
     // Return new cases and total cases per country.
     @GET(Covid19Url.URL_SUMMARY)

diff --git a/frogocovid19api/src/main/java/com/frogobox/frogocovid19api/data/source/Covid19DataSource.kt b/frogocovid19api/src/main/java/com/frogobox/frogocovid19api/data/source/Covid19DataSource.kt
@@ -3,6 +3,7 @@ package com.frogobox.frogocovid19api.data.source
 import android.content.Context
 import com.frogobox.frogocovid19api.base.BaseCovid19DataSource
 import com.frogobox.frogocovid19api.data.model.Country
+import com.frogobox.frogocovid19api.data.model.Route
 import com.frogobox.frogocovid19api.data.model.Status
 import com.frogobox.frogocovid19api.data.reponse.ReponseSummary
 
@@ -28,6 +29,10 @@ interface Covid19DataSource {
     // Switch For Using Chuck Interceptor
     fun usingChuckInterceptor(context: Context)
 
+    // List Routes
+    // List all routes with parameters and descriptions.
+    fun getRoutes(callback: GetRemoteCallback<List<Route>>)
+
     // Get Summary Data
     // Return new cases and total cases per country.
     fun getSummaryData(callback: GetRemoteCallback<ReponseSummary>)

diff --git a/...id19api/src/main/java/com/frogobox/frogocovid19api/data/source/Covid19RemoteDataSource.kt b/...id19api/src/main/java/com/frogobox/frogocovid19api/data/source/Covid19RemoteDataSource.kt
@@ -2,6 +2,7 @@ package com.frogobox.frogocovid19api.data.source
 
 import android.content.Context
 import com.frogobox.frogocovid19api.data.model.Country
+import com.frogobox.frogocovid19api.data.model.Route
 import com.frogobox.frogocovid19api.data.model.Status
 import com.frogobox.frogocovid19api.data.reponse.ReponseSummary
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -32,6 +33,25 @@ object Covid19RemoteDataSource : Covid19DataSource {
         apiService.usingChuckInterceptor(context)
     }
 
+    override fun getRoutes(callback: Covid19DataSource.GetRemoteCallback<List<Route>>) {
+        apiService.getApiService.getRoutes()
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .doOnSubscribe { callback.onShowProgress() }
+            .doOnTerminate { callback.onHideProgress() }
+            .subscribe(object : Covid19ApiCallback<List<Route>>() {
+                override fun onSuccess(model: List<Route>) {
+                    callback.onSuccess(model)
+                }
+
+                override fun onFailure(code: Int, errorMessage: String) {
+                    callback.onFailed(code, errorMessage)
+                }
+
+                override fun onFinish() {}
+            })
+    }
+
     override fun getSummaryData(callback: Covid19DataSource.GetRemoteCallback<ReponseSummary>) {
         apiService.getApiService
             .getSummaryData()

diff --git a/frogocovid19api/src/main/java/com/frogobox/frogocovid19api/data/source/Covid19Repository.kt b/frogocovid19api/src/main/java/com/frogobox/frogocovid19api/data/source/Covid19Repository.kt
@@ -2,6 +2,7 @@ package com.frogobox.frogocovid19api.data.source
 
 import android.content.Context
 import com.frogobox.frogocovid19api.data.model.Country
+import com.frogobox.frogocovid19api.data.model.Route
 import com.frogobox.frogocovid19api.data.model.Status
 import com.frogobox.frogocovid19api.data.reponse.ReponseSummary
 
@@ -28,6 +29,10 @@ class Covid19Repository(private val remoteDataSource: Covid19RemoteDataSource) :
         remoteDataSource.usingChuckInterceptor(context)
     }
 
+    override fun getRoutes(callback: Covid19DataSource.GetRemoteCallback<List<Route>>) {
+        remoteDataSource.getRoutes(callback)
+    }
+
     override fun getSummaryData(callback: Covid19DataSource.GetRemoteCallback<ReponseSummary>) {
         remoteDataSource.getSummaryData(callback)
     }

diff --git a/frogocovid19api/src/main/java/com/frogobox/frogocovid19api/util/Covid19Url.kt b/frogocovid19api/src/main/java/com/frogobox/frogocovid19api/util/Covid19Url.kt
@@ -22,6 +22,10 @@ class Covid19Url {
     companion object {
         const val BASE_URL = "https://api.covid19api.com/"
 
+        // List Routes
+        // List all routes with parameters and descriptions.
+        const val URL_ROUTE = ""
+
         // Get Summary Data
         // Return new cases and total cases per country.
         const val URL_SUMMARY = "summary"