Small cleanup

vector/src/debug/res/layout/activity_debug_menu.xml

@@ -72,7 +72,7 @@
                 android:id="@+id/debug_qr_code"
                 android:layout_width="200dp"
                 android:layout_height="200dp"
-                tools:src="@tools:sample/avatars" />
+                tools:src="@drawable/ic_qr_code_add" />
 
         </LinearLayout>
 

vector/src/main/java/im/vector/app/core/epoxy/CheckBoxItem.kt

@@ -21,7 +21,6 @@ import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.google.android.material.checkbox.MaterialCheckBox
 import im.vector.app.R
-import kotlinx.android.synthetic.main.vector_preference_push_rule.view.*
 
 @EpoxyModelClass(layout = R.layout.item_checkbox)
 abstract class CheckBoxItem : VectorEpoxyModel<CheckBoxItem.Holder>() {

vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt

@@ -23,7 +23,7 @@ import im.vector.app.core.di.ScreenComponent
 import im.vector.app.core.extensions.setTextOrHide
 import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.features.home.AvatarRenderer
-import kotlinx.android.synthetic.main.fragment_matrix_to_card.*
+import kotlinx.android.synthetic.main.bottom_sheet_matrix_to_card.*
 import org.matrix.android.sdk.api.util.MatrixItem
 import javax.inject.Inject
 
@@ -41,7 +41,7 @@ class MatrixToBottomSheet(private val matrixItem: MatrixItem) : VectorBaseBottom
 
     private var interactionListener: InteractionListener? = null
 
-    override fun getLayoutResId() = R.layout.fragment_matrix_to_card
+    override fun getLayoutResId() = R.layout.bottom_sheet_matrix_to_card
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -56,8 +56,6 @@ class MatrixToBottomSheet(private val matrixItem: MatrixItem) : VectorBaseBottom
     }
 
     companion object {
-        const val ARGS = "MatrixToFragment.Args"
-
         fun create(matrixItem: MatrixItem, listener: InteractionListener?): MatrixToBottomSheet {
             return MatrixToBottomSheet(matrixItem).apply {
                 interactionListener = listener

vector/src/main/java/im/vector/app/features/usercode/ScanUserCodeFragment.kt

@@ -102,6 +102,7 @@ class ScanUserCodeFragment @Inject constructor()
 
     override fun onPause() {
         super.onPause()
+        userCodeScannerView.setResultHandler(null)
         // Stop camera on pause
         userCodeScannerView.stopCamera()
     }

vector/src/main/java/im/vector/app/features/usercode/ShowUserCodeFragment.kt

@@ -54,6 +54,5 @@ class ShowUserCodeFragment @Inject constructor(
         state.shareLink?.let { showUserCodeQRImage.setData(it) }
         showUserCodeCardNameText.setTextOrHide(state.matrixItem?.displayName)
         showUserCodeCardUserIdText.setTextOrHide(state.matrixItem?.id)
-        Unit
     }
 }

vector/src/main/java/im/vector/app/features/usercode/UserCodeActivity.kt

@@ -29,6 +29,7 @@ import com.airbnb.mvrx.viewModel
 import com.airbnb.mvrx.withState
 import im.vector.app.R
 import im.vector.app.core.di.ScreenComponent
+import im.vector.app.core.extensions.commitTransaction
 import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorBaseActivity
 import im.vector.app.features.matrixto.MatrixToBottomSheet
@@ -89,14 +90,13 @@ class UserCodeActivity
 
     private fun showFragment(fragmentClass: KClass<out Fragment>, bundle: Bundle) {
         if (supportFragmentManager.findFragmentByTag(fragmentClass.simpleName) == null) {
-            supportFragmentManager.beginTransaction().let {
+            supportFragmentManager.commitTransaction {
-                it.setCustomAnimations(R.anim.fade_in, R.anim.fade_out, R.anim.fade_in, R.anim.fade_out)
+                setCustomAnimations(R.anim.fade_in, R.anim.fade_out, R.anim.fade_in, R.anim.fade_out)
-                it.replace(R.id.simpleFragmentContainer,
+                replace(R.id.simpleFragmentContainer,
                         fragmentClass.java,
                         bundle,
                         fragmentClass.simpleName
                 )
-                it.commit()
             }
         }
     }
@@ -110,7 +110,7 @@ class UserCodeActivity
             UserCodeState.Mode.SHOW -> super.onBackPressed()
             is UserCodeState.Mode.RESULT,
             UserCodeState.Mode.SCAN -> sharedViewModel.handle(UserCodeActions.SwitchMode(UserCodeState.Mode.SHOW))
-        }
+        }.exhaustive
     }
 
     override fun create(initialState: UserCodeState, args: Args) =

vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt

@@ -140,7 +140,7 @@ class UserCodeSharedViewModel @AssistedInject constructor(
             when (linkedId) {
                 is PermalinkData.RoomLink     -> TODO()
                 is PermalinkData.UserLink     -> {
-                    var user = session.getUser(linkedId.userId) ?: awaitCallback<List<User>> {
+                    val user = session.getUser(linkedId.userId) ?: awaitCallback<List<User>> {
                         session.searchUsersDirectory(linkedId.userId, 10, emptySet(), it)
                     }.firstOrNull { it.userId == linkedId.userId }
                     // Create raw Uxid in case the user is not searchable

vector/src/main/res/layout/activity_simple.xml

@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <RelativeLayout
+    <FrameLayout
         android:id="@+id/simpleActivityWaitingView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -22,12 +22,9 @@
         tools:visibility="visible">
 
         <ProgressBar
-            android:id="@+id/waiting_view_status_circular_progress"
             android:layout_width="40dp"
-            android:layout_height="40dp"
+            android:layout_height="40dp" />
-            android:layout_centerInParent="true"
-            android:layout_gravity="center_vertical" />
 
-    </RelativeLayout>
+    </FrameLayout>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

vector/src/main/res/layout/bottom_sheet_matrix_to_card.xml

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-
     <ImageView
         android:id="@+id/matrixToCardAvatar"
         android:layout_width="60dp"
@@ -63,8 +61,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/matrixToCardUserIdText"
+        app:layout_constraintTop_toBottomOf="@id/matrixToCardUserIdText" />
-        app:layout_constraintVertical_bias="0" />
-
 
 </androidx.constraintlayout.widget.ConstraintLayout>

vector/src/main/res/layout/dialog_share_qr_code.xml

@@ -11,6 +11,6 @@
         android:layout_height="300dp"
         android:layout_gravity="center_horizontal"
         android:contentDescription="@string/a11y_qr_code_for_verification"
-        tools:src="@color/riotx_header_panel_background_black" />
+        tools:src="@drawable/ic_qr_code_add" />
 
 </FrameLayout>

vector/src/main/res/layout/fragment_home_drawer.xml

@@ -93,7 +93,6 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/homeDrawerUsernameView" />
 
-
         <com.google.android.material.button.MaterialButton
             android:id="@+id/homeDrawerInviteFriendButton"
             style="@style/Widget.MaterialComponents.Button.TextButton"
@@ -121,7 +120,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/homeDrawerUserIdView" />
 
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <androidx.fragment.app.FragmentContainerView

vector/src/main/res/layout/fragment_qr_code_scanner_with_button.xml

@@ -48,4 +48,5 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintEnd_toStartOf="@id/userCodeMyCodeButton"
         app:layout_constraintTop_toTopOf="@id/userCodeMyCodeButton" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

vector/src/main/res/layout/fragment_user_code_show.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -59,11 +58,11 @@
 
         <ImageView
             android:id="@+id/showUserCodeAvatar"
-            android:transitionName="profile"
             android:layout_width="60dp"
             android:layout_height="60dp"
             android:layout_marginStart="@dimen/layout_horizontal_margin"
             android:elevation="4dp"
+            android:transitionName="profile"
             app:layout_constraintBottom_toBottomOf="@id/showUserCodeCardTopBarrier"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -150,7 +149,6 @@
 
         </androidx.cardview.widget.CardView>
 
-
         <TextView
             android:id="@+id/showUserCodeInfoText"
             android:layout_width="0dp"
@@ -180,4 +178,5 @@
             app:layout_constraintVertical_bias="0" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
+
 </ScrollView>

vector/src/main/res/layout/item_checkbox.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.checkbox.MaterialCheckBox xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/checkbox"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginStart="@dimen/layout_horizontal_margin"
     android:layout_marginTop="4dp"
     android:layout_marginEnd="@dimen/layout_horizontal_margin"
-    android:text="@string/matrix_only_filter"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toBottomOf="@+id/phoneBookFilterContainer" />
+    app:layout_constraintTop_toBottomOf="@+id/phoneBookFilterContainer"
+    tools:text="@string/matrix_only_filter" />

vector/src/main/res/layout/item_verification_qr_code.xml

@@ -11,6 +11,6 @@
         android:layout_height="200dp"
         android:layout_gravity="center_horizontal"
         android:contentDescription="@string/a11y_qr_code_for_verification"
-        tools:src="@color/riotx_header_panel_background_black" />
+        tools:src="@drawable/ic_qr_code_add" />
 
 </FrameLayout>