add: filter category and area

Author: amirisback

app/src/main/java/com/frogobox/themealsapi/MainActivity.kt

@@ -1,14 +1,15 @@
 package com.frogobox.themealsapi
 
 import android.os.Bundle
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.frogobox.frogothemealdbapi.ConsumeMealApi
 import com.frogobox.frogothemealdbapi.callback.MealResultCallback
 import com.frogobox.frogothemealdbapi.data.model.Category
 import com.frogobox.frogothemealdbapi.data.response.MealResponse
 
 class MainActivity : AppCompatActivity() {
-    
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
@@ -19,12 +20,12 @@ class MainActivity : AppCompatActivity() {
         consumeMealApi.listAllCateories(object : MealResultCallback<MealResponse<Category>> {
             override fun getResultData(data: MealResponse<Category>) {
                 for (i in data.meals!!.indices) {
-
+                    Toast.makeText(this@MainActivity, data.meals!![i].strCategory, Toast.LENGTH_SHORT).show()
                 }
             }
 
             override fun failedResult(statusCode: Int, errorMessage: String?) {
-                TODO("Not yet implemented")
+                Toast.makeText(this@MainActivity, errorMessage, Toast.LENGTH_SHORT).show()
             }
         })
 

frogothemealdbapi/src/main/java/com/frogobox/frogothemealdbapi/ConsumeMealApi.kt

@@ -169,4 +169,40 @@ class ConsumeMealApi(private val apiKey: String) : ConsumeMealApiView {
                 }
             })
     }
+
+    override fun filterByCategory(
+        category: String,
+        callback: MealResultCallback<MealResponse<MealFilter>>
+    ) {
+        repository.filterByCategory(
+            apiKey,
+            category,
+            object : MealDataSource.GetRemoteCallback<MealResponse<MealFilter>> {
+                override fun onSuccess(data: MealResponse<MealFilter>) {
+                    callback.getResultData(data)
+                }
+
+                override fun onFailed(statusCode: Int, errorMessage: String?) {
+                    callback.failedResult(statusCode, errorMessage)
+                }
+            })
+    }
+
+    override fun filterByArea(
+        area: String,
+        callback: MealResultCallback<MealResponse<MealFilter>>
+    ) {
+        repository.filterByArea(
+            apiKey,
+            area,
+            object : MealDataSource.GetRemoteCallback<MealResponse<MealFilter>> {
+                override fun onSuccess(data: MealResponse<MealFilter>) {
+                    callback.getResultData(data)
+                }
+
+                override fun onFailed(statusCode: Int, errorMessage: String?) {
+                    callback.failedResult(statusCode, errorMessage)
+                }
+            })
+    }
 }

frogothemealdbapi/src/main/java/com/frogobox/frogothemealdbapi/ConsumeMealApiView.kt

@@ -3,7 +3,8 @@ package com.frogobox.frogothemealdbapi
 import android.content.Context
 import com.frogobox.frogothemealdbapi.callback.MealResultCallback
 import com.frogobox.frogothemealdbapi.data.model.*
