-ViewModelProvider deprecated code migrated to latest for fragment / …

…Activity

- Boilerplate code removed.

app/src/main/java/com/kotlin/mvvm/ui/countries/CountriesFragment.kt

@@ -3,39 +3,43 @@ package com.kotlin.mvvm.ui.countries
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import com.kotlin.mvvm.R
-import com.kotlin.mvvm.di.base.Injectable
 import com.kotlin.mvvm.repository.model.countries.Country
 import com.kotlin.mvvm.ui.news.NewsActivity
 
 import dagger.android.support.AndroidSupportInjection
+import dagger.android.support.DaggerFragment
 import kotlinx.android.synthetic.main.fragment_country_list.view.*
 import javax.inject.Inject
 
 /**
  * Created by Waheed on 08,November,2019
+ * Updated to dagger 2.27, 29, September 2020
  */
 
 /**
  * A fragment representing a list of Items.
  */
-class CountriesFragment : Fragment(), Injectable {
+class CountriesFragment : DaggerFragment() {
 
  @Inject
  lateinit var viewModelFactory: ViewModelProvider.Factory
 
+
+ private val countriesViewModel: CountriesViewModel by viewModels {
+ viewModelFactory
+ }
+
  private var columnCount = 1
  private lateinit var countriesAdapter: CountriesAdapter
- private lateinit var countriesViewModel: CountriesViewModel
  private var listOfCountries = ArrayList<Country>()
  private lateinit var thisView: View
 
@@ -94,10 +98,6 @@ class CountriesFragment : Fragment(), Injectable {
  *
  */
  private fun load() {
- countriesViewModel =
- ViewModelProviders.of(this, viewModelFactory).get(CountriesViewModel::class.java)
-
-
  thisView.recyclerview_countries.layoutManager =
  if (columnCount <= 1) LinearLayoutManager(context) else GridLayoutManager(
  context,

app/src/main/java/com/kotlin/mvvm/ui/news/NewsActivity.kt

@@ -1,14 +1,13 @@
 package com.kotlin.mvvm.ui.news
 
 import android.os.Bundle
+import androidx.activity.viewModels
 import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.kotlin.mvvm.R
 import com.kotlin.mvvm.ui.BaseActivity
 import com.kotlin.mvvm.utils.ToastUtil
-import com.kotlin.mvvm.utils.extensions.getViewModel
 import com.kotlin.mvvm.utils.extensions.load
-import com.kotlin.mvvm.utils.extensions.toast
 import kotlinx.android.synthetic.main.activity_news_articles.*
 import kotlinx.android.synthetic.main.empty_layout_news_article.*
 import kotlinx.android.synthetic.main.progress_layout_news_article.*
@@ -24,11 +23,10 @@ class NewsActivity : BaseActivity() {
  val KEY_COUNTRY_SHORT_KEY: String = "COUNTRY_SHORT_KEY"
  }
 
-
  private lateinit var adapter: NewsAdapter
 
- private val newsArticleViewModel by lazy {
- getViewModel<NewsViewModel>()
+ private val newsArticleViewModel: NewsViewModel by viewModels {
+ viewModelFactory
  }
 
  /**
@@ -49,7 +47,7 @@ class NewsActivity : BaseActivity() {
  news_list.adapter = adapter
  news_list.layoutManager = LinearLayoutManager(this)
 
- getNewsOfCountry(intent.getStringExtra(KEY_COUNTRY_SHORT_KEY))
+ getNewsOfCountry(intent?.getStringExtra(KEY_COUNTRY_SHORT_KEY)!!)
  }
 
  /**

app/src/main/java/com/kotlin/mvvm/utils/ConnectivityUtil.kt

@@ -9,6 +9,7 @@ import android.net.ConnectivityManager
 
 object ConnectivityUtil {
 
+ @Suppress("DEPRECATION")
  fun isConnected(context: Context): Boolean {
  val connectivityManager =
  context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager

app/src/main/java/com/kotlin/mvvm/utils/IntentUtils.kt

@@ -10,6 +10,7 @@ import androidx.core.app.ShareCompat
  * Created by Waheed on 04,November,2019
  */
 
+
 fun intentShareText(activity: Activity, text: String) {
  val shareIntent = ShareCompat.IntentBuilder.from(activity)
  .setText(text)
@@ -22,7 +23,8 @@ fun intentShareText(activity: Activity, text: String) {
  addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT or Intent.FLAG_ACTIVITY_MULTIPLE_TASK)
  } else {
  // Else, we will use the old CLEAR_WHEN_TASK_RESET flag
- addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET)
+ if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP)
+ addFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET)
  }
  }
  activity.startActivity(shareIntent)

app/src/main/java/com/kotlin/mvvm/utils/extensions/ActivityExtension.kt

@@ -38,6 +38,7 @@ fun Activity.startActivityNewTask(clazz: Class<*>) {
  startActivity(intent)
 }
 
+@Suppress("DEPRECATION")
 fun Activity.isConnectedInternet(): Boolean {
  val connectivityManager =
  this.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager?

app/src/main/java/com/kotlin/mvvm/utils/extensions/ViewExtensions.kt

@@ -46,6 +46,7 @@ fun ViewGroup.inflate(layoutRes: Int): View {
  return LayoutInflater.from(context).inflate(layoutRes, this, false)
 }
 
+@Suppress("DEPRECATION")
 fun Context.getDrawableCompat(@DrawableRes resId: Int, @ColorRes tintColorRes: Int = 0) = when {
  tintColorRes != 0 -> AppCompatResources.getDrawable(this, resId)?.apply {
  setColorFilter(getColorCompat(tintColorRes), PorterDuff.Mode.SRC_ATOP)