Replace View visibility extensions

app/src/main/java/com/keylesspalace/tusky/AboutActivity.kt

@@ -9,10 +9,10 @@ import android.text.style.URLSpan
 import android.text.util.Linkify
 import android.widget.TextView
 import androidx.annotation.StringRes
+import androidx.core.view.isVisible
 import com.keylesspalace.tusky.databinding.ActivityAboutBinding
 import com.keylesspalace.tusky.di.Injectable
 import com.keylesspalace.tusky.util.NoUnderlineURLSpan
-import com.keylesspalace.tusky.util.hide
 
 class AboutActivity : BottomSheetActivity(), Injectable {
 
@@ -30,10 +30,14 @@ class AboutActivity : BottomSheetActivity(), Injectable {
 
         setTitle(R.string.about_title_activity)
 
-        binding.versionTextView.text = getString(R.string.about_app_version, getString(R.string.app_name), BuildConfig.VERSION_NAME)
+        binding.versionTextView.text = getString(
+            R.string.about_app_version,
+            getString(R.string.app_name),
+            BuildConfig.VERSION_NAME
+        )
 
         if (BuildConfig.CUSTOM_INSTANCE.isBlank()) {
-            binding.aboutPoweredByTusky.hide()
+            binding.aboutPoweredByTusky.isVisible = false
         }
 
         binding.aboutLicenseInfoTextView.setClickableTextWithoutUnderlines(R.string.about_tusky_license)

app/src/main/java/com/keylesspalace/tusky/AccountsInListFragment.kt

@@ -22,6 +22,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.LinearLayout
 import androidx.appcompat.widget.SearchView
+import androidx.core.view.isVisible
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
@@ -38,9 +39,7 @@ import com.keylesspalace.tusky.settings.PrefKeys
 import com.keylesspalace.tusky.util.BindingHolder
 import com.keylesspalace.tusky.util.Either
 import com.keylesspalace.tusky.util.emojify
-import com.keylesspalace.tusky.util.hide
 import com.keylesspalace.tusky.util.loadAvatar
-import com.keylesspalace.tusky.util.show
 import com.keylesspalace.tusky.util.unsafeLazy
 import com.keylesspalace.tusky.util.viewBinding
 import com.keylesspalace.tusky.viewmodel.AccountsInListViewModel
@@ -103,7 +102,7 @@ class AccountsInListFragment : DialogFragment(), Injectable {
                 adapter.submitList(state.accounts.asRightOrNull() ?: listOf())
 
                 when (state.accounts) {
-                    is Either.Right -> binding.messageView.hide()
+                    is Either.Right -> binding.messageView.isVisible = false
                     is Either.Left -> handleError(state.accounts.value)
                 }
 
@@ -131,23 +130,23 @@ class AccountsInListFragment : DialogFragment(), Injectable {
     private fun setupSearchView(state: State) {
         if (state.searchResult == null) {
             searchAdapter.submitList(listOf())
-            binding.accountsSearchRecycler.hide()
-            binding.accountsRecycler.show()
+            binding.accountsSearchRecycler.isVisible = false
+            binding.accountsRecycler.isVisible = true
         } else {
             val listAccounts = state.accounts.asRightOrNull() ?: listOf()
             val newList = state.searchResult.map { acc ->
                 acc to listAccounts.contains(acc)
             }
             searchAdapter.submitList(newList)
-            binding.accountsSearchRecycler.show()
-            binding.accountsRecycler.hide()
+            binding.accountsSearchRecycler.isVisible = true
+            binding.accountsRecycler.isVisible = false
         }
     }
 
     private fun handleError(error: Throwable) {
-        binding.messageView.show()
+        binding.messageView.isVisible = true
         val retryAction = { _: View ->
-            binding.messageView.hide()
+            binding.messageView.isVisible = false
             viewModel.load(listId)
         }
         if (error is IOException) {
@@ -184,11 +183,12 @@ class AccountsInListFragment : DialogFragment(), Injectable {
     inner class Adapter : ListAdapter<TimelineAccount, BindingHolder<ItemFollowRequestBinding>>(AccountDiffer) {
 
         override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BindingHolder<ItemFollowRequestBinding> {
-            val binding = ItemFollowRequestBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+            val binding =
+                ItemFollowRequestBinding.inflate(LayoutInflater.from(parent.context), parent, false)
             val holder = BindingHolder(binding)
 
-            binding.notificationTextView.hide()
-            binding.acceptButton.hide()
+            binding.notificationTextView.isVisible = false
+            binding.acceptButton.isVisible = false
             binding.rejectButton.setOnClickListener {
                 onRemoveFromList(getItem(holder.bindingAdapterPosition).id)
             }
@@ -219,11 +219,12 @@ class AccountsInListFragment : DialogFragment(), Injectable {
     inner class SearchAdapter : ListAdapter<AccountInfo, BindingHolder<ItemFollowRequestBinding>>(SearchDiffer) {
 
         override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BindingHolder<ItemFollowRequestBinding> {
-            val binding = ItemFollowRequestBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+            val binding =
+                ItemFollowRequestBinding.inflate(LayoutInflater.from(parent.context), parent, false)
             val holder = BindingHolder(binding)
 
-            binding.notificationTextView.hide()
-            binding.acceptButton.hide()
+            binding.notificationTextView.isVisible = false
+            binding.acceptButton.isVisible = false
             binding.rejectButton.setOnClickListener {
                 val (account, inAList) = getItem(holder.bindingAdapterPosition)
                 if (inAList) {

app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.kt

@@ -23,7 +23,6 @@ import android.os.Bundle
 import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
-import android.view.View
 import android.widget.ImageView
 import androidx.activity.viewModels
 import androidx.core.view.isVisible
@@ -45,7 +44,6 @@ import com.keylesspalace.tusky.di.ViewModelFactory
 import com.keylesspalace.tusky.util.Error
 import com.keylesspalace.tusky.util.Loading
 import com.keylesspalace.tusky.util.Success
-import com.keylesspalace.tusky.util.show
 import com.keylesspalace.tusky.util.viewBinding
 import com.keylesspalace.tusky.viewmodel.EditProfileViewModel
 import com.mikepenz.iconics.IconicsDrawable
@@ -189,7 +187,7 @@ class EditProfileActivity : BaseActivity(), Injectable {
                     finish()
                 }
                 is Loading -> {
-                    binding.saveProgressBar.visibility = View.VISIBLE
+                    binding.saveProgressBar.isVisible = true
                 }
                 is Error -> {
                     onSaveFailure(it.errorMessage)
@@ -234,7 +232,7 @@ class EditProfileActivity : BaseActivity(), Injectable {
                 glide.into(imageView)
             }
 
-            imageView.show()
+            imageView.isVisible = true
         }
     }
 
@@ -295,7 +293,7 @@ class EditProfileActivity : BaseActivity(), Injectable {
     private fun onSaveFailure(msg: String?) {
         val errorMsg = msg ?: getString(R.string.error_media_upload_sending)
         Snackbar.make(binding.avatarButton, errorMsg, Snackbar.LENGTH_LONG).show()
-        binding.saveProgressBar.visibility = View.GONE
+        binding.saveProgressBar.isVisible = false
     }
 
     private fun onPickFailure(throwable: Throwable?) {

app/src/main/java/com/keylesspalace/tusky/FiltersActivity.kt

@@ -5,6 +5,7 @@ import android.text.format.DateUtils
 import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.Toast
+import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import at.connyduck.calladapter.networkresult.fold
 import at.connyduck.calladapter.networkresult.getOrElse
@@ -13,8 +14,6 @@ import com.keylesspalace.tusky.appstore.PreferenceChangedEvent
 import com.keylesspalace.tusky.databinding.ActivityFiltersBinding
 import com.keylesspalace.tusky.entity.Filter
 import com.keylesspalace.tusky.network.MastodonApi
-import com.keylesspalace.tusky.util.hide
-import com.keylesspalace.tusky.util.show
 import com.keylesspalace.tusky.util.viewBinding
 import com.keylesspalace.tusky.view.getSecondsForDurationIndex
 import com.keylesspalace.tusky.view.setupEditDialogForFilter
@@ -144,15 +143,15 @@ class FiltersActivity : BaseActivity() {
 
     private fun loadFilters() {
 
-        binding.filterMessageView.hide()
-        binding.filtersView.hide()
-        binding.addFilterButton.hide()
-        binding.filterProgressBar.show()
+        binding.filterMessageView.isVisible = false
+        binding.filtersView.isVisible = false
+        binding.addFilterButton.isVisible = false
+        binding.filterProgressBar.isVisible = true
 
         lifecycleScope.launch {
             val newFilters = api.getFilters().getOrElse {
-                binding.filterProgressBar.hide()
-                binding.filterMessageView.show()
+                binding.filterProgressBar.isVisible = false
+                binding.filterMessageView.isVisible = true
                 if (it is IOException) {
                     binding.filterMessageView.setup(
                         R.drawable.elephant_offline,
@@ -170,9 +169,9 @@ class FiltersActivity : BaseActivity() {
             filters = newFilters.filter { it.context.contains(context) }.toMutableList()
             refreshFilterDisplay()
 
-            binding.filtersView.show()
+            binding.filtersView.isVisible = true
             binding.addFilterButton.show()
-            binding.filterProgressBar.hide()
+            binding.filterProgressBar.isVisible = false
         }
     }
 

app/src/main/java/com/keylesspalace/tusky/ListsActivity.kt

@@ -31,6 +31,7 @@ import android.widget.TextView
 import androidx.activity.viewModels
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
+import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.DividerItemDecoration
@@ -44,11 +45,8 @@ import com.keylesspalace.tusky.databinding.ActivityListsBinding
 import com.keylesspalace.tusky.di.Injectable
 import com.keylesspalace.tusky.di.ViewModelFactory
 import com.keylesspalace.tusky.entity.MastoList
-import com.keylesspalace.tusky.util.hide
 import com.keylesspalace.tusky.util.onTextChanged
-import com.keylesspalace.tusky.util.show
 import com.keylesspalace.tusky.util.viewBinding
-import com.keylesspalace.tusky.util.visible
 import com.keylesspalace.tusky.viewmodel.ListsViewModel
 import com.keylesspalace.tusky.viewmodel.ListsViewModel.Event
 import com.keylesspalace.tusky.viewmodel.ListsViewModel.LoadingState.ERROR_NETWORK
@@ -162,30 +160,30 @@ class ListsActivity : BaseActivity(), Injectable, HasAndroidInjector {
 
     private fun update(state: ListsViewModel.State) {
         adapter.submitList(state.lists)
-        binding.progressBar.visible(state.loadingState == LOADING)
+        binding.progressBar.isVisible = (state.loadingState == LOADING)
         when (state.loadingState) {
-            INITIAL, LOADING -> binding.messageView.hide()
+            INITIAL, LOADING -> binding.messageView.isVisible = false
             ERROR_NETWORK -> {
-                binding.messageView.show()
+                binding.messageView.isVisible = true
                 binding.messageView.setup(R.drawable.elephant_offline, R.string.error_network) {
                     viewModel.retryLoading()
                 }
             }
             ERROR_OTHER -> {
-                binding.messageView.show()
+                binding.messageView.isVisible = true
                 binding.messageView.setup(R.drawable.elephant_error, R.string.error_generic) {
                     viewModel.retryLoading()
                 }
             }
             LOADED ->
                 if (state.lists.isEmpty()) {
-                    binding.messageView.show()
+                    binding.messageView.isVisible = true
                     binding.messageView.setup(
                         R.drawable.elephant_friend_empty, R.string.message_empty,
                         null
                     )
                 } else {
-                    binding.messageView.hide()
+                    binding.messageView.isVisible = false
                 }
         }
     }

app/src/main/java/com/keylesspalace/tusky/MainActivity.kt

@@ -40,6 +40,7 @@ import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.view.GravityCompat
+import androidx.core.view.isVisible
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.PreferenceManager
@@ -93,13 +94,10 @@ import com.keylesspalace.tusky.usecase.LogoutUsecase
 import com.keylesspalace.tusky.util.deleteStaleCachedMedia
 import com.keylesspalace.tusky.util.emojify
 import com.keylesspalace.tusky.util.getDimension
-import com.keylesspalace.tusky.util.hide
 import com.keylesspalace.tusky.util.reduceSwipeSensitivity
-import com.keylesspalace.tusky.util.show
 import com.keylesspalace.tusky.util.unsafeLazy
 import com.keylesspalace.tusky.util.updateShortcut
 import com.keylesspalace.tusky.util.viewBinding
-import com.keylesspalace.tusky.util.visible
 import com.mikepenz.iconics.IconicsDrawable
 import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
 import com.mikepenz.iconics.utils.colorInt
@@ -253,7 +251,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
         }
 
         val hideTopToolbar = preferences.getBoolean(PrefKeys.HIDE_TOP_TOOLBAR, false)
-        binding.mainToolbar.visible(!hideTopToolbar)
+        binding.mainToolbar.isVisible = !hideTopToolbar
 
         loadDrawerAvatar(activeAccount.profilePictureUrl, true)
 
@@ -672,11 +670,12 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
         val activeTabLayout = if (preferences.getString(PrefKeys.MAIN_NAV_POSITION, "top") == "bottom") {
             val actionBarSize = getDimension(this, androidx.appcompat.R.attr.actionBarSize)
             val fabMargin = resources.getDimensionPixelSize(R.dimen.fabMargin)
-            (binding.composeButton.layoutParams as CoordinatorLayout.LayoutParams).bottomMargin = actionBarSize + fabMargin
-            binding.topNav.hide()
+            (binding.composeButton.layoutParams as CoordinatorLayout.LayoutParams).bottomMargin =
+                actionBarSize + fabMargin
+            binding.topNav.isVisible = false
             binding.bottomTabLayout
         } else {
-            binding.bottomNav.hide()
+            binding.bottomNav.isVisible = false
             (binding.viewPager.layoutParams as CoordinatorLayout.LayoutParams).bottomMargin = 0
             (binding.composeButton.layoutParams as CoordinatorLayout.LayoutParams).anchorId = R.id.viewPager
             binding.tabLayout
@@ -759,7 +758,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
                 if (fragment.isFabVisible()) {
                     binding.composeButton.show()
                 } else {
-                    binding.composeButton.hide()
+                    binding.composeButton.isVisible = false
                 }
             } else {
                 binding.composeButton.show()
@@ -807,11 +806,11 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
                 .setTitle(R.string.action_logout)
                 .setMessage(getString(R.string.action_logout_confirm, activeAccount.fullName))
                 .setPositiveButton(android.R.string.ok) { _: DialogInterface?, _: Int ->
-                    binding.appBar.hide()
-                    binding.viewPager.hide()
-                    binding.progressBar.show()
-                    binding.bottomNav.hide()
-                    binding.composeButton.hide()
+                    binding.appBar.isVisible = false
+                    binding.viewPager.isVisible = false
+                    binding.progressBar.isVisible = true
+                    binding.bottomNav.isVisible = false
+                    binding.composeButton.isVisible = false
 
                     lifecycleScope.launch {
                         val otherAccountAvailable = logoutUsecase.logout()
@@ -875,10 +874,10 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
             val navOnBottom = preferences.getString("mainNavPosition", "top") == "bottom"
 
             val avatarView = if (navOnBottom) {
-                binding.bottomNavAvatar.show()
+                binding.bottomNavAvatar.isVisible = true
                 binding.bottomNavAvatar
             } else {
-                binding.topNavAvatar.show()
+                binding.topNavAvatar.isVisible = true
                 binding.topNavAvatar
             }
 
@@ -896,8 +895,8 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
             }
         } else {
 
-            binding.bottomNavAvatar.hide()
-            binding.topNavAvatar.hide()
+            binding.bottomNavAvatar.isVisible = false
+            binding.topNavAvatar.isVisible = false
 
             val navIconSize = resources.getDimensionPixelSize(R.dimen.avatar_toolbar_nav_icon_size)