Clean code
This commit is contained in:
ganfra
parent
6ebe5532c5
commit
5c71cabb5f
@ -13,6 +13,7 @@ Improvements:
|
||||
- Mark all messages as read (#396)
|
||||
- Add ability to report content (#515)
|
||||
|
||||
|
||||
Other changes:
|
||||
- Accessibility improvements to read receipts in the room timeline and reactions emoji chooser
|
||||
|
||||
|
||||
@ -86,7 +86,6 @@ fun List<Action>.toJson(): List<Any> {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
fun PushRule.getActions(): List<Action> {
|
||||
val result = ArrayList<Action>()
|
||||
|
||||
|
||||
@ -25,5 +25,4 @@ interface RoomPushRuleService {
|
||||
fun getLiveRoomNotificationState(): LiveData<RoomNotificationState>
|
||||
|
||||
fun setRoomNotificationState(roomNotificationState: RoomNotificationState, matrixCallback: MatrixCallback<Unit>): Cancelable
|
||||
|
||||
}
|
||||
|
||||
@ -49,4 +49,3 @@ internal fun PushRuleEntity.Companion.where(realm: Realm,
|
||||
.equalTo("${PushRuleEntityFields.PARENT}.${PushRulesEntityFields.SCOPE}", scope)
|
||||
.equalTo(PushRuleEntityFields.RULE_ID, ruleId)
|
||||
}
|
||||
|
||||
|
||||
@ -19,7 +19,6 @@ package im.vector.matrix.android.internal.session.room
|
||||
import com.zhuinden.monarchy.Monarchy
|
||||
import im.vector.matrix.android.api.session.crypto.CryptoService
|
||||
import im.vector.matrix.android.api.session.room.Room
|
||||
import im.vector.matrix.android.api.session.room.notification.RoomPushRuleService
|
||||
import im.vector.matrix.android.internal.database.mapper.RoomSummaryMapper
|
||||
import im.vector.matrix.android.internal.session.room.draft.DefaultDraftService
|
||||
import im.vector.matrix.android.internal.session.room.membership.DefaultMembershipService
|
||||
|
||||
@ -69,5 +69,4 @@ internal class DefaultRoomPushRuleService @AssistedInject constructor(@Assisted
|
||||
results.firstOrNull()
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -99,4 +99,3 @@ internal fun RoomPushRule.toRoomNotificationState(): RoomNotificationState {
|
||||
RoomNotificationState.ALL_MESSAGES
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -27,10 +27,7 @@ import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreFromP
|
||||
import im.vector.riotx.features.crypto.keysbackup.restore.KeysBackupRestoreSharedViewModel
|
||||
import im.vector.riotx.features.crypto.keysbackup.setup.KeysBackupSetupSharedViewModel
|
||||
import im.vector.riotx.features.crypto.verification.SasVerificationViewModel
|
||||
import im.vector.riotx.features.home.HomeNavigationViewModel
|
||||
import im.vector.riotx.features.home.createdirect.CreateDirectRoomNavigationViewModel
|
||||
import im.vector.riotx.features.reactions.EmojiChooserViewModel
|
||||
import im.vector.riotx.features.roomdirectory.RoomDirectoryNavigationViewModel
|
||||
import im.vector.riotx.features.workers.signout.SignOutViewModel
|
||||
|
||||
@Module
|
||||
@ -85,5 +82,4 @@ interface ViewModelModule {
|
||||
@IntoMap
|
||||
@ViewModelKey(ConfigurationViewModel::class)
|
||||
fun bindConfigurationViewModel(viewModel: ConfigurationViewModel): ViewModel
|
||||
|
||||
}
|
||||
|
||||
@ -29,7 +29,6 @@ import com.airbnb.epoxy.EpoxyModelClass
|
||||
import im.vector.riotx.R
|
||||
import im.vector.riotx.core.epoxy.VectorEpoxyHolder
|
||||
import im.vector.riotx.core.epoxy.VectorEpoxyModel
|
||||
import im.vector.riotx.core.resources.ColorProvider
|
||||
import im.vector.riotx.features.themes.ThemeUtils
|
||||
|
||||
/**
|
||||
|
||||
@ -44,5 +44,4 @@ abstract class VectorViewModel<S : MvRxState>(initialState: S)
|
||||
.onErrorReturn { Fail(it) }
|
||||
.doOnNext { setState { stateReducer(it) } }
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -31,7 +31,6 @@ import im.vector.riotx.R
|
||||
import im.vector.riotx.core.di.ActiveSessionHolder
|
||||
import im.vector.riotx.core.di.ScreenComponent
|
||||
import im.vector.riotx.core.extensions.hideKeyboard
|
||||
import im.vector.riotx.core.extensions.observeEvent
|
||||
import im.vector.riotx.core.extensions.replaceFragment
|
||||
import im.vector.riotx.core.platform.ToolbarConfigurable
|
||||
import im.vector.riotx.core.platform.VectorBaseActivity
|
||||
|
||||
@ -31,7 +31,6 @@ import im.vector.riotx.core.di.ScreenComponent
|
||||
import im.vector.riotx.core.error.ErrorFormatter
|
||||
import im.vector.riotx.core.extensions.addFragment
|
||||
import im.vector.riotx.core.extensions.addFragmentToBackstack
|
||||
import im.vector.riotx.core.extensions.observeEvent
|
||||
import im.vector.riotx.core.platform.SimpleFragmentActivity
|
||||
import im.vector.riotx.core.platform.WaitingViewData
|
||||
import kotlinx.android.synthetic.main.activity.*
|
||||
|
||||
@ -21,12 +21,36 @@ import androidx.annotation.StringRes
|
||||
import im.vector.riotx.R
|
||||
|
||||
sealed class RoomListQuickActions(@StringRes val titleRes: Int, @DrawableRes val iconResId: Int) {
|
||||
data class NotificationsAllNoisy(val roomId: String) : RoomListQuickActions(R.string.room_list_quick_actions_notifications_all_noisy, R.drawable.ic_room_actions_notifications_all_noisy)
|
||||
data class NotificationsAll(val roomId: String) : RoomListQuickActions(R.string.room_list_quick_actions_notifications_all, R.drawable.ic_room_actions_notifications_all)
|
||||
data class NotificationsMentionsOnly(val roomId: String) : RoomListQuickActions(R.string.room_list_quick_actions_notifications_mentions, R.drawable.ic_room_actions_notifications_mentions)
|
||||
data class NotificationsMute(val roomId: String) : RoomListQuickActions(R.string.room_list_quick_actions_notifications_mute, R.drawable.ic_room_actions_notifications_mutes)
|
||||
data class Settings(val roomId: String) : RoomListQuickActions(R.string.room_list_quick_actions_settings, R.drawable.ic_room_actions_settings)
|
||||
data class Leave(val roomId: String) : RoomListQuickActions(R.string.room_list_quick_actions_leave, R.drawable.ic_room_actions_leave)
|
||||
|
||||
data class NotificationsAllNoisy(val roomId: String) : RoomListQuickActions(
|
||||
R.string.room_list_quick_actions_notifications_all_noisy,
|
||||
R.drawable.ic_room_actions_notifications_all_noisy
|
||||
)
|
||||
|
||||
data class NotificationsAll(val roomId: String) : RoomListQuickActions(
|
||||
R.string.room_list_quick_actions_notifications_all,
|
||||
R.drawable.ic_room_actions_notifications_all
|
||||
)
|
||||
|
||||
data class NotificationsMentionsOnly(val roomId: String) : RoomListQuickActions(
|
||||
R.string.room_list_quick_actions_notifications_mentions,
|
||||
R.drawable.ic_room_actions_notifications_mentions
|
||||
)
|
||||
|
||||
data class NotificationsMute(val roomId: String) : RoomListQuickActions(
|
||||
R.string.room_list_quick_actions_notifications_mute,
|
||||
R.drawable.ic_room_actions_notifications_mutes
|
||||
)
|
||||
|
||||
data class Settings(val roomId: String) : RoomListQuickActions(
|
||||
R.string.room_list_quick_actions_settings,
|
||||
R.drawable.ic_room_actions_settings
|
||||
)
|
||||
|
||||
data class Leave(val roomId: String) : RoomListQuickActions(
|
||||
R.string.room_list_quick_actions_leave,
|
||||
R.drawable.ic_room_actions_leave
|
||||
)
|
||||
|
||||
companion object {
|
||||
fun all(roomId: String): List<RoomListQuickActions> {
|
||||
@ -40,5 +64,4 @@ sealed class RoomListQuickActions(@StringRes val titleRes: Int, @DrawableRes val
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -46,11 +46,11 @@ data class RoomListActionsArgs(
|
||||
class RoomListQuickActionsBottomSheet : VectorBaseBottomSheetDialogFragment(), RoomListQuickActionsEpoxyController.Listener {
|
||||
|
||||
private lateinit var actionsDispatcher: RoomListQuickActionsStore
|
||||
@Inject lateinit var roomListActionsViewModelFactory: RoomListActionsViewModel.Factory
|
||||
@Inject lateinit var roomListActionsViewModelFactory: RoomListQuickActionsViewModel.Factory
|
||||
@Inject lateinit var roomListActionsEpoxyController: RoomListQuickActionsEpoxyController
|
||||
@Inject lateinit var navigator: Navigator
|
||||
|
||||
private val viewModel: RoomListActionsViewModel by fragmentViewModel(RoomListActionsViewModel::class)
|
||||
private val viewModel: RoomListQuickActionsViewModel by fragmentViewModel(RoomListQuickActionsViewModel::class)
|
||||
|
||||
@BindView(R.id.bottomSheetRecyclerView)
|
||||
lateinit var recyclerView: RecyclerView
|
||||
@ -77,7 +77,6 @@ class RoomListQuickActionsBottomSheet : VectorBaseBottomSheetDialogFragment(), R
|
||||
roomListActionsEpoxyController.listener = this
|
||||
}
|
||||
|
||||
|
||||
override fun invalidate() = withState(viewModel) {
|
||||
roomListActionsEpoxyController.setData(it)
|
||||
super.invalidate()
|
||||
|
||||
@ -33,7 +33,8 @@ import javax.inject.Inject
|
||||
class RoomListQuickActionsEpoxyController @Inject constructor(private val stringProvider: StringProvider,
|
||||
private val avatarRenderer: AvatarRenderer,
|
||||
private val dateFormatter: VectorDateFormatter,
|
||||
private val fontProvider: EmojiCompatFontProvider) : TypedEpoxyController<RoomListQuickActionsState>() {
|
||||
private val fontProvider: EmojiCompatFontProvider)
|
||||
: TypedEpoxyController<RoomListQuickActionsState>() {
|
||||
|
||||
var listener: Listener? = null
|
||||
|
||||
|
||||
@ -29,5 +29,4 @@ data class RoomListQuickActionsState(
|
||||
) : MvRxState {
|
||||
|
||||
constructor(args: RoomListActionsArgs) : this(roomId = args.roomId)
|
||||
|
||||
}
|
||||
|
||||
@ -18,30 +18,23 @@ package im.vector.riotx.features.home.room.list.actions
|
||||
import com.airbnb.mvrx.*
|
||||
import com.squareup.inject.assisted.Assisted
|
||||
import com.squareup.inject.assisted.AssistedInject
|
||||
import dagger.Lazy
|
||||
import im.vector.matrix.android.api.MatrixCallback
|
||||
import im.vector.matrix.android.api.session.Session
|
||||
import im.vector.matrix.rx.rx
|
||||
import im.vector.matrix.rx.unwrap
|
||||
import im.vector.riotx.core.platform.VectorViewModel
|
||||
import im.vector.riotx.core.resources.StringProvider
|
||||
import im.vector.riotx.features.home.room.detail.timeline.format.NoticeEventFormatter
|
||||
import im.vector.riotx.features.html.EventHtmlRenderer
|
||||
import timber.log.Timber
|
||||
|
||||
class RoomListActionsViewModel @AssistedInject constructor(@Assisted
|
||||
initialState: RoomListQuickActionsState,
|
||||
session: Session
|
||||
class RoomListQuickActionsViewModel @AssistedInject constructor(@Assisted initialState: RoomListQuickActionsState,
|
||||
session: Session
|
||||
) : VectorViewModel<RoomListQuickActionsState>(initialState) {
|
||||
|
||||
@AssistedInject.Factory
|
||||
interface Factory {
|
||||
fun create(initialState: RoomListQuickActionsState): RoomListActionsViewModel
|
||||
fun create(initialState: RoomListQuickActionsState): RoomListQuickActionsViewModel
|
||||
}
|
||||
|
||||
companion object : MvRxViewModelFactory<RoomListActionsViewModel, RoomListQuickActionsState> {
|
||||
companion object : MvRxViewModelFactory<RoomListQuickActionsViewModel, RoomListQuickActionsState> {
|
||||
|
||||
override fun create(viewModelContext: ViewModelContext, state: RoomListQuickActionsState): RoomListActionsViewModel? {
|
||||
override fun create(viewModelContext: ViewModelContext, state: RoomListQuickActionsState): RoomListQuickActionsViewModel? {
|
||||
val fragment: RoomListQuickActionsBottomSheet = (viewModelContext as FragmentViewModelContext).fragment()
|
||||
return fragment.roomListActionsViewModelFactory.create(state)
|
||||
}
|
||||
@ -72,6 +65,4 @@ class RoomListActionsViewModel @AssistedInject constructor(@Assisted
|
||||
copy(roomSummary = it)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -115,6 +115,5 @@ class DefaultNavigator @Inject constructor() : Navigator {
|
||||
|
||||
override fun openRoomSettings(context: Context, roomId: String) {
|
||||
Timber.v("Open room settings$roomId")
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -52,5 +52,4 @@ interface Navigator {
|
||||
fun openUserDetail(userId: String, context: Context)
|
||||
|
||||
fun openRoomSettings(context: Context, roomId: String)
|
||||
|
||||
}
|
||||
|
||||
@ -25,7 +25,6 @@ import im.vector.riotx.R
|
||||
import im.vector.riotx.core.di.ScreenComponent
|
||||
import im.vector.riotx.core.extensions.addFragment
|
||||
import im.vector.riotx.core.extensions.addFragmentToBackstack
|
||||
import im.vector.riotx.core.extensions.observeEvent
|
||||
import im.vector.riotx.core.platform.VectorBaseActivity
|
||||
import im.vector.riotx.features.roomdirectory.createroom.CreateRoomFragment
|
||||
import im.vector.riotx.features.roomdirectory.createroom.CreateRoomViewModel
|
||||
|
||||
@ -25,7 +25,6 @@ import com.airbnb.mvrx.viewModel
|
||||
import im.vector.riotx.R
|
||||
import im.vector.riotx.core.di.ScreenComponent
|
||||
import im.vector.riotx.core.extensions.addFragment
|
||||
import im.vector.riotx.core.extensions.observeEvent
|
||||
import im.vector.riotx.core.platform.ToolbarConfigurable
|
||||
import im.vector.riotx.core.platform.VectorBaseActivity
|
||||
import im.vector.riotx.features.roomdirectory.RoomDirectoryActivity
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user