Merge pull request #3 from isoguzay/task/add-service-location-circular-progress

task/add-state-control-and-circular-progress

Author: isoguzay

app/src/main/java/com/adyen/android/assignment/network/service/PlacesService.kt

@@ -10,7 +10,6 @@ import retrofit2.http.GET
 import retrofit2.http.Headers
 import retrofit2.http.QueryMap
 
-
 interface PlacesService {
     /**
      * Get venue recommendations.

app/src/main/java/com/adyen/android/assignment/screens/home/view/HomeScreen.kt

@@ -26,7 +26,6 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import com.adyen.android.assignment.R
 import com.adyen.android.assignment.model.response.Category
 import com.adyen.android.assignment.model.response.Result
-import com.adyen.android.assignment.network.util.NetworkResult
 import com.adyen.android.assignment.screens.home.viewmodel.HomeViewModel
 import com.adyen.android.assignment.screens.permission.screen.LocationPermissionScreen
 import com.adyen.android.assignment.screens.permission.viewmodel.PermissionViewModel
@@ -36,7 +35,6 @@ import com.google.android.gms.maps.model.LatLng
 import com.google.maps.android.compose.GoogleMap
 import com.google.maps.android.compose.Marker
 import com.google.maps.android.compose.rememberCameraPositionState
-import timber.log.Timber
 
 @RequiresApi(Build.VERSION_CODES.M)
 @Composable
@@ -45,11 +43,10 @@ fun HomeScreen(
     homeViewModel: HomeViewModel = hiltViewModel(),
     permissionViewModel: PermissionViewModel = hiltViewModel()
 ) {
+    val venuesListState = homeViewModel.venuesListState
 
-    val placesStatesList = mutableListOf<Result>()
+    val showProgress = remember { mutableStateOf(false) }
     val showInfo = remember { mutableStateOf(false) }
-
-    val placesState = homeViewModel.places.observeAsState()
     val selectedPlaceState = homeViewModel.selectedPlace.observeAsState()
     val permissionsState = permissionViewModel.locationPermission.observeAsState()
     val currentLocation = homeViewModel.currentLocation.observeAsState()
@@ -67,26 +64,12 @@ fun HomeScreen(
         LocationPermissionScreen()
     }
 
-    when (val placesResponse = placesState.value) {
-        is NetworkResult.Success -> {
-            placesResponse.data?.results?.forEach { result ->
-                placesStatesList.add(result)
-            }
-        }
-        is NetworkResult.Failure -> {
-            placesResponse.apply {
-                Timber.e("$statusCode")
-            }
-        }
-        else -> {}
-    }
-
-    if (placesStatesList.isNotEmpty()) {
+    if (venuesListState.venueList?.isNotEmpty() == true) {
         GoogleMap(
             modifier = Modifier.fillMaxSize(),
             cameraPositionState = cameraPositionState
         ) {
-            placesStatesList.forEach { place ->
+            venuesListState.venueList.forEach { place ->
                 place.geocodes?.main?.let { main ->
                     Marker(
                         position = LatLng(
@@ -103,7 +86,6 @@ fun HomeScreen(
                 }
             }
         }
-
         Box(
             modifier = Modifier
                 .fillMaxWidth()
@@ -113,6 +95,7 @@ fun HomeScreen(
             Button(modifier = Modifier
                 .wrapContentSize(),
                 onClick = {
+                    showProgress.value = true
                     locationRequestOnClick()
                 }) {
                 Icon(
@@ -123,13 +106,37 @@ fun HomeScreen(
             }
         }
     }
+    Box(
+        modifier = Modifier.fillMaxSize(),
+        contentAlignment = Alignment.Center
+    ) {
+        if (venuesListState.isLoading) {
+            CircularProgressIndicator()
+        } else if (venuesListState.error != null) {
+            Text(
+                text = venuesListState.error,
+                color = MaterialTheme.colors.error
+            )
+        }
+    }
 
     if (currentLocation.value != null) {
         homeViewModel.getPlaces(currentLocation.value!!)
         cameraPositionState.position = CameraPosition.fromLatLngZoom(
             homeViewModel.getUserCurrentLocation(),
             GOOGLE_MAPS_CAMERA_ZOOM
         )
+        showProgress.value = false
+        homeViewModel.setCurrentLocationEmpty()
+    }
+
+    if (showProgress.value) {
+        Box(
+            modifier = Modifier.fillMaxSize(),
+            contentAlignment = Alignment.Center
+        ) {
+            CircularProgressIndicator()
+        }
     }
 
     if (selectedPlaceState.value != null) {

app/src/main/java/com/adyen/android/assignment/screens/home/viewmodel/HomeViewModel.kt

@@ -1,5 +1,8 @@
 package com.adyen.android.assignment.screens.home.viewmodel
 
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
@@ -19,20 +22,37 @@ import javax.inject.Inject
 class HomeViewModel @Inject constructor(private val placesRepository: PlacesRepository) :
     ViewModel() {
 
-    private val mGetPlaces = MutableLiveData<NetworkResult<PlacesReponse>>()
-    val places: LiveData<NetworkResult<PlacesReponse>>
-        get() = mGetPlaces
+    var venuesListState by mutableStateOf(VenuesListState())
 
     private val mSelectedPlace = MutableLiveData<Result>()
     val selectedPlace: LiveData<Result>
         get() = mSelectedPlace
 
-    private val mCurrentLocation = MutableLiveData<LocationRequestModel>()
-    val currentLocation: LiveData<LocationRequestModel>
+    private val mCurrentLocation = MutableLiveData<LocationRequestModel?>()
+    val currentLocation: LiveData<LocationRequestModel?>
         get() = mCurrentLocation
 
     fun getPlaces(requestModel: LocationRequestModel) = viewModelScope.launch {
-        mGetPlaces.value = placesRepository.getPlaces(requestModel = requestModel)
+        venuesListState = venuesListState.copy(isLoading = true)
+        when (val placesResponse = placesRepository.getPlaces(requestModel = requestModel)) {
+            is NetworkResult.Success -> {
+                placesResponse.data?.results?.let { venueList ->
+                    venuesListState = venuesListState.copy(
+                        venueList = venueList,
+                        isLoading = false,
+                        error = null
+                    )
+                }
+            }
+            is NetworkResult.Failure -> {
+                venuesListState = venuesListState.copy(
+                    venueList = null,
+                    isLoading = false,
+                    error = placesResponse.statusCode.toString()
+                )
+            }
+            else -> {}
+        }
     }
 
     fun setSelectedPlace(place: Result) {
@@ -47,6 +67,10 @@ class HomeViewModel @Inject constructor(private val placesRepository: PlacesRepo
         mCurrentLocation.value = locationRequestModel
     }
 
+    fun setCurrentLocationEmpty() {
+        mCurrentLocation.value = null
+    }
+
     fun getDummyAmsterdamLocation(): LatLng {
         return LatLng(Constant.DUMMY_LOCATION_LAT, Constant.DUMMY_LOCATION_LON)
     }
@@ -58,4 +82,5 @@ class HomeViewModel @Inject constructor(private val placesRepository: PlacesRepo
         )
     }
 
+
 }

app/src/main/java/com/adyen/android/assignment/screens/home/viewmodel/VenuesListState.kt

@@ -0,0 +1,9 @@
+package com.adyen.android.assignment.screens.home.viewmodel
+
+import com.adyen.android.assignment.model.response.Result
+
+data class VenuesListState(
+    val venueList: List<Result>? = emptyList(),
+    val isLoading: Boolean = false,
+    val error: String? = null
+)

app/src/main/java/com/adyen/android/assignment/utils/Constant.kt

@@ -2,7 +2,7 @@ package com.adyen.android.assignment.utils
 
 object Constant {
 
-    const val GOOGLE_MAPS_CAMERA_ZOOM = 16f // float
+    const val GOOGLE_MAPS_CAMERA_ZOOM = 18f // float
     const val DUMMY_LOCATION_LAT = 52.37651 // double dummy location for Amsterdam
     const val DUMMY_LOCATION_LON = 4.90589 // double dummy location for Amsterdam
     const val REQUEST_FINE_LOCATION_PERMISSIONS_REQUEST_CODE = 34