add auto complete in search with countries

HamdiBoumaiza · Mar 29, 2020 · 26a9fef · 26a9fef
1 parent 061ed1d
commit 26a9fef
Show file tree

Hide file tree

Showing 11 changed files with 96 additions and 9 deletions.
diff --git a/app/src/main/java/com/hb/covid19status/api/ApiService.kt b/app/src/main/java/com/hb/covid19status/api/ApiService.kt
@@ -1,7 +1,8 @@
 package com.hb.covid19status.api
 
 import com.hb.covid19status.data.ResponseHistoryCountry
-import com.hb.covid19status.data.ResponseListCountries
+import com.hb.covid19status.data.ResponseListCountriesAffected
+import com.hb.covid19status.data.ResponseListCountriesStats
 import com.hb.covid19status.model.WorldStats
 import retrofit2.http.GET
 import retrofit2.http.Header
@@ -17,7 +18,7 @@ interface ApiService {
     @GET(ALL_COUNTRIES_STATS_URL)
     suspend fun getListCountriesStatsAsync(
         @Header("x-rapidapi-key") amount: String
-    ): ResponseListCountries
+    ): ResponseListCountriesStats
 
     @GET(HISTORY_BY_COUNTRIES_BY_DATE_URL)
     suspend fun getHistoryByCountryAndDate(
@@ -26,4 +27,9 @@ interface ApiService {
         @Query("date") date: String
     ): ResponseHistoryCountry
 
+    @GET(LIST_AFFECTED_COUNTRY_URL)
+    suspend fun getlistAffectedCountries(
+        @Header("x-rapidapi-key") amount: String
+    ): ResponseListCountriesAffected
+
 }
diff --git a/app/src/main/java/com/hb/covid19status/api/NetworkConfig.kt b/app/src/main/java/com/hb/covid19status/api/NetworkConfig.kt
@@ -5,4 +5,5 @@ const val BASE_URL = "https://coronavirus-monitor.p.rapidapi.com/coronavirus/"
 
 const val GENERAL_WORLD_STATS_URL = "worldstat.php"
 const val ALL_COUNTRIES_STATS_URL = "cases_by_country.php"
-const val HISTORY_BY_COUNTRIES_BY_DATE_URL = "history_by_country_and_date.php"
+const val HISTORY_BY_COUNTRIES_BY_DATE_URL = "history_by_country_and_date.php"
+const val LIST_AFFECTED_COUNTRY_URL = "affected.php"
diff --git a/app/src/main/java/com/hb/covid19status/data/ResponseListCountriesAffected.kt b/app/src/main/java/com/hb/covid19status/data/ResponseListCountriesAffected.kt
@@ -0,0 +1,11 @@
+package com.hb.covid19status.data
+
+import com.google.gson.annotations.SerializedName
+import java.io.Serializable
+
+
+data class ResponseListCountriesAffected(
+
+    @SerializedName("affected_countries")
+    val affected_countries: List<String>
+) : Serializable
diff --git a/...vid19status/data/ResponseListCountries.kt → ...status/data/ResponseListCountriesStats.kt b/...vid19status/data/ResponseListCountries.kt → ...status/data/ResponseListCountriesStats.kt
@@ -4,7 +4,7 @@ import com.google.gson.annotations.SerializedName
 import com.hb.covid19status.model.CountryStat
 
 
