Update api response models

isoguzay · isoguzay · commit 444a2125ce2a · 2022-04-17T01:59:45.000+03:00
diff --git a/app/src/main/java/com/adyen/android/assignment/data/remote/model/Category.kt b/app/src/main/java/com/adyen/android/assignment/data/remote/model/Category.kt
diff --git a/app/src/main/java/com/adyen/android/assignment/data/remote/model/GeoCode.kt b/app/src/main/java/com/adyen/android/assignment/data/remote/model/GeoCode.kt
diff --git a/app/src/main/java/com/adyen/android/assignment/data/remote/model/Icon.kt b/app/src/main/java/com/adyen/android/assignment/data/remote/model/Icon.kt
diff --git a/app/src/main/java/com/adyen/android/assignment/data/remote/model/Location.kt b/app/src/main/java/com/adyen/android/assignment/data/remote/model/Location.kt
diff --git a/app/src/main/java/com/adyen/android/assignment/data/remote/model/ResponseWrapper.kt b/app/src/main/java/com/adyen/android/assignment/data/remote/model/ResponseWrapper.kt
diff --git a/app/src/main/java/com/adyen/android/assignment/data/remote/model/Result.kt b/app/src/main/java/com/adyen/android/assignment/data/remote/model/Result.kt
diff --git a/app/src/main/java/com/adyen/android/assignment/model/response/Category.kt b/app/src/main/java/com/adyen/android/assignment/model/response/Category.kt
@@ -0,0 +1,7 @@
+package com.adyen.android.assignment.model.response
+
+data class Category(
+    var icon: Icon?,
+    var id: Int?,
+    var name: String?
+)
diff --git a/app/src/main/java/com/adyen/android/assignment/model/response/Children.kt b/app/src/main/java/com/adyen/android/assignment/model/response/Children.kt
@@ -0,0 +1,6 @@
+package com.adyen.android.assignment.model.response
+
+data class Children(
+    var fsq_id: String?,
+    var name: String?
+)
diff --git a/app/src/main/java/com/adyen/android/assignment/model/response/Geocodes.kt b/app/src/main/java/com/adyen/android/assignment/model/response/Geocodes.kt
@@ -0,0 +1,6 @@
+package com.adyen.android.assignment.model.response
+
+data class Geocodes(
+    var main: Main?,
+    var roof: Roof?
+)
diff --git a/app/src/main/java/com/adyen/android/assignment/model/response/Icon.kt b/app/src/main/java/com/adyen/android/assignment/model/response/Icon.kt
@@ -0,0 +1,6 @@
+package com.adyen.android.assignment.model.response
+
+data class Icon(
+    var prefix: String?,
+    var suffix: String?
+)
diff --git a/app/src/main/java/com/adyen/android/assignment/model/response/Location.kt b/app/src/main/java/com/adyen/android/assignment/model/response/Location.kt
@@ -0,0 +1,12 @@
+package com.adyen.android.assignment.model.response
+
+data class Location(
+    var address: String?,
+    var country: String?,
+    var cross_street: String?,
+    var formatted_address: String?,
+    var locality: String?,
+    var neighborhood: List<String>?,
+    var postcode: String?,
+    var region: String?
+)
diff --git a/app/src/main/java/com/adyen/android/assignment/model/response/Main.kt b/app/src/main/java/com/adyen/android/assignment/model/response/Main.kt
@@ -0,0 +1,6 @@
+package com.adyen.android.assignment.model.response
+
+data class Main(
+    var latitude: Double?,
+    var longitude: Double?
+)
diff --git a/app/src/main/java/com/adyen/android/assignment/model/response/Parent.kt b/app/src/main/java/com/adyen/android/assignment/model/response/Parent.kt
@@ -0,0 +1,6 @@
+package com.adyen.android.assignment.model.response
+
+data class Parent(
+    var fsq_id: String?,
+    var name: String?
+)
diff --git a/app/src/main/java/com/adyen/android/assignment/model/response/PlacesReponse.kt b/app/src/main/java/com/adyen/android/assignment/model/response/PlacesReponse.kt
@@ -0,0 +1,5 @@
+package com.adyen.android.assignment.model.response
+
+data class PlacesReponse(
+    var results: List<Result>?
+)
diff --git a/app/src/main/java/com/adyen/android/assignment/model/response/RelatedPlaces.kt b/app/src/main/java/com/adyen/android/assignment/model/response/RelatedPlaces.kt
@@ -0,0 +1,6 @@
+package com.adyen.android.assignment.model.response
+
+data class RelatedPlaces(
+    var children: List<Children>?,
+    var parent: Parent?
+)
diff --git a/app/src/main/java/com/adyen/android/assignment/model/response/Result.kt b/app/src/main/java/com/adyen/android/assignment/model/response/Result.kt
@@ -0,0 +1,13 @@
+package com.adyen.android.assignment.model.response
+
+data class Result(
+    var categories: List<Category>?,
+    var chains: List<Any>?,
+    var distance: Int?,
+    var fsq_id: String?,
+    var geocodes: Geocodes?,
+    var location: Location?,
+    var name: String?,
+    var related_places: RelatedPlaces?,
+    var timezone: String?
+)
diff --git a/app/src/main/java/com/adyen/android/assignment/model/response/Roof.kt b/app/src/main/java/com/adyen/android/assignment/model/response/Roof.kt
@@ -0,0 +1,6 @@
+package com.adyen.android.assignment.model.response
+
+data class Roof(
+    var latitude: Double?,
+    var longitude: Double?
+)
diff --git a/app/src/main/java/com/adyen/android/assignment/network/service/PlacesService.kt b/app/src/main/java/com/adyen/android/assignment/network/service/PlacesService.kt
@@ -1,7 +1,8 @@
 package com.adyen.android.assignment.network.service
 
 import com.adyen.android.assignment.BuildConfig
-import com.adyen.android.assignment.data.remote.model.ResponseWrapper
+import com.adyen.android.assignment.model.response.PlacesReponse
+import com.adyen.android.assignment.network.util.NetworkResult
 import retrofit2.Call
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
@@ -18,7 +19,16 @@ interface PlacesService {
      */
     @Headers("Authorization: ${BuildConfig.API_KEY}")
     @GET("places/nearby")
-    fun getVenueRecommendations(@QueryMap query: Map<String, String>): Call<ResponseWrapper>
+    fun getVenueRecommendations(@QueryMap query: Map<String, String>): Call<PlacesReponse>
+
+    /**
+     * Get venue recommendations.
+     *
+     * See [the docs](https://developer.foursquare.com/reference/places-nearby)
+     */
+    @Headers("Authorization: ${BuildConfig.API_KEY}")
+    @GET("places/nearby")
+    suspend fun getVenueRecommendationPlaces(@QueryMap query: Map<String, String>): NetworkResult<PlacesReponse>
 
     companion object {
         private val retrofit by lazy {
diff --git a/app/src/main/java/com/adyen/android/assignment/ui/theme/Type.kt b/app/src/main/java/com/adyen/android/assignment/ui/theme/Type.kt
@@ -11,5 +11,10 @@ val Typography = Typography(
         fontFamily = FontFamily.Default,
         fontWeight = FontWeight.Normal,
         fontSize = 16.sp
-    )
+    ),
+    body2 = TextStyle(
+        fontFamily = FontFamily.Default,
+        fontWeight = FontWeight.Normal,
+        fontSize = 14.sp
+    ),
 )
