From 6af879fe2a5732522b1f7467174689cd91ac18af Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 12 Aug 2020 12:21:50 +0200 Subject: [PATCH] Rename class --- .../devices/DeviceVerificationInfoBottomSheet.kt | 10 +++++----- ... => DeviceVerificationInfoBottomSheetController.kt} | 6 +++--- .../DeviceVerificationInfoBottomSheetViewState.kt | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) rename vector/src/main/java/im/vector/app/features/settings/devices/{DeviceVerificationInfoEpoxyController.kt => DeviceVerificationInfoBottomSheetController.kt} (98%) diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt index 6a334898c0..c8b12e26a5 100644 --- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheet.kt @@ -39,7 +39,7 @@ data class DeviceVerificationInfoArgs( val deviceId: String ) : Parcelable -class DeviceVerificationInfoBottomSheet : VectorBaseBottomSheetDialogFragment(), DeviceVerificationInfoEpoxyController.Callback { +class DeviceVerificationInfoBottomSheet : VectorBaseBottomSheetDialogFragment(), DeviceVerificationInfoBottomSheetController.Callback { private val viewModel: DeviceVerificationInfoBottomSheetViewModel by fragmentViewModel(DeviceVerificationInfoBottomSheetViewModel::class) @@ -54,17 +54,17 @@ class DeviceVerificationInfoBottomSheet : VectorBaseBottomSheetDialogFragment(), injector.inject(this) } - @Inject lateinit var epoxyController: DeviceVerificationInfoEpoxyController + @Inject lateinit var controller: DeviceVerificationInfoBottomSheetController override fun getLayoutResId() = R.layout.bottom_sheet_generic_list_with_title override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) recyclerView.configureWith( - epoxyController, + controller, showDivider = false, hasFixedSize = false) - epoxyController.callback = this + controller.callback = this bottomSheetTitle.isVisible = false } @@ -74,7 +74,7 @@ class DeviceVerificationInfoBottomSheet : VectorBaseBottomSheetDialogFragment(), } override fun invalidate() = withState(viewModel) { - epoxyController.setData(it) + controller.setData(it) super.invalidate() } diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoEpoxyController.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt similarity index 98% rename from vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoEpoxyController.kt rename to vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt index bae31124ed..393bc741fe 100644 --- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoEpoxyController.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetController.kt @@ -31,9 +31,9 @@ import im.vector.app.features.crypto.verification.epoxy.bottomSheetVerificationA import timber.log.Timber import javax.inject.Inject -class DeviceVerificationInfoEpoxyController @Inject constructor(private val stringProvider: StringProvider, - private val colorProvider: ColorProvider, - private val session: Session) +class DeviceVerificationInfoBottomSheetController @Inject constructor(private val stringProvider: StringProvider, + private val colorProvider: ColorProvider, + private val session: Session) : TypedEpoxyController() { var callback: Callback? = null diff --git a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewState.kt b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewState.kt index 41a33ccfdd..ff7532fdaf 100644 --- a/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewState.kt +++ b/vector/src/main/java/im/vector/app/features/settings/devices/DeviceVerificationInfoBottomSheetViewState.kt @@ -19,8 +19,8 @@ package im.vector.app.features.settings.devices import com.airbnb.mvrx.Async import com.airbnb.mvrx.MvRxState import com.airbnb.mvrx.Uninitialized -import im.vector.matrix.android.internal.crypto.model.CryptoDeviceInfo -import im.vector.matrix.android.internal.crypto.model.rest.DeviceInfo +import org.matrix.android.sdk.internal.crypto.model.CryptoDeviceInfo +import org.matrix.android.sdk.internal.crypto.model.rest.DeviceInfo data class DeviceVerificationInfoBottomSheetViewState( val cryptoDeviceInfo: Async = Uninitialized,