-data class ResponseListCountries(
+data class ResponseListCountriesStats(
 
     @SerializedName("countries_stat")
     val countries_stat: List<CountryStat>

diff --git a/app/src/main/java/com/hb/covid19status/data_source/remote/RemoteDataSource.kt b/app/src/main/java/com/hb/covid19status/data_source/remote/RemoteDataSource.kt
@@ -1,14 +1,16 @@
 package com.hb.covid19status.data_source.remote
 
 import com.hb.covid19status.data.ResponseHistoryCountry
-import com.hb.covid19status.data.ResponseListCountries
+import com.hb.covid19status.data.ResponseListCountriesAffected
+import com.hb.covid19status.data.ResponseListCountriesStats
 import com.hb.covid19status.data.ResultData
 import com.hb.covid19status.model.WorldStats
 
 interface RemoteDataSource {
 
     suspend fun worldWithStats(): ResultData<WorldStats>
-    suspend fun listCountriesWithStats(): ResultData<ResponseListCountries>
+    suspend fun listCountriesWithStats(): ResultData<ResponseListCountriesStats>
     suspend fun historyByDateByCountryStats(country : String, date : String): ResultData<ResponseHistoryCountry>
+    suspend fun affectedCountries(): ResultData<ResponseListCountriesAffected>
 
 }
diff --git a/app/src/main/java/com/hb/covid19status/data_source/remote/RemoteDataSourceImpl.kt b/app/src/main/java/com/hb/covid19status/data_source/remote/RemoteDataSourceImpl.kt
@@ -11,7 +11,8 @@ package com.hb.covid19status.data_source.remote
 import com.hb.covid19status.BuildConfig
 import com.hb.covid19status.api.ApiService
 import com.hb.covid19status.data.ResponseHistoryCountry
-import com.hb.covid19status.data.ResponseListCountries
+import com.hb.covid19status.data.ResponseListCountriesAffected
+import com.hb.covid19status.data.ResponseListCountriesStats
 import com.hb.covid19status.data.ResultData
 import com.hb.covid19status.di.IoDispatcher
 import com.hb.covid19status.model.WorldStats
@@ -31,7 +32,7 @@ class RemoteDataSourceImpl(
         }
 
 
-    override suspend fun listCountriesWithStats(): ResultData<ResponseListCountries> =
+    override suspend fun listCountriesWithStats(): ResultData<ResponseListCountriesStats> =
         withContext(ioDispatcher) {
             val request =
                 api.getListCountriesStatsAsync(BuildConfig.API_KEY)
@@ -48,4 +49,11 @@ class RemoteDataSourceImpl(
             ResultData.Success(request)
         }
 
+    override suspend fun affectedCountries(): ResultData<ResponseListCountriesAffected> =
+        withContext(ioDispatcher) {
+            val request =
+                api.getlistAffectedCountries(BuildConfig.API_KEY)
+            ResultData.Success(request)
+        }
+
 }
diff --git a/app/src/main/java/com/hb/covid19status/repository/AppRepository.kt b/app/src/main/java/com/hb/covid19status/repository/AppRepository.kt
@@ -1,6 +1,7 @@
 package com.hb.covid19status.repository
 
 import com.hb.covid19status.data.ResponseHistoryCountry
+import com.hb.covid19status.data.ResponseListCountriesAffected
 import com.hb.covid19status.data.ResultData
 import com.hb.covid19status.model.CountryStat
 import com.hb.covid19status.model.WorldStats
@@ -17,4 +18,6 @@ interface AppRepository {
 
     suspend fun historyByDateByCountryStats(country : String, date : String): ResultData<ResponseHistoryCountry>
 
+    suspend fun affectedCountries(): ResultData<ResponseListCountriesAffected>
+
 }
diff --git a/app/src/main/java/com/hb/covid19status/repository/AppRepositoryImpl.kt b/app/src/main/java/com/hb/covid19status/repository/AppRepositoryImpl.kt
@@ -2,6 +2,7 @@ package com.hb.covid19status.repository
 
 import com.hb.covid19status.data.RemoteDataNotFoundException
 import com.hb.covid19status.data.ResponseHistoryCountry
+import com.hb.covid19status.data.ResponseListCountriesAffected
 import com.hb.covid19status.data.ResultData
 import com.hb.covid19status.data_source.local.AppDao
 import com.hb.covid19status.data_source.remote.RemoteDataSource
@@ -88,4 +89,15 @@ class AppRepositoryImpl(
         }
     }
 
+    override suspend fun affectedCountries(): ResultData<ResponseListCountriesAffected> {
+        return when (val result = remoteDataSource.affectedCountries()) {
+            is ResultData.Success -> {
+                ResultData.Success(result.data)
+            }
+            is ResultData.Error -> {
+                ResultData.Error(RemoteDataNotFoundException())
+            }
+        }
+    }
+
 }
