diff --git a/vector/src/debug/res/layout/activity_debug_menu.xml b/vector/src/debug/res/layout/activity_debug_menu.xml index 458b44fd05..9a95085a07 100644 --- a/vector/src/debug/res/layout/activity_debug_menu.xml +++ b/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" /> diff --git a/vector/src/main/java/im/vector/app/core/epoxy/CheckBoxItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/CheckBoxItem.kt index 4e53b293d3..2f32fafa9e 100644 --- a/vector/src/main/java/im/vector/app/core/epoxy/CheckBoxItem.kt +++ b/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() { diff --git a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt index 2e21d04d06..95351afec8 100644 --- a/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt +++ b/vector/src/main/java/im/vector/app/features/createdirect/CreateDirectRoomActivity.kt @@ -84,11 +84,11 @@ class CreateDirectRoomActivity : SimpleFragmentActivity(), UserListViewModel.Fac .observe() .subscribe { action -> when (action) { - UserListSharedAction.Close -> finish() - UserListSharedAction.GoBack -> onBackPressed() + UserListSharedAction.Close -> finish() + UserListSharedAction.GoBack -> onBackPressed() is UserListSharedAction.OnMenuItemSelected -> onMenuItemSelected(action) - UserListSharedAction.OpenPhoneBook -> openPhoneBook() - UserListSharedAction.AddByQrCode -> openAddByQrCode() + UserListSharedAction.OpenPhoneBook -> openPhoneBook() + UserListSharedAction.AddByQrCode -> openAddByQrCode() }.exhaustive } .disposeOnDestroy() diff --git a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt b/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt index 3f3706699f..91c09ef21a 100644 --- a/vector/src/main/java/im/vector/app/features/matrixto/MatrixToBottomSheet.kt +++ b/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 diff --git a/vector/src/main/java/im/vector/app/features/usercode/ScanUserCodeFragment.kt b/vector/src/main/java/im/vector/app/features/usercode/ScanUserCodeFragment.kt index 8b4820b06d..60354db9c6 100644 --- a/vector/src/main/java/im/vector/app/features/usercode/ScanUserCodeFragment.kt +++ b/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() } diff --git a/vector/src/main/java/im/vector/app/features/usercode/ShowUserCodeFragment.kt b/vector/src/main/java/im/vector/app/features/usercode/ShowUserCodeFragment.kt index ab88f79bef..e812ca31bb 100644 --- a/vector/src/main/java/im/vector/app/features/usercode/ShowUserCodeFragment.kt +++ b/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 } } diff --git a/vector/src/main/java/im/vector/app/features/usercode/UserCodeActivity.kt b/vector/src/main/java/im/vector/app/features/usercode/UserCodeActivity.kt index 388dc220a8..0e7efa5b92 100644 --- a/vector/src/main/java/im/vector/app/features/usercode/UserCodeActivity.kt +++ b/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 @@ -66,8 +67,8 @@ class UserCodeActivity sharedViewModel.selectSubscribe(this, UserCodeState::mode) { mode -> when (mode) { - UserCodeState.Mode.SHOW -> showFragment(ShowUserCodeFragment::class, Bundle.EMPTY) - UserCodeState.Mode.SCAN -> showFragment(ScanUserCodeFragment::class, Bundle.EMPTY) + UserCodeState.Mode.SHOW -> showFragment(ShowUserCodeFragment::class, Bundle.EMPTY) + UserCodeState.Mode.SCAN -> showFragment(ScanUserCodeFragment::class, Bundle.EMPTY) is UserCodeState.Mode.RESULT -> { showFragment(ShowUserCodeFragment::class, Bundle.EMPTY) MatrixToBottomSheet.create(mode.matrixItem, this).show(supportFragmentManager, "MatrixToBottomSheet") @@ -77,11 +78,11 @@ class UserCodeActivity sharedViewModel.observeViewEvents { when (it) { - is UserCodeShareViewEvents.InviteFriend -> TODO() - UserCodeShareViewEvents.Dismiss -> ActivityCompat.finishAfterTransition(this) + is UserCodeShareViewEvents.InviteFriend -> TODO() + UserCodeShareViewEvents.Dismiss -> ActivityCompat.finishAfterTransition(this) UserCodeShareViewEvents.ShowWaitingScreen -> simpleActivityWaitingView.isVisible = true UserCodeShareViewEvents.HideWaitingScreen -> simpleActivityWaitingView.isVisible = false - is UserCodeShareViewEvents.ToastMessage -> Toast.makeText(this, it.message, Toast.LENGTH_LONG).show() + is UserCodeShareViewEvents.ToastMessage -> Toast.makeText(this, it.message, Toast.LENGTH_LONG).show() is UserCodeShareViewEvents.NavigateToRoom -> navigator.openRoom(this, it.roomId) }.exhaustive } @@ -89,14 +90,13 @@ class UserCodeActivity private fun showFragment(fragmentClass: KClass, bundle: Bundle) { if (supportFragmentManager.findFragmentByTag(fragmentClass.simpleName) == null) { - supportFragmentManager.beginTransaction().let { - it.setCustomAnimations(R.anim.fade_in, R.anim.fade_out, R.anim.fade_in, R.anim.fade_out) - it.replace(R.id.simpleFragmentContainer, + supportFragmentManager.commitTransaction { + setCustomAnimations(R.anim.fade_in, R.anim.fade_out, R.anim.fade_in, R.anim.fade_out) + 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) = diff --git a/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt index 17dd97cffa..1d1283c269 100644 --- a/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/usercode/UserCodeSharedViewModel.kt @@ -84,9 +84,9 @@ class UserCodeSharedViewModel @AssistedInject constructor( override fun handle(action: UserCodeActions) { when (action) { - UserCodeActions.DismissAction -> _viewEvents.post(UserCodeShareViewEvents.Dismiss) - is UserCodeActions.SwitchMode -> setState { copy(mode = action.mode) } - is UserCodeActions.DecodedQRCode -> handleQrCodeDecoded(action) + UserCodeActions.DismissAction -> _viewEvents.post(UserCodeShareViewEvents.Dismiss) + is UserCodeActions.SwitchMode -> setState { copy(mode = action.mode) } + is UserCodeActions.DecodedQRCode -> handleQrCodeDecoded(action) is UserCodeActions.StartChattingWithUser -> handleStartChatting(action) } } @@ -138,9 +138,9 @@ class UserCodeSharedViewModel @AssistedInject constructor( _viewEvents.post(UserCodeShareViewEvents.ShowWaitingScreen) viewModelScope.launch(Dispatchers.IO) { when (linkedId) { - is PermalinkData.RoomLink -> TODO() - is PermalinkData.UserLink -> { - var user = session.getUser(linkedId.userId) ?: awaitCallback> { + is PermalinkData.RoomLink -> TODO() + is PermalinkData.UserLink -> { + val user = session.getUser(linkedId.userId) ?: awaitCallback> { session.searchUsersDirectory(linkedId.userId, 10, emptySet(), it) }.firstOrNull { it.userId == linkedId.userId } // Create raw Uxid in case the user is not searchable @@ -152,7 +152,7 @@ class UserCodeSharedViewModel @AssistedInject constructor( ) } } - is PermalinkData.GroupLink -> TODO() + is PermalinkData.GroupLink -> TODO() is PermalinkData.FallbackLink -> TODO() } _viewEvents.post(UserCodeShareViewEvents.HideWaitingScreen) diff --git a/vector/src/main/res/layout/activity_simple.xml b/vector/src/main/res/layout/activity_simple.xml index c6f2af8171..d7382d173d 100644 --- a/vector/src/main/res/layout/activity_simple.xml +++ b/vector/src/main/res/layout/activity_simple.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - + android:layout_height="40dp" /> - + \ No newline at end of file diff --git a/vector/src/main/res/layout/fragment_matrix_to_card.xml b/vector/src/main/res/layout/bottom_sheet_matrix_to_card.xml similarity index 97% rename from vector/src/main/res/layout/fragment_matrix_to_card.xml rename to vector/src/main/res/layout/bottom_sheet_matrix_to_card.xml index 7356f105e0..b8c81ded3a 100644 --- a/vector/src/main/res/layout/fragment_matrix_to_card.xml +++ b/vector/src/main/res/layout/bottom_sheet_matrix_to_card.xml @@ -1,12 +1,10 @@ - - - + app:layout_constraintTop_toBottomOf="@id/matrixToCardUserIdText" /> diff --git a/vector/src/main/res/layout/dialog_share_qr_code.xml b/vector/src/main/res/layout/dialog_share_qr_code.xml index d209376edb..04613023a7 100644 --- a/vector/src/main/res/layout/dialog_share_qr_code.xml +++ b/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" /> diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml index 2f1d7cc4c4..459f118ccd 100644 --- a/vector/src/main/res/layout/fragment_home_drawer.xml +++ b/vector/src/main/res/layout/fragment_home_drawer.xml @@ -93,7 +93,6 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/homeDrawerUsernameView" /> - - + \ No newline at end of file diff --git a/vector/src/main/res/layout/fragment_user_code_show.xml b/vector/src/main/res/layout/fragment_user_code_show.xml index 7d96b80dbe..92c40b1eb2 100644 --- a/vector/src/main/res/layout/fragment_user_code_show.xml +++ b/vector/src/main/res/layout/fragment_user_code_show.xml @@ -1,5 +1,4 @@ - - + \ No newline at end of file diff --git a/vector/src/main/res/layout/item_checkbox.xml b/vector/src/main/res/layout/item_checkbox.xml index c7427b46c8..78dde9734b 100644 --- a/vector/src/main/res/layout/item_checkbox.xml +++ b/vector/src/main/res/layout/item_checkbox.xml @@ -1,13 +1,14 @@ \ No newline at end of file + app:layout_constraintTop_toBottomOf="@+id/phoneBookFilterContainer" + tools:text="@string/matrix_only_filter" /> \ No newline at end of file diff --git a/vector/src/main/res/layout/item_verification_qr_code.xml b/vector/src/main/res/layout/item_verification_qr_code.xml index b57470fdc1..413b94013a 100644 --- a/vector/src/main/res/layout/item_verification_qr_code.xml +++ b/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" />