update Kotlin to 1.4.10 and fix some warnigs (#1963)

app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt

@@ -49,7 +49,6 @@ import androidx.core.view.inputmethod.InputConnectionCompat
 import androidx.core.view.inputmethod.InputContentInfoCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
-import androidx.lifecycle.Observer
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -150,7 +149,7 @@ class ComposeActivity : BaseActivity(),
         /* If the composer is started up as a reply to another post, override the "starting" state
          * based on what the intent from the reply request passes. */
         if (intent != null) {
-            this.composeOptions = intent.getParcelableExtra<ComposeOptions?>(COMPOSE_OPTIONS_EXTRA)
+            this.composeOptions = intent.getParcelableExtra(COMPOSE_OPTIONS_EXTRA)
             viewModel.setup(composeOptions)
             setupReplyViews(composeOptions?.replyingStatusAuthor)
             val tootText = composeOptions?.tootText
@@ -682,7 +681,7 @@ class ComposeActivity : BaseActivity(),
     }
 
     private fun updateVisibleCharactersLeft() {
-        val remainingLength = maximumTootCharacters - calculateTextLength();
+        val remainingLength = maximumTootCharacters - calculateTextLength()
         composeCharactersLeftView.text = String.format(Locale.getDefault(), "%d", remainingLength)
 
         val textColor = if (remainingLength < 0) {
@@ -749,7 +748,7 @@ class ComposeActivity : BaseActivity(),
                     this, getString(R.string.dialog_title_finishing_media_upload),
                     getString(R.string.dialog_message_uploading_media), true, true)
 
-            viewModel.sendStatus(contentText, spoilerText).observe(this, Observer {
+            viewModel.sendStatus(contentText, spoilerText).observe(this, {
                 finishingUploadDialog?.dismiss()
                 deleteDraftAndFinish()
             })

app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt

@@ -21,8 +21,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.Observer
-import androidx.paging.PagedList
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -36,7 +34,10 @@ import com.keylesspalace.tusky.di.ViewModelFactory
 import com.keylesspalace.tusky.fragment.SFragment
 import com.keylesspalace.tusky.interfaces.ReselectableFragment
 import com.keylesspalace.tusky.interfaces.StatusActionListener
-import com.keylesspalace.tusky.util.*
+import com.keylesspalace.tusky.util.CardViewMode
+import com.keylesspalace.tusky.util.NetworkState
+import com.keylesspalace.tusky.util.StatusDisplayOptions
+import com.keylesspalace.tusky.util.hide
 import kotlinx.android.synthetic.main.fragment_timeline.*
 import javax.inject.Inject
 
@@ -83,21 +84,21 @@ class ConversationsFragment : SFragment(), StatusActionListener, Injectable, Res
 
         initSwipeToRefresh()
 
-        viewModel.conversations.observe(viewLifecycleOwner, Observer<PagedList<ConversationEntity>> {
+        viewModel.conversations.observe(viewLifecycleOwner) {
             adapter.submitList(it)
-        })
-        viewModel.networkState.observe(viewLifecycleOwner, Observer {
+        }
+        viewModel.networkState.observe(viewLifecycleOwner) {
             adapter.setNetworkState(it)
-        })
+        }
 
         viewModel.load()
 
     }
 
     private fun initSwipeToRefresh() {
-        viewModel.refreshState.observe(viewLifecycleOwner, Observer {
+        viewModel.refreshState.observe(viewLifecycleOwner) {
             swipeRefreshLayout.isRefreshing = it == NetworkState.LOADING
-        })
+        }
         swipeRefreshLayout.setOnRefreshListener {
             viewModel.refresh()
         }

app/src/main/java/com/keylesspalace/tusky/components/report/ReportActivity.kt

@@ -20,7 +20,6 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
 import androidx.activity.viewModels
-import androidx.lifecycle.Observer
 import com.keylesspalace.tusky.BottomSheetActivity
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.components.report.adapter.ReportPagerAdapter
@@ -77,7 +76,7 @@ class ReportActivity : BottomSheetActivity(), HasAndroidInjector {
     }
 
     private fun subscribeObservables() {
-        viewModel.navigation.observe(this, Observer { screen ->
+        viewModel.navigation.observe(this) { screen ->
             if (screen != null) {
                 viewModel.navigated()
                 when (screen) {
@@ -88,14 +87,14 @@ class ReportActivity : BottomSheetActivity(), HasAndroidInjector {
                     Screen.Finish -> closeScreen()
                 }
             }
-        })
+        }
 
-        viewModel.checkUrl.observe(this, Observer {
+        viewModel.checkUrl.observe(this) {
             if (!it.isNullOrBlank()) {
                 viewModel.urlChecked()
                 viewUrl(it)
             }
-        })
+        }
     }
 
     private fun showPreviousScreen() {

app/src/main/java/com/keylesspalace/tusky/components/report/adapter/AdapterHandler.kt

@@ -16,10 +16,8 @@
 package com.keylesspalace.tusky.components.report.adapter
 
 import android.view.View
-import com.keylesspalace.tusky.entity.Attachment
 import com.keylesspalace.tusky.entity.Status
 import com.keylesspalace.tusky.interfaces.LinkListener
-import java.util.ArrayList
 
 interface AdapterHandler: LinkListener {
     fun showMedia(v: View?, status: Status?, idx: Int)

app/src/main/java/com/keylesspalace/tusky/components/report/adapter/StatusesRepository.kt

@@ -21,7 +21,6 @@ import androidx.paging.toLiveData
 import com.keylesspalace.tusky.entity.Status
 import com.keylesspalace.tusky.network.MastodonApi
 import com.keylesspalace.tusky.util.BiListing
-import com.keylesspalace.tusky.util.Listing
 import io.reactivex.disposables.CompositeDisposable
 import java.util.concurrent.Executors
 import javax.inject.Inject

app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportDoneFragment.kt

@@ -22,7 +22,6 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.Observer
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.components.report.ReportViewModel
 import com.keylesspalace.tusky.components.report.Screen
@@ -55,7 +54,7 @@ class ReportDoneFragment : Fragment(), Injectable {
     }
 
     private fun subscribeObservables() {
-        viewModel.muteState.observe(viewLifecycleOwner, Observer {
+        viewModel.muteState.observe(viewLifecycleOwner) {
             if (it !is Loading) {
                 buttonMute.show()
                 progressMute.show()
@@ -68,9 +67,9 @@ class ReportDoneFragment : Fragment(), Injectable {
                 true -> R.string.action_unmute
                 else -> R.string.action_mute
             })
-        })
+        }
 
-        viewModel.blockState.observe(viewLifecycleOwner, Observer {
+        viewModel.blockState.observe(viewLifecycleOwner) {
             if (it !is Loading) {
                 buttonBlock.show()
                 progressBlock.show()
@@ -83,7 +82,7 @@ class ReportDoneFragment : Fragment(), Injectable {
                 true -> R.string.action_unblock
                 else -> R.string.action_block
             })
-        })
+        }
 
     }
 

app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportNoteFragment.kt

@@ -22,7 +22,6 @@ import android.view.ViewGroup
 import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.Observer
 import com.google.android.material.snackbar.Snackbar
 import com.keylesspalace.tusky.R
 import com.keylesspalace.tusky.components.report.ReportViewModel
@@ -81,14 +80,14 @@ class ReportNoteFragment : Fragment(), Injectable {
     }
 
     private fun subscribeObservables() {
-        viewModel.reportingState.observe(viewLifecycleOwner, Observer {
+        viewModel.reportingState.observe(viewLifecycleOwner) {
             when (it) {
                 is Success -> viewModel.navigateTo(Screen.Done)
                 is Loading -> showLoading()
                 is Error -> showError(it.cause)
 
             }
-        })
+        }
     }
 
     private fun showError(error: Throwable?) {

app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt

@@ -23,8 +23,6 @@ import androidx.core.app.ActivityOptionsCompat
 import androidx.core.view.ViewCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.Observer
-import androidx.paging.PagedList
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -43,7 +41,10 @@ import com.keylesspalace.tusky.di.Injectable
 import com.keylesspalace.tusky.di.ViewModelFactory
 import com.keylesspalace.tusky.entity.Attachment
 import com.keylesspalace.tusky.entity.Status
-import com.keylesspalace.tusky.util.*
+import com.keylesspalace.tusky.util.CardViewMode
+import com.keylesspalace.tusky.util.StatusDisplayOptions
+import com.keylesspalace.tusky.util.hide
+import com.keylesspalace.tusky.util.show
 import com.keylesspalace.tusky.viewdata.AttachmentViewData
 import kotlinx.android.synthetic.main.fragment_report_statuses.*
 import javax.inject.Inject
@@ -129,11 +130,11 @@ class ReportStatusesFragment : Fragment(), Injectable, AdapterHandler {
         recyclerView.adapter = adapter
         (recyclerView.itemAnimator as SimpleItemAnimator).supportsChangeAnimations = false
 
-        viewModel.statuses.observe(viewLifecycleOwner, Observer<PagedList<Status>> {
+        viewModel.statuses.observe(viewLifecycleOwner) {
             adapter.submitList(it)
-        })
+        }
 
-        viewModel.networkStateAfter.observe(viewLifecycleOwner, Observer {
+        viewModel.networkStateAfter.observe(viewLifecycleOwner) {
             if (it?.status == com.keylesspalace.tusky.util.Status.RUNNING)
                 progressBarBottom.show()
             else
@@ -141,9 +142,9 @@ class ReportStatusesFragment : Fragment(), Injectable, AdapterHandler {
 
             if (it?.status == com.keylesspalace.tusky.util.Status.FAILED)
                 showError(it.msg)
-        })
+        }
 
-        viewModel.networkStateBefore.observe(viewLifecycleOwner, Observer {
+        viewModel.networkStateBefore.observe(viewLifecycleOwner) {
             if (it?.status == com.keylesspalace.tusky.util.Status.RUNNING)
                 progressBarTop.show()
             else
@@ -151,9 +152,9 @@ class ReportStatusesFragment : Fragment(), Injectable, AdapterHandler {
 
             if (it?.status == com.keylesspalace.tusky.util.Status.FAILED)
                 showError(it.msg)
-        })
+        }
 
-        viewModel.networkStateRefresh.observe(viewLifecycleOwner, Observer {
+        viewModel.networkStateRefresh.observe(viewLifecycleOwner) {
             if (it?.status == com.keylesspalace.tusky.util.Status.RUNNING && !swipeRefreshLayout.isRefreshing)
                 progressBarLoading.show()
             else
@@ -163,7 +164,7 @@ class ReportStatusesFragment : Fragment(), Injectable, AdapterHandler {
                 swipeRefreshLayout.isRefreshing = false
             if (it?.status == com.keylesspalace.tusky.util.Status.FAILED)
                 showError(it.msg)
-        })
+        }
     }
 
     private fun showError(@Suppress("UNUSED_PARAMETER") msg: String?) {

app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledTootActivity.kt

@@ -19,7 +19,6 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -30,7 +29,6 @@ import com.keylesspalace.tusky.di.Injectable
 import com.keylesspalace.tusky.di.ViewModelFactory
 import com.keylesspalace.tusky.entity.ScheduledStatus
 import com.keylesspalace.tusky.util.Status
-import com.keylesspalace.tusky.util.ThemeUtils
 import com.keylesspalace.tusky.util.hide
 import com.keylesspalace.tusky.util.show
 import kotlinx.android.synthetic.main.activity_scheduled_toot.*
@@ -68,11 +66,11 @@ class ScheduledTootActivity : BaseActivity(), ScheduledTootActionListener, Injec
 
         viewModel = ViewModelProvider(this, viewModelFactory)[ScheduledTootViewModel::class.java]
 
-        viewModel.data.observe(this, Observer {
+        viewModel.data.observe(this) {
             adapter.submitList(it)
-        })
+        }
 
-        viewModel.networkState.observe(this, Observer { (status) ->
+        viewModel.networkState.observe(this) { (status) ->
             when(status) {
                 Status.SUCCESS -> {
                     progressBar.hide()
@@ -103,9 +101,7 @@ class ScheduledTootActivity : BaseActivity(), ScheduledTootActionListener, Injec
                     }
                 }
             }
-
-        })
-
+        }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {

app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt

@@ -7,7 +7,6 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.Observer
 import androidx.paging.PagedList
 import androidx.paging.PagedListAdapter
 import androidx.recyclerview.widget.DividerItemDecoration
@@ -61,11 +60,11 @@ abstract class SearchFragment<T> : Fragment(),
     }
 
     private fun subscribeObservables() {
-        data.observe(viewLifecycleOwner, Observer {
+        data.observe(viewLifecycleOwner) {
             adapter.submitList(it)
-        })
+        }
 
-        networkStateRefresh.observe(viewLifecycleOwner, Observer {
+        networkStateRefresh.observe(viewLifecycleOwner) {
 
             searchProgressBar.visible(it == NetworkState.LOADING)
 
@@ -73,17 +72,16 @@ abstract class SearchFragment<T> : Fragment(),
                 showError()
             }
             checkNoData()
+        }
 
-        })
-
-        networkState.observe(viewLifecycleOwner, Observer {
+        networkState.observe(viewLifecycleOwner) {
 
             progressBarBottom.visible(it == NetworkState.LOADING)
 
             if (it.status == Status.FAILED) {
                 showError()
             }
-        })
+        }
     }
 
     private fun checkNoData() {

app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt

@@ -26,8 +26,6 @@ import android.net.Uri
 import android.os.Environment
 import android.util.Log
 import android.view.View
-import android.widget.CheckBox
-import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.PopupMenu
@@ -376,9 +374,10 @@ class SearchStatusesFragment : SearchFragment<Pair<Status, StatusViewData.Concre
     private fun onMute(accountId: String, accountUsername: String) {
         showMuteAccountDialog(
             this.requireActivity(),
-            accountUsername,
-            { notifications -> viewModel.muteAccount(accountId, notifications) }
-        )
+            accountUsername
+        ) { notifications ->
+            viewModel.muteAccount(accountId, notifications)
+        }
     }
 
     private fun accountIsInMentions(account: AccountEntity?, mentions: Array<Mention>): Boolean {