- Bug fixes and improvements

mehatab · May 1, 2020 · a871f5d · a871f5d
1 parent d6e838e
commit a871f5d
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 16 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # COVID-19 Tracker Android Application
 This application displays the latest updates based on numbers from https://www.covid19india.org/
 
-## <a href="https://github.com/Mehatab/covid-19/releases/download/v1.5.5/app-release.apk">Download</a> APK & install
+## <a href="https://github.com/Mehatab/covid-19/releases/download/v1.5.6/app-release.apk">Download</a> APK & install
 
 ## Required Permissions
     android.permission.INTERNET

diff --git a/app/release/output.json b/app/release/output.json
@@ -6,8 +6,8 @@
     "apkData": {
       "type": "MAIN",
       "splits": [],
-      "versionCode": 14,
-      "versionName": "1.5.4",
+      "versionCode": 16,
+      "versionName": "1.5.6",
       "enabled": true,
       "outputFile": "app-release.apk",
       "fullName": "release",

diff --git a/app/src/main/java/info/covid/state/StateDetailsRepository.kt b/app/src/main/java/info/covid/state/StateDetailsRepository.kt
@@ -2,21 +2,27 @@ package info.covid.state
 
 import info.covid.customview.DataPoint
 import info.covid.models.DistrictState
+import info.covid.models.StateDailyResponse
 import info.covid.network.RetrofitClient
+import retrofit2.Response
 
-class StateDetailsRepository {
+object StateDetailsRepository {
 
     private val apiService = RetrofitClient.get().create(StateAPIService::class.java)
+    private lateinit var districtListResp: Response<List<DistrictState>>
 
     suspend fun <T> getDistrictInfo(
         stateName: String,
         success: (DistrictState?) -> T,
         error: (String) -> T
     ) {
         try {
-            val resp = apiService.getStateDistrictWise()
-            if (resp.isSuccessful) {
-                val states = resp.body() ?: emptyList()
+
+            if (::districtListResp.isInitialized.not() || districtListResp.isSuccessful.not())
+                districtListResp = apiService.getStateDistrictWise()
+
+            if (districtListResp.isSuccessful) {
+                val states = districtListResp.body() ?: emptyList()
                 val state = states.find { it.state == stateName }
                 success(state)
             } else error("Oops, Something went wrong")
@@ -25,15 +31,19 @@ class StateDetailsRepository {
         }
     }
 
+    private lateinit var StateDaily: Response<StateDailyResponse>
+
     suspend fun <T> getStateDaily(
         state: String,
         success: (HashMap<String, ArrayList<DataPoint>>, max: Float) -> T,
         error: (String) -> T
     ) {
         try {
-            val resp = apiService.getStateDaily()
-            if (resp.isSuccessful) {
-                val states = resp.body()?.dailyStats ?: emptyList()
+            if (::districtListResp.isInitialized.not() || districtListResp.isSuccessful.not())
+                StateDaily = apiService.getStateDaily()
+
+            if (StateDaily.isSuccessful) {
+                val states = StateDaily.body()?.dailyStats ?: emptyList()
                 val mapData = HashMap<String, ArrayList<DataPoint>>()
                 var max = 0f
 

diff --git a/app/src/main/java/info/covid/state/StateDetailsViewModel.kt b/app/src/main/java/info/covid/state/StateDetailsViewModel.kt
@@ -12,7 +12,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
 class StateDetailsViewModel(application: Application) : AndroidViewModel(application) {
-    private val stateWiseRepository = StateDetailsRepository()
     val districts = MutableLiveData<List<District>>()
     val stateName = MutableLiveData<String>()
     val recoversMapData = MutableLiveData<List<DataPoint>>()
@@ -36,7 +35,7 @@ class StateDetailsViewModel(application: Application) : AndroidViewModel(applica
     private fun getDistrictsData(state: String) {
         progress.set(View.VISIBLE)
         viewModelScope.launch(Dispatchers.IO) {
-            stateWiseRepository.getDistrictInfo(state, {
+            StateDetailsRepository.getDistrictInfo(state, {
                 districts.postValue((it?.districts?.sortedByDescending { it.confirmed }
                     ?: emptyList()))
                 progress.set(View.GONE)
@@ -50,7 +49,7 @@ class StateDetailsViewModel(application: Application) : AndroidViewModel(applica
 
     private fun getDailyData(stateName: String) {
         viewModelScope.launch(Dispatchers.IO) {
-            stateWiseRepository.getStateDaily(stateName, { it, max ->
+            StateDetailsRepository.getStateDaily(stateName, { it, max ->
                 maxNumber = max
                 recoversMapData.postValue(it["Recovered"])
                 confirmedMapData.postValue(it["Confirmed"])

diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
@@ -92,7 +92,6 @@
         </PreferenceScreen>
 
         <PreferenceScreen app:enabled="false"/>
-        <PreferenceScreen app:enabled="false"/>
 
     </PreferenceCategory>
 

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -4,8 +4,8 @@ object Config {
     const val applicationId = "info.covid"
     const val minSdk = 19
     const val targetSdk = 29
-    const val versionCode = 15
-    const val versionName = "1.5.5"
+    const val versionCode = 16
+    const val versionName = "1.5.6"
 }
 
 object Versions {