diff --git a/app/src/main/java/com/hb/covid19status/ui/search_history/SearchHistoryFragment.kt b/app/src/main/java/com/hb/covid19status/ui/search_history/SearchHistoryFragment.kt
@@ -7,6 +7,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.ArrayAdapter
 import androidx.annotation.Nullable
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
@@ -23,6 +24,7 @@ import java.text.SimpleDateFormat
 import java.util.*
 import javax.inject.Inject
 
+
 class SearchHistoryFragment : Fragment(), View.OnClickListener {
 
     private val appComponents by lazy { MainApplication.appComponents }
@@ -50,6 +52,7 @@ class SearchHistoryFragment : Fragment(), View.OnClickListener {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        getViewModel().getListAffectedCountries()
         initObservers()
         initCalendar()
         binding.edittextCalendar.setOnClickListener(this)
@@ -100,6 +103,12 @@ class SearchHistoryFragment : Fragment(), View.OnClickListener {
     }
 
     private fun initObservers() {
+        getViewModel().resulAffectedCountries.observe(this, Observer { response ->
+            response?.let {
+                setAutoCompleteData(it)
+            }
+        })
+
         getViewModel().resultHistory.observe(this, Observer { response ->
             response?.let { sendData(it) }
         })
@@ -114,6 +123,17 @@ class SearchHistoryFragment : Fragment(), View.OnClickListener {
         })
     }
 
+    // Create the adapter and set it to the AutoCompleteTextView
+    private fun setAutoCompleteData(listCountries: List<String>) {
+        ArrayAdapter<String>(
+            activity!!,
+            android.R.layout.simple_list_item_1,
+            listCountries
+        ).also { adapter ->
+            binding.edittextSearch.setAdapter(adapter)
+        }
+    }
+
     private fun handleError() {
         activity?.toast(getString(R.string.error_message))
     }

diff --git a/app/src/main/java/com/hb/covid19status/ui/search_history/SearchHistoryViewModel.kt b/app/src/main/java/com/hb/covid19status/ui/search_history/SearchHistoryViewModel.kt
@@ -17,6 +17,9 @@ class SearchHistoryViewModel @Inject constructor(
     private var _resultHistory = MutableLiveData<ResponseHistoryCountry>()
     var resultHistory: LiveData<ResponseHistoryCountry> = _resultHistory
 
+    private var _resulAffectedCountries = MutableLiveData<List<String>>()
+    var resulAffectedCountries: LiveData<List<String>> = _resulAffectedCountries
+
     private var _errorMessage = MutableLiveData<String>()
     var errorMessage: LiveData<String> = _errorMessage
 
@@ -43,4 +46,25 @@ class SearchHistoryViewModel @Inject constructor(
             }
         }
     }
+
+    fun getListAffectedCountries() {
+        _showLoading.postValue(true)
+        viewModelScope.launch {
+            try {
+                when (val response = repositoryImpl.affectedCountries()) {
+                    is ResultData.Success -> {
+                        _showLoading.postValue(false)
+                        _resulAffectedCountries.postValue(response.data.affected_countries)
+                    }
+                    is ResultData.Error -> {
+                        _showLoading.postValue(false)
+                        _errorMessage.postValue("")
+                    }
+                }
+            } catch (e: Exception) {
+                _showLoading.postValue(false)
+                _errorMessage.postValue(e.message)
+            }
+        }
+    }
 }
diff --git a/app/src/main/res/layout/fragment_history_stats.xml b/app/src/main/res/layout/fragment_history_stats.xml
@@ -35,7 +35,7 @@
             app:layout_constraintStart_toStartOf="@+id/guideline_vertical10"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <EditText
+        <AutoCompleteTextView
             android:id="@+id/edittext_search"
             style="@style/EditText.Flat.Grey"
             android:layout_width="0dp"