Matte23/circolapp
1
0
Fork 0
mirror of https://github.com/Matte23/circolapp.git synced 2025-12-06 07:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings

Browse Source
This commit is contained in:
Matteo Schiff
2020-09-11 12:14:03 +02:00
committed by Matte23
parent b66b118ac6
commit 18dd27ce6f
7 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/net/underdesk/circolapp/adapters/CircularLetterAdapter.kt
View File

@@ -34,6 +34,7 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.cardview.widget.CardView import androidx.cardview.widget.CardView
import androidx.core.app.ActivityCompat import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.core.content.ContextCompat.getDrawable
import androidx.fragment.app.FragmentActivity import androidx.fragment.app.FragmentActivity
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
@@ -113,7 +114,12 @@ class CircularLetterAdapter(
) )
if (collapsedItems != position) { 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.collapseButton.contentDescription = context.getString(R.string.image_expand)
holder.viewButton.visibility = View.GONE holder.viewButton.visibility = View.GONE
@@ -124,7 +130,12 @@ class CircularLetterAdapter(
holder.attachmentsList.visibility = View.GONE holder.attachmentsList.visibility = View.GONE
holder.attachmentsList.adapter = null holder.attachmentsList.adapter = null
} else { } 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.collapseButton.contentDescription = context.getString(R.string.image_collapse)
holder.viewButton.visibility = View.VISIBLE holder.viewButton.visibility = View.VISIBLE

13
app/src/main/java/net/underdesk/circolapp/fragments/CircularLetterFragment.kt
View File

@@ -24,8 +24,7 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintLayout
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.lifecycle.Observer import androidx.fragment.app.viewModels
import androidx.lifecycle.ViewModelProviders
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import com.google.android.material.snackbar.Snackbar import com.google.android.material.snackbar.Snackbar
import kotlinx.android.synthetic.main.fragment_circular_letters.* import kotlinx.android.synthetic.main.fragment_circular_letters.*
@@ -38,7 +37,7 @@ import net.underdesk.circolapp.viewmodels.CircularLetterViewModel
class CircularLetterFragment : Fragment(), MainActivity.SearchCallback, class CircularLetterFragment : Fragment(), MainActivity.SearchCallback,
MainActivity.RefreshCallback { MainActivity.RefreshCallback {
private lateinit var circularLetterViewModel: CircularLetterViewModel private val circularLetterViewModel by viewModels<CircularLetterViewModel>()
override fun onCreateView( override fun onCreateView(
inflater: LayoutInflater, inflater: LayoutInflater,
@@ -49,16 +48,14 @@ class CircularLetterFragment : Fragment(), MainActivity.SearchCallback,
root.circulars_list.layoutManager = LinearLayoutManager(context) root.circulars_list.layoutManager = LinearLayoutManager(context)
circularLetterViewModel = circularLetterViewModel.circulars.observe(viewLifecycleOwner, {
ViewModelProviders.of(this).get(CircularLetterViewModel::class.java)
circularLetterViewModel.circulars.observe(viewLifecycleOwner, Observer {
if (root.circulars_list.adapter == null) { if (root.circulars_list.adapter == null) {
root.circulars_list.adapter = CircularLetterAdapter(it, activity as MainActivity) root.circulars_list.adapter = CircularLetterAdapter(it, activity as MainActivity)
} else { } else {
(root.circulars_list.adapter as CircularLetterAdapter).changeDataSet(it) (root.circulars_list.adapter as CircularLetterAdapter).changeDataSet(it)
} }
}) })
circularLetterViewModel.showMessage.observe(viewLifecycleOwner, Observer { circularLetterViewModel.showMessage.observe(viewLifecycleOwner, {
if (it) activity?.findViewById<ConstraintLayout>(R.id.container)?.let { view -> if (it) activity?.findViewById<ConstraintLayout>(R.id.container)?.let { view ->
Snackbar.make( Snackbar.make(
view, view,
@@ -69,7 +66,7 @@ class CircularLetterFragment : Fragment(), MainActivity.SearchCallback,
circularLetterViewModel.showMessage.postValue(false) circularLetterViewModel.showMessage.postValue(false)
} }
}) })
circularLetterViewModel.circularsUpdated.observe(viewLifecycleOwner, Observer { circularLetterViewModel.circularsUpdated.observe(viewLifecycleOwner, {
if (it) { if (it) {
root.circulars_refresh.isRefreshing = false root.circulars_refresh.isRefreshing = false

9
app/src/main/java/net/underdesk/circolapp/fragments/FavouritesFragment.kt
View File

@@ -23,8 +23,7 @@ import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.lifecycle.Observer import androidx.fragment.app.viewModels
import androidx.lifecycle.ViewModelProviders
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import kotlinx.android.synthetic.main.fragment_circular_letters.view.* import kotlinx.android.synthetic.main.fragment_circular_letters.view.*
import net.underdesk.circolapp.MainActivity import net.underdesk.circolapp.MainActivity
@@ -34,7 +33,7 @@ import net.underdesk.circolapp.viewmodels.FavouritesViewModel
class FavouritesFragment : Fragment(), MainActivity.SearchCallback { class FavouritesFragment : Fragment(), MainActivity.SearchCallback {
private lateinit var favouritesViewModel: FavouritesViewModel private val favouritesViewModel by viewModels<FavouritesViewModel>()
override fun onCreateView( override fun onCreateView(
inflater: LayoutInflater, inflater: LayoutInflater,
@@ -46,9 +45,7 @@ class FavouritesFragment : Fragment(), MainActivity.SearchCallback {
root.circulars_list.layoutManager = LinearLayoutManager(context) root.circulars_list.layoutManager = LinearLayoutManager(context)
root.circulars_refresh.isEnabled = false root.circulars_refresh.isEnabled = false
favouritesViewModel = favouritesViewModel.circulars.observe(viewLifecycleOwner, {
ViewModelProviders.of(this).get(FavouritesViewModel::class.java)
favouritesViewModel.circulars.observe(viewLifecycleOwner, Observer {
if (root.circulars_list.adapter == null) { if (root.circulars_list.adapter == null) {
root.circulars_list.adapter = CircularLetterAdapter(it, activity as MainActivity) root.circulars_list.adapter = CircularLetterAdapter(it, activity as MainActivity)
} else { } else {

9
app/src/main/java/net/underdesk/circolapp/fragments/RemindersFragment.kt
View File

@@ -23,8 +23,7 @@ import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.lifecycle.Observer import androidx.fragment.app.viewModels
import androidx.lifecycle.ViewModelProviders
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import kotlinx.android.synthetic.main.fragment_circular_letters.view.* import kotlinx.android.synthetic.main.fragment_circular_letters.view.*
import net.underdesk.circolapp.MainActivity import net.underdesk.circolapp.MainActivity
@@ -34,7 +33,7 @@ import net.underdesk.circolapp.viewmodels.RemindersViewModel
class RemindersFragment : Fragment(), MainActivity.SearchCallback { class RemindersFragment : Fragment(), MainActivity.SearchCallback {
private lateinit var remindersViewModel: RemindersViewModel private val remindersViewModel by viewModels<RemindersViewModel>()
override fun onCreateView( override fun onCreateView(
inflater: LayoutInflater, inflater: LayoutInflater,
@@ -46,9 +45,7 @@ class RemindersFragment : Fragment(), MainActivity.SearchCallback {
root.circulars_list.layoutManager = LinearLayoutManager(context) root.circulars_list.layoutManager = LinearLayoutManager(context)
root.circulars_refresh.isEnabled = false root.circulars_refresh.isEnabled = false
remindersViewModel = remindersViewModel.circulars.observe(viewLifecycleOwner, {
ViewModelProviders.of(this).get(RemindersViewModel::class.java)
remindersViewModel.circulars.observe(viewLifecycleOwner, Observer {
if (root.circulars_list.adapter == null) { if (root.circulars_list.adapter == null) {
root.circulars_list.adapter = CircularLetterAdapter(it, activity as MainActivity) root.circulars_list.adapter = CircularLetterAdapter(it, activity as MainActivity)
} else { } else {

2
app/src/main/java/net/underdesk/circolapp/viewmodels/CircularLetterViewModel.kt
View File

@@ -33,7 +33,7 @@ class CircularLetterViewModel(application: Application) : AndroidViewModel(appli
updateCirculars() updateCirculars()
} }
val query = MutableLiveData<String>("") val query = MutableLiveData("")
val circulars: LiveData<List<Circular>> = Transformations.switchMap(query) { input -> val circulars: LiveData<List<Circular>> = Transformations.switchMap(query) { input ->
if (input == null || input == "") { if (input == null || input == "") {
AppDatabase.getInstance(getApplication()).circularDao().getLiveCirculars() AppDatabase.getInstance(getApplication()).circularDao().getLiveCirculars()

2
app/src/main/java/net/underdesk/circolapp/viewmodels/FavouritesViewModel.kt
View File

@@ -27,7 +27,7 @@ import net.underdesk.circolapp.data.AppDatabase
import net.underdesk.circolapp.data.Circular import net.underdesk.circolapp.data.Circular
class FavouritesViewModel(application: Application) : AndroidViewModel(application) { class FavouritesViewModel(application: Application) : AndroidViewModel(application) {
val query = MutableLiveData<String>("") val query = MutableLiveData("")
val circulars: LiveData<List<Circular>> = Transformations.switchMap(query) { input -> val circulars: LiveData<List<Circular>> = Transformations.switchMap(query) { input ->
if (input == null || input == "") { if (input == null || input == "") {
AppDatabase.getInstance(getApplication()).circularDao().getFavourites() AppDatabase.getInstance(getApplication()).circularDao().getFavourites()

2
app/src/main/java/net/underdesk/circolapp/viewmodels/RemindersViewModel.kt
View File

@@ -27,7 +27,7 @@ import net.underdesk.circolapp.data.AppDatabase
import net.underdesk.circolapp.data.Circular import net.underdesk.circolapp.data.Circular
class RemindersViewModel(application: Application) : AndroidViewModel(application) { class RemindersViewModel(application: Application) : AndroidViewModel(application) {
val query = MutableLiveData<String>("") val query = MutableLiveData("")
val circulars: LiveData<List<Circular>> = Transformations.switchMap(query) { input -> val circulars: LiveData<List<Circular>> = Transformations.switchMap(query) { input ->
if (input == null || input == "") { if (input == null || input == "") {
AppDatabase.getInstance(getApplication()).circularDao().getReminders() AppDatabase.getInstance(getApplication()).circularDao().getReminders()