From 5c71cabb5fef560e329ae47166694750ecd2b33a Mon Sep 17 00:00:00 2001 From: ganfra Date: Mon, 4 Nov 2019 15:08:08 +0100 Subject: [PATCH] Clean code --- CHANGES.md | 1 + .../matrix/android/api/pushrules/Action.kt | 1 - .../room/notification/RoomPushRuleService.kt | 1 - .../internal/database/query/PushersQueries.kt | 1 - .../internal/session/room/RoomFactory.kt | 1 - .../DefaultRoomPushRuleService.kt | 1 - .../room/notification/RoomPushRuleMapper.kt | 1 - .../vector/riotx/core/di/ViewModelModule.kt | 4 -- .../bottomsheet/BottomSheetItemAction.kt | 1 - .../riotx/core/platform/VectorViewModel.kt | 1 - .../riotx/features/home/HomeActivity.kt | 1 - .../createdirect/CreateDirectRoomActivity.kt | 1 - .../room/list/actions/RoomListQuickActions.kt | 37 +++++++++++++++---- .../RoomListQuickActionsBottomSheet.kt | 5 +-- .../RoomListQuickActionsEpoxyController.kt | 3 +- .../list/actions/RoomListQuickActionsState.kt | 1 - .../actions/RoomListQuickActionsViewModel.kt | 19 +++------- .../features/navigation/DefaultNavigator.kt | 1 - .../riotx/features/navigation/Navigator.kt | 1 - .../roomdirectory/RoomDirectoryActivity.kt | 1 - .../createroom/CreateRoomActivity.kt | 1 - 21 files changed, 40 insertions(+), 44 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 8d536dbd97..c52ad4af0d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -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 diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/Action.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/Action.kt index d1e5b3c868..a81af2cf21 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/Action.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/pushrules/Action.kt @@ -86,7 +86,6 @@ fun List.toJson(): List { } } - fun PushRule.getActions(): List { val result = ArrayList() diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/notification/RoomPushRuleService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/notification/RoomPushRuleService.kt index 7b3e88240b..41cd484ef9 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/notification/RoomPushRuleService.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/notification/RoomPushRuleService.kt @@ -25,5 +25,4 @@ interface RoomPushRuleService { fun getLiveRoomNotificationState(): LiveData fun setRoomNotificationState(roomNotificationState: RoomNotificationState, matrixCallback: MatrixCallback): Cancelable - } diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/PushersQueries.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/PushersQueries.kt index a97ed8d415..42e7770114 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/PushersQueries.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/database/query/PushersQueries.kt @@ -49,4 +49,3 @@ internal fun PushRuleEntity.Companion.where(realm: Realm, .equalTo("${PushRuleEntityFields.PARENT}.${PushRulesEntityFields.SCOPE}", scope) .equalTo(PushRuleEntityFields.RULE_ID, ruleId) } - diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomFactory.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomFactory.kt index 2c441762dd..30a2948f68 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomFactory.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomFactory.kt @@ -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 diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/notification/DefaultRoomPushRuleService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/notification/DefaultRoomPushRuleService.kt index a27cdb1007..7cb7452244 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/notification/DefaultRoomPushRuleService.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/notification/DefaultRoomPushRuleService.kt @@ -69,5 +69,4 @@ internal class DefaultRoomPushRuleService @AssistedInject constructor(@Assisted results.firstOrNull() } } - } diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/notification/RoomPushRuleMapper.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/notification/RoomPushRuleMapper.kt index 159eb511ee..d08d346a1f 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/notification/RoomPushRuleMapper.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/notification/RoomPushRuleMapper.kt @@ -99,4 +99,3 @@ internal fun RoomPushRule.toRoomNotificationState(): RoomNotificationState { RoomNotificationState.ALL_MESSAGES } } - diff --git a/vector/src/main/java/im/vector/riotx/core/di/ViewModelModule.kt b/vector/src/main/java/im/vector/riotx/core/di/ViewModelModule.kt index 83aa7103d9..d2b8abb9c4 100644 --- a/vector/src/main/java/im/vector/riotx/core/di/ViewModelModule.kt +++ b/vector/src/main/java/im/vector/riotx/core/di/ViewModelModule.kt @@ -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 - } diff --git a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetItemAction.kt b/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetItemAction.kt index 3dd760a520..e0299f4e65 100644 --- a/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetItemAction.kt +++ b/vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetItemAction.kt @@ -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 /** diff --git a/vector/src/main/java/im/vector/riotx/core/platform/VectorViewModel.kt b/vector/src/main/java/im/vector/riotx/core/platform/VectorViewModel.kt index 7f04f184a8..9679c20efb 100644 --- a/vector/src/main/java/im/vector/riotx/core/platform/VectorViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/core/platform/VectorViewModel.kt @@ -44,5 +44,4 @@ abstract class VectorViewModel(initialState: S) .onErrorReturn { Fail(it) } .doOnNext { setState { stateReducer(it) } } } - } diff --git a/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt b/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt index e552af0095..01f869c82a 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/HomeActivity.kt @@ -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 diff --git a/vector/src/main/java/im/vector/riotx/features/home/createdirect/CreateDirectRoomActivity.kt b/vector/src/main/java/im/vector/riotx/features/home/createdirect/CreateDirectRoomActivity.kt index 2b4322a87c..c4e7855c14 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/createdirect/CreateDirectRoomActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/createdirect/CreateDirectRoomActivity.kt @@ -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.* diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActions.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActions.kt index c0c77e0319..e89b4ebcd0 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActions.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActions.kt @@ -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 { @@ -40,5 +64,4 @@ sealed class RoomListQuickActions(@StringRes val titleRes: Int, @DrawableRes val ) } } - } diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt index 03e661eb20..560c05771c 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsBottomSheet.kt @@ -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() diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt index 63b68b4c17..cc6abc42b1 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt @@ -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() { + private val fontProvider: EmojiCompatFontProvider) + : TypedEpoxyController() { var listener: Listener? = null diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsState.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsState.kt index e8e40c30e2..a943db1804 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsState.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsState.kt @@ -29,5 +29,4 @@ data class RoomListQuickActionsState( ) : MvRxState { constructor(args: RoomListActionsArgs) : this(roomId = args.roomId) - } diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsViewModel.kt b/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsViewModel.kt index 422a1097f2..0eeef64a78 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsViewModel.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/list/actions/RoomListQuickActionsViewModel.kt @@ -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(initialState) { @AssistedInject.Factory interface Factory { - fun create(initialState: RoomListQuickActionsState): RoomListActionsViewModel + fun create(initialState: RoomListQuickActionsState): RoomListQuickActionsViewModel } - companion object : MvRxViewModelFactory { + companion object : MvRxViewModelFactory { - 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) } } - - } diff --git a/vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt index f0958b5b35..685fa04fef 100644 --- a/vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt +++ b/vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt @@ -115,6 +115,5 @@ class DefaultNavigator @Inject constructor() : Navigator { override fun openRoomSettings(context: Context, roomId: String) { Timber.v("Open room settings$roomId") - } } diff --git a/vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt b/vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt index 8bd5f520c1..83c4f7ce20 100644 --- a/vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt +++ b/vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt @@ -52,5 +52,4 @@ interface Navigator { fun openUserDetail(userId: String, context: Context) fun openRoomSettings(context: Context, roomId: String) - } diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryActivity.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryActivity.kt index e8914970ff..43894aa244 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/RoomDirectoryActivity.kt @@ -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 diff --git a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomActivity.kt b/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomActivity.kt index 00bd42901a..20843f86cb 100644 --- a/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/roomdirectory/createroom/CreateRoomActivity.kt @@ -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