Code quality

This commit is contained in:
Benoit Marty 2020-02-13 23:20:35 +01:00
parent 930d62c87b
commit 6c0bddc893
10 changed files with 17 additions and 17 deletions

View File

@ -21,7 +21,6 @@ import androidx.work.CoroutineWorker
import androidx.work.WorkerParameters import androidx.work.WorkerParameters
import com.squareup.moshi.JsonClass import com.squareup.moshi.JsonClass
import im.vector.matrix.android.api.failure.shouldBeRetried import im.vector.matrix.android.api.failure.shouldBeRetried
import im.vector.matrix.android.api.session.events.model.Content
import im.vector.matrix.android.api.session.events.model.Event import im.vector.matrix.android.api.session.events.model.Event
import im.vector.matrix.android.api.session.room.send.SendState import im.vector.matrix.android.api.session.room.send.SendState
import im.vector.matrix.android.internal.network.executeRequest import im.vector.matrix.android.internal.network.executeRequest

View File

@ -360,5 +360,4 @@ interface FragmentModule {
@IntoMap @IntoMap
@FragmentKey(IncomingShareFragment::class) @FragmentKey(IncomingShareFragment::class)
fun bindIncomingShareFragment(fragment: IncomingShareFragment): Fragment fun bindIncomingShareFragment(fragment: IncomingShareFragment): Fragment
} }

View File

@ -23,6 +23,4 @@ sealed class AttachmentsPreviewAction : VectorViewModelAction {
object RemoveCurrentAttachment : AttachmentsPreviewAction() object RemoveCurrentAttachment : AttachmentsPreviewAction()
data class SetCurrentAttachment(val index: Int): AttachmentsPreviewAction() data class SetCurrentAttachment(val index: Int): AttachmentsPreviewAction()
data class UpdatePathOfCurrentAttachment(val newPath: String): AttachmentsPreviewAction() data class UpdatePathOfCurrentAttachment(val newPath: String): AttachmentsPreviewAction()
} }

View File

