Minor improvements

nareshidiga · nareshidiga · commit ee359def4aca · 2022-07-11T00:02:31.000+01:00
diff --git a/app/src/main/java/com/cleanarch/features/wikientry/presentation/WikiEntryActivity.kt b/app/src/main/java/com/cleanarch/features/wikientry/presentation/WikiEntryActivity.kt
@@ -39,16 +39,16 @@ class WikiEntryActivity : AppCompatActivity() {
         (application as CleanArchApp).buildWikiEntryComponent()
 
         binding = ActivityMainBinding.inflate(layoutInflater)
-        val view = binding.root
-        setContentView(view)
-
+        setContentView(binding.root)
         binding.submitButton.setOnClickListener(submitButtonOnClickListener)
 
         wikiEntryViewModel = ViewModelProvider(this)[WikiEntryViewModel::class.java]
-        wikiEntryViewModel.getWikiEntry().observe(this) { wikiEntry ->
-            Log.d(Companion.TAG, "received update for wikiEntry")
-            binding.entryDetails.text = wikiEntry?.extract
-            binding.progressBar.hide()
+        wikiEntryViewModel.wikiEntry.observe(this) {
+            Log.d(TAG, "received update for wikiEntry")
+            binding.entryDetails.text = it?.extract
+        }
+        wikiEntryViewModel.showProgress.observe(this) {
+            if (it) binding.progressBar.show() else binding.progressBar.hide()
         }
     }
 
@@ -59,7 +59,6 @@ class WikiEntryActivity : AppCompatActivity() {
     }
 
     private val submitButtonOnClickListener = View.OnClickListener { v ->
-        binding.progressBar.show()
         val inputMethodManager =
             this@WikiEntryActivity.baseContext.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
         inputMethodManager.hideSoftInputFromWindow(v.windowToken, 0)
diff --git a/app/src/main/java/com/cleanarch/features/wikientry/presentation/WikiEntryViewModel.kt b/app/src/main/java/com/cleanarch/features/wikientry/presentation/WikiEntryViewModel.kt
@@ -37,34 +37,41 @@ import javax.inject.Inject
 
 class WikiEntryViewModel(application: Application) : AndroidViewModel(application) {
 
-    private var wikiEntry: MutableLiveData<WikiEntry>
+    private val _wikiEntry: MutableLiveData<WikiEntry> by lazy {
+        MutableLiveData<WikiEntry>()
+    }
+    val wikiEntry: LiveData<WikiEntry>
+        get() = _wikiEntry
+
+    private val _showProgress: MutableLiveData<Boolean> by lazy {
+        MutableLiveData<Boolean>(false)
+    }
+    val showProgress: LiveData<Boolean>
+        get() = _showProgress
 
     @Inject
     lateinit var getWikiEntryUseCase: Lazy<GetWikiEntryUseCase>
 
     init {
         (application as CleanArchApp).wikiEntryComponent?.inject(this)
-        wikiEntry = MutableLiveData<WikiEntry>()
-    }
-
-    internal fun getWikiEntry(): LiveData<WikiEntry> {
-        return wikiEntry
     }
 
     internal fun loadWikiEntry(title: String) {
         viewModelScope.launch {
+            _showProgress.value = true
             val item = withContext(Dispatchers.IO) {
                 getWikiEntryUseCase.get()
                     .execute(GetWikiEntryUseCase.Input(title))
-                    .onCompletion { Log.d(TAG,"completed wiki query") }
+                    .onCompletion { Log.d(TAG, "completed wiki query") }
                     .catch { exception -> Log.d(TAG, "Received $exception") }
                     .firstOrNull()
             }
-            wikiEntry.value = item ?: WikiEntry(
+            _wikiEntry.value = item ?: WikiEntry(
                 -1,
                 "",
                 getApplication<Application>().getString(R.string.no_results_found)
             )
+            _showProgress.value = false
         }
     }
 