-import com.frogobox.frogothemealdbapi.data.response.*
+import com.frogobox.frogothemealdbapi.data.response.CategoryResponse
+import com.frogobox.frogothemealdbapi.data.response.MealResponse
 
 /**
  * Created by Faisal Amir
@@ -54,4 +55,10 @@ interface ConsumeMealApiView {
     // Filter by main ingredient
     fun filterByIngredient(ingredient: String, callback: MealResultCallback<MealResponse<MealFilter>>)
 
+    // Filter by Category
+    fun filterByCategory(category: String, callback: MealResultCallback<MealResponse<MealFilter>>)
+
+    // Filter by Area
+    fun filterByArea(area: String, callback: MealResultCallback<MealResponse<MealFilter>>)
+
 }

frogothemealdbapi/src/main/java/com/frogobox/frogothemealdbapi/data/source/MealApiService.kt

@@ -2,7 +2,8 @@ package com.frogobox.frogothemealdbapi.data.source
 
 import android.content.Context
 import com.frogobox.frogothemealdbapi.data.model.*
-import com.frogobox.frogothemealdbapi.data.response.*
+import com.frogobox.frogothemealdbapi.data.response.CategoryResponse
+import com.frogobox.frogothemealdbapi.data.response.MealResponse
 import com.frogobox.frogothemealdbapi.util.MealConstant
 import com.frogobox.frogothemealdbapi.util.MealUrl
 import com.readystatesoftware.chuck.ChuckInterceptor
@@ -97,6 +98,18 @@ interface MealApiService {
         @Query(MealConstant.QUERY_INGREDIENT) ingredient: String
     ): Observable<MealResponse<MealFilter>>
 
+    // Filter by Category
+    fun filterByCategory(
+        @Path(MealConstant.PATH_API_KEY) apiKey: String,
+        @Query(MealConstant.QUERY_CATEGORY) category: String
+    ): Observable<MealResponse<MealFilter>>
+
+    // Filter by Area
+    fun filterByArea(
+        @Path(MealConstant.PATH_API_KEY) apiKey: String,
+        @Query(MealConstant.QUERY_AREA) area: String
+    ): Observable<MealResponse<MealFilter>>
+
     companion object Factory {
 
         private var isUsingChuckInterceptor = false

frogothemealdbapi/src/main/java/com/frogobox/frogothemealdbapi/data/source/MealDataSource.kt

@@ -54,6 +54,12 @@ interface MealDataSource {
     // Filter by main ingredient
     fun filterByIngredient(apiKey: String, ingredient: String, callback: GetRemoteCallback<MealResponse<MealFilter>>)
 
+    // Filter by Category
+    fun filterByCategory(apiKey: String, category: String, callback: GetRemoteCallback<MealResponse<MealFilter>>)
+
+    // Filter by Area
+    fun filterByArea(apiKey: String, area: String, callback: GetRemoteCallback<MealResponse<MealFilter>>)
+
     // Response Callback
     interface GetRemoteCallback<T> : BaseMealDataSource.ResponseCallback<T>
 

frogothemealdbapi/src/main/java/com/frogobox/frogothemealdbapi/data/source/MealRemoteDataSource.kt

@@ -234,4 +234,50 @@ object MealRemoteDataSource : MealDataSource {
                 }
             })
     }
+
+    override fun filterByCategory(
+        apiKey: String,
+        category: String,
+        callback: MealDataSource.GetRemoteCallback<MealResponse<MealFilter>>
+    ) {
+        mealApiService.getApiService
+            .filterByCategory(apiKey, category)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(object : MealApiCallback<MealResponse<MealFilter>>() {
+                override fun onSuccess(data: MealResponse<MealFilter>) {
+                    callback.onSuccess(data)
+                }
+
+                override fun onFailure(code: Int, errorMessage: String) {
+                    callback.onFailed(code, errorMessage)
+                }
+
+                override fun onFinish() {
+                }
+            })
+    }
+
+    override fun filterByArea(
+        apiKey: String,
+        area: String,
+        callback: MealDataSource.GetRemoteCallback<MealResponse<MealFilter>>
+    ) {
+        mealApiService.getApiService
+            .filterByArea(apiKey, area)
+            .subscribeOn(Schedulers.io())
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe(object : MealApiCallback<MealResponse<MealFilter>>() {
+                override fun onSuccess(data: MealResponse<MealFilter>) {
+                    callback.onSuccess(data)
+                }
+
+                override fun onFailure(code: Int, errorMessage: String) {
+                    callback.onFailed(code, errorMessage)
+                }
+
+                override fun onFinish() {
+                }
+            })
+    }
 }

frogothemealdbapi/src/main/java/com/frogobox/frogothemealdbapi/data/source/MealRepository.kt

@@ -93,4 +93,20 @@ class MealRepository(private val remoteDataSource: MealRemoteDataSource) : MealD
     ) {
         remoteDataSource.filterByIngredient(apiKey, ingredient, callback)
     }
+
+    override fun filterByCategory(
+        apiKey: String,
+        category: String,
+        callback: MealDataSource.GetRemoteCallback<MealResponse<MealFilter>>
+    ) {
+        remoteDataSource.filterByCategory(apiKey, category, callback)
+    }
+
+    override fun filterByArea(
+        apiKey: String,
+        area: String,
+        callback: MealDataSource.GetRemoteCallback<MealResponse<MealFilter>>
+    ) {
+        remoteDataSource.filterByArea(apiKey, area, callback)
+    }
 }