@ -188,6 +188,7 @@ class AttachmentsPreviewFragment @Inject constructor(
// Status bar color (pb in dark mode, icon of the status bar are dark) // Status bar color (pb in dark mode, icon of the status bar are dark)
setStatusBarColor(colorProvider.getColorFromAttribute(R.attr.riotx_header_panel_background)) setStatusBarColor(colorProvider.getColorFromAttribute(R.attr.riotx_header_panel_background))
// Known issue: there is still orange color used by the lib // Known issue: there is still orange color used by the lib
// https://github.com/Yalantis/uCrop/issues/602
setActiveControlsWidgetColor(colorProvider.getColor(R.color.riotx_accent)) setActiveControlsWidgetColor(colorProvider.getColor(R.color.riotx_accent))
// Hide the logo (does not work) // Hide the logo (does not work)
setLogoColor(Color.TRANSPARENT) setLogoColor(Color.TRANSPARENT)
@ -203,7 +204,10 @@ class AttachmentsPreviewFragment @Inject constructor(
attachmentMiniaturePreviewController.callback = this attachmentMiniaturePreviewController.callback = this
attachmentPreviewerBigList.layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false) attachmentPreviewerBigList.layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
attachmentPreviewerBigList.attachSnapHelperWithListener(PagerSnapHelper(), SnapOnScrollListener.Behavior.NOTIFY_ON_SCROLL_STATE_IDLE, object : OnSnapPositionChangeListener { attachmentPreviewerBigList.attachSnapHelperWithListener(
PagerSnapHelper(),
SnapOnScrollListener.Behavior.NOTIFY_ON_SCROLL_STATE_IDLE,
object : OnSnapPositionChangeListener {
override fun onSnapPositionChange(position: Int) { override fun onSnapPositionChange(position: Int) {
viewModel.handle(AttachmentsPreviewAction.SetCurrentAttachment(position)) viewModel.handle(AttachmentsPreviewAction.SetCurrentAttachment(position))
} }

View File

@ -19,7 +19,6 @@ package im.vector.riotx.features.home.room.list
import im.vector.matrix.android.api.session.room.model.RoomSummary import im.vector.matrix.android.api.session.room.model.RoomSummary
import im.vector.matrix.android.api.session.room.notification.RoomNotificationState import im.vector.matrix.android.api.session.room.notification.RoomNotificationState
import im.vector.riotx.core.platform.VectorViewModelAction import im.vector.riotx.core.platform.VectorViewModelAction
import im.vector.riotx.features.share.SharedData
sealed class RoomListAction : VectorViewModelAction { sealed class RoomListAction : VectorViewModelAction {
data class SelectRoom(val roomSummary: RoomSummary) : RoomListAction() data class SelectRoom(val roomSummary: RoomSummary) : RoomListAction()

View File

@ -28,7 +28,6 @@ import im.vector.matrix.android.api.session.room.model.tag.RoomTag
import im.vector.riotx.core.extensions.exhaustive import im.vector.riotx.core.extensions.exhaustive
import im.vector.riotx.core.platform.VectorViewModel import im.vector.riotx.core.platform.VectorViewModel
import im.vector.riotx.core.utils.DataSource import im.vector.riotx.core.utils.DataSource
import im.vector.riotx.features.share.SharedData
import io.reactivex.schedulers.Schedulers import io.reactivex.schedulers.Schedulers
import timber.log.Timber import timber.log.Timber
import javax.inject.Inject import javax.inject.Inject

View File

@ -22,7 +22,6 @@ import im.vector.matrix.android.api.session.room.model.Membership
import im.vector.matrix.android.api.session.room.model.RoomSummary import im.vector.matrix.android.api.session.room.model.RoomSummary
import im.vector.riotx.R import im.vector.riotx.R
import im.vector.riotx.core.epoxy.helpFooterItem import im.vector.riotx.core.epoxy.helpFooterItem
import im.vector.riotx.core.epoxy.noResultItem
import im.vector.riotx.core.resources.StringProvider import im.vector.riotx.core.resources.StringProvider
import im.vector.riotx.core.resources.UserPreferencesProvider import im.vector.riotx.core.resources.UserPreferencesProvider
import im.vector.riotx.features.home.RoomListDisplayMode import im.vector.riotx.features.home.RoomListDisplayMode
@ -161,7 +160,13 @@ class RoomSummaryController @Inject constructor(private val stringProvider: Stri
selectedRoomIds: Set<String>) { selectedRoomIds: Set<String>) {
summaries.forEach { roomSummary -> summaries.forEach { roomSummary ->
roomSummaryItemFactory roomSummaryItemFactory
.create(roomSummary, joiningRoomsIds, joiningErrorRoomsIds, rejectingRoomsIds, rejectingErrorRoomsIds,selectedRoomIds, listener) .create(roomSummary,
joiningRoomsIds,
joiningErrorRoomsIds,
rejectingRoomsIds,
rejectingErrorRoomsIds,
selectedRoomIds,
listener)
.addTo(this) .addTo(this)
} }
} }

View File

@ -57,7 +57,7 @@ abstract class RoomSummaryItem : VectorEpoxyModel<RoomSummaryItem.Holder>() {
super.bind(holder) super.bind(holder)
holder.rootView.setOnClickListener(itemClickListener) holder.rootView.setOnClickListener(itemClickListener)
holder.rootView.setOnLongClickListener { holder.rootView.setOnLongClickListener {
it.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); it.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
itemLongClickListener?.onLongClick(it) ?: false itemLongClickListener?.onLongClick(it) ?: false
} }
holder.titleView.text = matrixItem.getBestName() holder.titleView.text = matrixItem.getBestName()

View File

@ -36,4 +36,3 @@ class IncomingShareActivity : VectorBaseActivity(), ToolbarConfigurable {
configureToolbar(toolbar, displayBack = false) configureToolbar(toolbar, displayBack = false)
} }
} }

View File

@ -28,5 +28,3 @@ data class IncomingShareViewState(
val selectedRoomIds: Set<String> = emptySet(), val selectedRoomIds: Set<String> = emptySet(),
val isInMultiSelectionMode: Boolean = false val isInMultiSelectionMode: Boolean = false
) : MvRxState ) : MvRxState