diff --git a/vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt b/vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt
index ebe13e7495..88e55d6760 100644
--- a/vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt
+++ b/vector/src/debug/java/im/vector/app/features/debug/TestLinkifyActivity.kt
@@ -19,10 +19,10 @@ package im.vector.app.features.debug
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import im.vector.app.R
 import im.vector.app.databinding.ActivityTestLinkifyBinding
+import im.vector.app.databinding.ItemTestLinkifyBinding
 
 class TestLinkifyActivity : AppCompatActivity() {
 
@@ -80,42 +80,41 @@ class TestLinkifyActivity : AppCompatActivity() {
                 .forEach { textContent ->
                     val item = LayoutInflater.from(this)
                             .inflate(R.layout.item_test_linkify, views.testLinkifyContentView, false)
-
-                    item.findViewById<TextView>(R.id.test_linkify_auto_text)
-                            ?.apply {
-                                text = textContent
-                                /* TODO Use BetterLinkMovementMethod when the other PR is merged
-                                movementMethod = MatrixLinkMovementMethod(object : MockMessageAdapterActionListener() {
-                                    override fun onURLClick(uri: Uri?) {
-                                        Snackbar.make(coordinatorLayout, "URI Clicked: $uri", Snackbar.LENGTH_LONG)
-                                                .setAction("open") {
-                                                    openUrlInExternalBrowser(this@TestLinkifyActivity, uri)
-                                                }
-                                                .show()
-                                    }
-                                })
-                                */
+                    val subViews = ItemTestLinkifyBinding.bind(item)
+                    subViews.testLinkifyAutoText.apply {
+                        text = textContent
+                        /* TODO Use BetterLinkMovementMethod when the other PR is merged
+                        movementMethod = MatrixLinkMovementMethod(object : MockMessageAdapterActionListener() {
+                            override fun onURLClick(uri: Uri?) {
+                                Snackbar.make(coordinatorLayout, "URI Clicked: $uri", Snackbar.LENGTH_LONG)
+                                        .setAction("open") {
+                                            openUrlInExternalBrowser(this@TestLinkifyActivity, uri)
+                                        }
+                                        .show()
                             }
+                        })
+                        */
+                    }
 
-                    item.findViewById<TextView>(R.id.test_linkify_custom_text)
-                            ?.apply {
-                                text = textContent
-                                /* TODO Use BetterLinkMovementMethod when the other PR is merged
-                                movementMethod = MatrixLinkMovementMethod(object : MockMessageAdapterActionListener() {
-                                    override fun onURLClick(uri: Uri?) {
-                                        Snackbar.make(coordinatorLayout, "URI Clicked: $uri", Snackbar.LENGTH_LONG)
-                                                .setAction("open") {
-                                                    openUrlInExternalBrowser(this@TestLinkifyActivity, uri)
-                                                }
-                                                .show()
-                                    }
-                                })
-                                */
-
-                                // TODO Call VectorLinkify.addLinks(text)
+                    subViews.testLinkifyCustomText.apply {
+                        text = textContent
+                        /* TODO Use BetterLinkMovementMethod when the other PR is merged
+                        movementMethod = MatrixLinkMovementMethod(object : MockMessageAdapterActionListener() {
+                            override fun onURLClick(uri: Uri?) {
+                                Snackbar.make(coordinatorLayout, "URI Clicked: $uri", Snackbar.LENGTH_LONG)
+                                        .setAction("open") {
+                                            openUrlInExternalBrowser(this@TestLinkifyActivity, uri)
+                                        }
+                                        .show()
                             }
+                        })
+                        */
 
-                    views.testLinkifyContentView.addView(item, ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT))
+                        // TODO Call VectorLinkify.addLinks(text)
+                    }
+
+                    views.testLinkifyContentView
+                            .addView(item, ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT))
                 }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
index 3f8f47d22a..eb20e815f6 100644
--- a/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/crypto/verification/VerificationBottomSheet.kt
@@ -119,7 +119,9 @@ class VerificationBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetV
                 }
                 VerificationBottomSheetViewEvents.GoToSettings         -> {
                     dismiss()
-                    (activity as? VectorBaseActivity<*>)?.navigator?.openSettings(requireContext(), VectorSettingsActivity.EXTRA_DIRECT_ACCESS_SECURITY_PRIVACY)
+                    (activity as? VectorBaseActivity<*>)?.let { activity ->
+                        activity.navigator.openSettings(activity, VectorSettingsActivity.EXTRA_DIRECT_ACCESS_SECURITY_PRIVACY)
+                    }
                 }
             }.exhaustive
         }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt
index dd2bb3a4c4..94f9aaf496 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt
@@ -73,7 +73,12 @@ class RoomListQuickActionsBottomSheet :
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         sharedActionViewModel = activityViewModelProvider.get(RoomListQuickActionsSharedActionViewModel::class.java)
-        views.bottomSheetRecyclerView.configureWith(roomListActionsEpoxyController, viewPool = sharedViewPool, hasFixedSize = false, disableItemAnimation = true)
+        views.bottomSheetRecyclerView.configureWith(
+                epoxyController = roomListActionsEpoxyController,
+                viewPool = sharedViewPool,
+                hasFixedSize = false,
+                disableItemAnimation = true
+        )
         roomListActionsEpoxyController.listener = this
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt b/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
index 22bd194b87..c396e61b1a 100644
--- a/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/login/LoginFragment.kt
@@ -113,7 +113,11 @@ class LoginFragment @Inject constructor() : AbstractSSOLoginFragment<FragmentLog
         // This can be called by the IME action, so deal with empty cases
         var error = 0
         if (login.isEmpty()) {
-            views.loginFieldTil.error = getString(if (isSignupMode) R.string.error_empty_field_choose_user_name else R.string.error_empty_field_enter_user_name)
+            views.loginFieldTil.error = getString(if (isSignupMode) {
+                R.string.error_empty_field_choose_user_name
+            } else {
+                R.string.error_empty_field_enter_user_name
+            })
             error++
         }
         if (isSignupMode && isNumericOnlyUserIdForbidden && login.isDigitsOnly()) {
@@ -121,7 +125,11 @@ class LoginFragment @Inject constructor() : AbstractSSOLoginFragment<FragmentLog
             error++
         }
         if (password.isEmpty()) {
-            views.passwordFieldTil.error = getString(if (isSignupMode) R.string.error_empty_field_choose_password else R.string.error_empty_field_your_password)
+            views.passwordFieldTil.error = getString(if (isSignupMode) {
+                R.string.error_empty_field_choose_password
+            } else {
+                R.string.error_empty_field_your_password
+            })
             error++
         }
 
diff --git a/vector/src/main/java/im/vector/app/features/reactions/widget/ReactionButton.kt b/vector/src/main/java/im/vector/app/features/reactions/widget/ReactionButton.kt
index 41258ba49b..d81767cc7f 100644
--- a/vector/src/main/java/im/vector/app/features/reactions/widget/ReactionButton.kt
+++ b/vector/src/main/java/im/vector/app/features/reactions/widget/ReactionButton.kt
@@ -199,7 +199,8 @@ class ReactionButton @JvmOverloads constructor(context: Context,
             starScaleXAnimator.startDelay = 250
             starScaleXAnimator.interpolator = OVERSHOOT_INTERPOLATOR
 
-            val dotsAnimator = ObjectAnimator.ofFloat(views.dots, DotsView.DOTS_PROGRESS, 0f, 1f) // .ofFloat<DotsView>(views.dots, DotsView.DOTS_PROGRESS, 0, 1f)
+            val dotsAnimator = ObjectAnimator.ofFloat(views.dots, DotsView.DOTS_PROGRESS, 0f, 1f)
+            // .ofFloat<DotsView>(views.dots, DotsView.DOTS_PROGRESS, 0, 1f)
             dotsAnimator.duration = 900
             dotsAnimator.startDelay = 50
             dotsAnimator.interpolator = ACCELERATE_DECELERATE_INTERPOLATOR
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
index 102d3c0c70..e895e54a20 100644
--- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsPreferencesFragment.kt
@@ -19,7 +19,6 @@ package im.vector.app.features.settings
 import android.app.Activity
 import android.content.Context
 import android.widget.CheckedTextView
-import android.widget.LinearLayout
 import androidx.appcompat.app.AlertDialog
 import androidx.core.view.children
 import androidx.preference.Preference
@@ -170,4 +169,3 @@ class VectorSettingsPreferencesFragment @Inject constructor(
                 }
     }
 }
-
diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt b/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt
index acc8e7eb83..1bf538d458 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devices/VectorSettingsDevicesFragment.kt
@@ -20,7 +20,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.EditText
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.isVisible