Upgrade deps (#1708)
* upgrade Dagger * upgrade AndroidX Lifecycle * upgrade AndroidX Fragment * upgrade Room, Retrofit, AndroidX core, Material components * fix report fragments not sharing viewmodels
This commit is contained in:
parent
398ee66084
commit
d9c802982e
18 changed files with 46 additions and 79 deletions
|
|
@ -19,7 +19,6 @@ import android.Manifest
|
|||
import android.app.Activity
|
||||
import androidx.lifecycle.LiveData
|
||||
import androidx.lifecycle.Observer
|
||||
import androidx.lifecycle.ViewModelProviders
|
||||
import android.content.Intent
|
||||
import android.content.pm.PackageManager
|
||||
import android.graphics.Bitmap
|
||||
|
|
@ -34,6 +33,7 @@ import android.view.Menu
|
|||
import android.view.MenuItem
|
||||
import android.view.View
|
||||
import android.widget.ImageView
|
||||
import androidx.activity.viewModels
|
||||
import com.bumptech.glide.Glide
|
||||
import com.bumptech.glide.load.resource.bitmap.FitCenter
|
||||
import com.bumptech.glide.load.resource.bitmap.RoundedCorners
|
||||
|
|
@ -69,7 +69,7 @@ class EditProfileActivity : BaseActivity(), Injectable {
|
|||
@Inject
|
||||
lateinit var viewModelFactory: ViewModelFactory
|
||||
|
||||
private lateinit var viewModel: EditProfileViewModel
|
||||
private val viewModel: EditProfileViewModel by viewModels { viewModelFactory }
|
||||
|
||||
private var currentlyPicking: PickType = PickType.NOTHING
|
||||
|
||||
|
|
@ -90,8 +90,6 @@ class EditProfileActivity : BaseActivity(), Injectable {
|
|||
|
||||
setContentView(R.layout.activity_edit_profile)
|
||||
|
||||
viewModel = ViewModelProviders.of(this, viewModelFactory)[EditProfileViewModel::class.java]
|
||||
|
||||
setSupportActionBar(toolbar)
|
||||
supportActionBar?.run {
|
||||
setTitle(R.string.title_edit_profile)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue