From 18dd27ce6fcc1e686050b3ed3fff0f4d59fd0789 Mon Sep 17 00:00:00 2001 From: Matte23 Date: Fri, 11 Sep 2020 12:14:03 +0200 Subject: [PATCH] Fix warnings --- .../circolapp/adapters/CircularLetterAdapter.kt | 15 +++++++++++++-- .../circolapp/fragments/CircularLetterFragment.kt | 13 +++++-------- .../circolapp/fragments/FavouritesFragment.kt | 9 +++------ .../circolapp/fragments/RemindersFragment.kt | 9 +++------ .../viewmodels/CircularLetterViewModel.kt | 2 +- .../circolapp/viewmodels/FavouritesViewModel.kt | 2 +- .../circolapp/viewmodels/RemindersViewModel.kt | 2 +- 7 files changed, 27 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/net/underdesk/circolapp/adapters/CircularLetterAdapter.kt b/app/src/main/java/net/underdesk/circolapp/adapters/CircularLetterAdapter.kt index 1ff363e..4c54d37 100644 --- a/app/src/main/java/net/underdesk/circolapp/adapters/CircularLetterAdapter.kt +++ b/app/src/main/java/net/underdesk/circolapp/adapters/CircularLetterAdapter.kt @@ -34,6 +34,7 @@ import androidx.appcompat.app.AppCompatActivity import androidx.cardview.widget.CardView import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat +import androidx.core.content.ContextCompat.getDrawable import androidx.fragment.app.FragmentActivity import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView @@ -113,7 +114,12 @@ class CircularLetterAdapter( ) if (collapsedItems != position) { - holder.collapseButton.setImageDrawable(context.getDrawable(R.drawable.baseline_expand_more_24)) + holder.collapseButton.setImageDrawable( + getDrawable( + context, + R.drawable.baseline_expand_more_24 + ) + ) holder.collapseButton.contentDescription = context.getString(R.string.image_expand) holder.viewButton.visibility = View.GONE @@ -124,7 +130,12 @@ class CircularLetterAdapter( holder.attachmentsList.visibility = View.GONE holder.attachmentsList.adapter = null } else { - holder.collapseButton.setImageDrawable(context.getDrawable(R.drawable.baseline_expand_less_24)) + holder.collapseButton.setImageDrawable( + getDrawable( + context, + R.drawable.baseline_expand_less_24 + ) + ) holder.collapseButton.contentDescription = context.getString(R.string.image_collapse) holder.viewButton.visibility = View.VISIBLE diff --git a/app/src/main/java/net/underdesk/circolapp/fragments/CircularLetterFragment.kt b/app/src/main/java/net/underdesk/circolapp/fragments/CircularLetterFragment.kt index 883cc02..dbcc46a 100644 --- a/app/src/main/java/net/underdesk/circolapp/fragments/CircularLetterFragment.kt +++ b/app/src/main/java/net/underdesk/circolapp/fragments/CircularLetterFragment.kt @@ -24,8 +24,7 @@ import android.view.View import android.view.ViewGroup import androidx.constraintlayout.widget.ConstraintLayout import androidx.fragment.app.Fragment -import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders +import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager import com.google.android.material.snackbar.Snackbar import kotlinx.android.synthetic.main.fragment_circular_letters.* @@ -38,7 +37,7 @@ import net.underdesk.circolapp.viewmodels.CircularLetterViewModel class CircularLetterFragment : Fragment(), MainActivity.SearchCallback, MainActivity.RefreshCallback { - private lateinit var circularLetterViewModel: CircularLetterViewModel + private val circularLetterViewModel by viewModels() override fun onCreateView( inflater: LayoutInflater, @@ -49,16 +48,14 @@ class CircularLetterFragment : Fragment(), MainActivity.SearchCallback, root.circulars_list.layoutManager = LinearLayoutManager(context) - circularLetterViewModel = - ViewModelProviders.of(this).get(CircularLetterViewModel::class.java) - circularLetterViewModel.circulars.observe(viewLifecycleOwner, Observer { + circularLetterViewModel.circulars.observe(viewLifecycleOwner, { if (root.circulars_list.adapter == null) { root.circulars_list.adapter = CircularLetterAdapter(it, activity as MainActivity) } else { (root.circulars_list.adapter as CircularLetterAdapter).changeDataSet(it) } }) - circularLetterViewModel.showMessage.observe(viewLifecycleOwner, Observer { + circularLetterViewModel.showMessage.observe(viewLifecycleOwner, { if (it) activity?.findViewById(R.id.container)?.let { view -> Snackbar.make( view, @@ -69,7 +66,7 @@ class CircularLetterFragment : Fragment(), MainActivity.SearchCallback, circularLetterViewModel.showMessage.postValue(false) } }) - circularLetterViewModel.circularsUpdated.observe(viewLifecycleOwner, Observer { + circularLetterViewModel.circularsUpdated.observe(viewLifecycleOwner, { if (it) { root.circulars_refresh.isRefreshing = false diff --git a/app/src/main/java/net/underdesk/circolapp/fragments/FavouritesFragment.kt b/app/src/main/java/net/underdesk/circolapp/fragments/FavouritesFragment.kt index ae038b0..346eb16 100644 --- a/app/src/main/java/net/underdesk/circolapp/fragments/FavouritesFragment.kt +++ b/app/src/main/java/net/underdesk/circolapp/fragments/FavouritesFragment.kt @@ -23,8 +23,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders +import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager import kotlinx.android.synthetic.main.fragment_circular_letters.view.* import net.underdesk.circolapp.MainActivity @@ -34,7 +33,7 @@ import net.underdesk.circolapp.viewmodels.FavouritesViewModel class FavouritesFragment : Fragment(), MainActivity.SearchCallback { - private lateinit var favouritesViewModel: FavouritesViewModel + private val favouritesViewModel by viewModels() override fun onCreateView( inflater: LayoutInflater, @@ -46,9 +45,7 @@ class FavouritesFragment : Fragment(), MainActivity.SearchCallback { root.circulars_list.layoutManager = LinearLayoutManager(context) root.circulars_refresh.isEnabled = false - favouritesViewModel = - ViewModelProviders.of(this).get(FavouritesViewModel::class.java) - favouritesViewModel.circulars.observe(viewLifecycleOwner, Observer { + favouritesViewModel.circulars.observe(viewLifecycleOwner, { if (root.circulars_list.adapter == null) { root.circulars_list.adapter = CircularLetterAdapter(it, activity as MainActivity) } else { diff --git a/app/src/main/java/net/underdesk/circolapp/fragments/RemindersFragment.kt b/app/src/main/java/net/underdesk/circolapp/fragments/RemindersFragment.kt index 60b5b91..3541777 100644 --- a/app/src/main/java/net/underdesk/circolapp/fragments/RemindersFragment.kt +++ b/app/src/main/java/net/underdesk/circolapp/fragments/RemindersFragment.kt @@ -23,8 +23,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.fragment.app.Fragment -import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders +import androidx.fragment.app.viewModels import androidx.recyclerview.widget.LinearLayoutManager import kotlinx.android.synthetic.main.fragment_circular_letters.view.* import net.underdesk.circolapp.MainActivity @@ -34,7 +33,7 @@ import net.underdesk.circolapp.viewmodels.RemindersViewModel class RemindersFragment : Fragment(), MainActivity.SearchCallback { - private lateinit var remindersViewModel: RemindersViewModel + private val remindersViewModel by viewModels() override fun onCreateView( inflater: LayoutInflater, @@ -46,9 +45,7 @@ class RemindersFragment : Fragment(), MainActivity.SearchCallback { root.circulars_list.layoutManager = LinearLayoutManager(context) root.circulars_refresh.isEnabled = false - remindersViewModel = - ViewModelProviders.of(this).get(RemindersViewModel::class.java) - remindersViewModel.circulars.observe(viewLifecycleOwner, Observer { + remindersViewModel.circulars.observe(viewLifecycleOwner, { if (root.circulars_list.adapter == null) { root.circulars_list.adapter = CircularLetterAdapter(it, activity as MainActivity) } else { diff --git a/app/src/main/java/net/underdesk/circolapp/viewmodels/CircularLetterViewModel.kt b/app/src/main/java/net/underdesk/circolapp/viewmodels/CircularLetterViewModel.kt index 0f0062f..d083501 100644 --- a/app/src/main/java/net/underdesk/circolapp/viewmodels/CircularLetterViewModel.kt +++ b/app/src/main/java/net/underdesk/circolapp/viewmodels/CircularLetterViewModel.kt @@ -33,7 +33,7 @@ class CircularLetterViewModel(application: Application) : AndroidViewModel(appli updateCirculars() } - val query = MutableLiveData("") + val query = MutableLiveData("") val circulars: LiveData> = Transformations.switchMap(query) { input -> if (input == null || input == "") { AppDatabase.getInstance(getApplication()).circularDao().getLiveCirculars() diff --git a/app/src/main/java/net/underdesk/circolapp/viewmodels/FavouritesViewModel.kt b/app/src/main/java/net/underdesk/circolapp/viewmodels/FavouritesViewModel.kt index 124365f..0d95e45 100644 --- a/app/src/main/java/net/underdesk/circolapp/viewmodels/FavouritesViewModel.kt +++ b/app/src/main/java/net/underdesk/circolapp/viewmodels/FavouritesViewModel.kt @@ -27,7 +27,7 @@ import net.underdesk.circolapp.data.AppDatabase import net.underdesk.circolapp.data.Circular class FavouritesViewModel(application: Application) : AndroidViewModel(application) { - val query = MutableLiveData("") + val query = MutableLiveData("") val circulars: LiveData> = Transformations.switchMap(query) { input -> if (input == null || input == "") { AppDatabase.getInstance(getApplication()).circularDao().getFavourites() diff --git a/app/src/main/java/net/underdesk/circolapp/viewmodels/RemindersViewModel.kt b/app/src/main/java/net/underdesk/circolapp/viewmodels/RemindersViewModel.kt index f7f1f03..ec1086d 100644 --- a/app/src/main/java/net/underdesk/circolapp/viewmodels/RemindersViewModel.kt +++ b/app/src/main/java/net/underdesk/circolapp/viewmodels/RemindersViewModel.kt @@ -27,7 +27,7 @@ import net.underdesk.circolapp.data.AppDatabase import net.underdesk.circolapp.data.Circular class RemindersViewModel(application: Application) : AndroidViewModel(application) { - val query = MutableLiveData("") + val query = MutableLiveData("") val circulars: LiveData> = Transformations.switchMap(query) { input -> if (input == null || input == "") { AppDatabase.getInstance(getApplication()).circularDao().getReminders()