mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-02 21:32:34 +00:00
Fix konsist issue about presenters not depending in other concrete presenter implementations
This commit is contained in:
+4
@@ -15,6 +15,7 @@ import io.element.android.features.home.impl.filters.RoomListFiltersPresenter
|
|||||||
import io.element.android.features.home.impl.filters.RoomListFiltersState
|
import io.element.android.features.home.impl.filters.RoomListFiltersState
|
||||||
import io.element.android.features.home.impl.roomlist.RoomListPresenter
|
import io.element.android.features.home.impl.roomlist.RoomListPresenter
|
||||||
import io.element.android.features.home.impl.roomlist.RoomListState
|
import io.element.android.features.home.impl.roomlist.RoomListState
|
||||||
|
import io.element.android.features.home.impl.search.GlobalSearchState
|
||||||
import io.element.android.features.home.impl.search.RoomListSearchPresenter
|
import io.element.android.features.home.impl.search.RoomListSearchPresenter
|
||||||
import io.element.android.features.home.impl.search.RoomListSearchState
|
import io.element.android.features.home.impl.search.RoomListSearchState
|
||||||
import io.element.android.features.home.impl.spacefilters.SpaceFiltersPresenter
|
import io.element.android.features.home.impl.spacefilters.SpaceFiltersPresenter
|
||||||
@@ -36,4 +37,7 @@ interface RoomListModule {
|
|||||||
|
|
||||||
@Binds
|
@Binds
|
||||||
fun bindSpaceFiltersPresenter(presenter: SpaceFiltersPresenter): Presenter<SpaceFiltersState>
|
fun bindSpaceFiltersPresenter(presenter: SpaceFiltersPresenter): Presenter<SpaceFiltersState>
|
||||||
|
|
||||||
|
@Binds
|
||||||
|
fun bindGlobalSearchPresenter(presenter: RoomListSearchPresenter): Presenter<GlobalSearchState>
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -30,7 +30,7 @@ import io.element.android.features.announcement.api.AnnouncementService
|
|||||||
import io.element.android.features.home.impl.datasource.RoomListDataSource
|
import io.element.android.features.home.impl.datasource.RoomListDataSource
|
||||||
import io.element.android.features.home.impl.filters.RoomListFiltersState
|
import io.element.android.features.home.impl.filters.RoomListFiltersState
|
||||||
import io.element.android.features.home.impl.filters.into
|
import io.element.android.features.home.impl.filters.into
|
||||||
import io.element.android.features.home.impl.search.GlobalSearchPresenter
|
import io.element.android.features.home.impl.search.GlobalSearchState
|
||||||
import io.element.android.features.home.impl.search.RoomListSearchEvent
|
import io.element.android.features.home.impl.search.RoomListSearchEvent
|
||||||
import io.element.android.features.home.impl.search.RoomListSearchState
|
import io.element.android.features.home.impl.search.RoomListSearchState
|
||||||
import io.element.android.features.home.impl.spacefilters.SpaceFiltersState
|
import io.element.android.features.home.impl.spacefilters.SpaceFiltersState
|
||||||
@@ -86,7 +86,7 @@ class RoomListPresenter(
|
|||||||
private val announcementService: AnnouncementService,
|
private val announcementService: AnnouncementService,
|
||||||
private val coldStartWatcher: AnalyticsColdStartWatcher,
|
private val coldStartWatcher: AnalyticsColdStartWatcher,
|
||||||
private val spaceFiltersPresenter: Presenter<SpaceFiltersState>,
|
private val spaceFiltersPresenter: Presenter<SpaceFiltersState>,
|
||||||
private val globalSearchPresenter: GlobalSearchPresenter,
|
private val globalSearchPresenter: Presenter<GlobalSearchState>,
|
||||||
private val featureFlagService: FeatureFlagService,
|
private val featureFlagService: FeatureFlagService,
|
||||||
) : Presenter<RoomListState> {
|
) : Presenter<RoomListState> {
|
||||||
private val encryptionService = client.encryptionService
|
private val encryptionService = client.encryptionService
|
||||||
|
|||||||
+2
@@ -46,6 +46,8 @@ class RoomListSearchDataSource(
|
|||||||
coroutineScope = coroutineScope
|
coroutineScope = coroutineScope
|
||||||
)
|
)
|
||||||
|
|
||||||
|
val loadingState = roomList.loadingState
|
||||||
|
|
||||||
val roomSummaries: Flow<ImmutableList<RoomListRoomSummary>> = roomList.summaries
|
val roomSummaries: Flow<ImmutableList<RoomListRoomSummary>> = roomList.summaries
|
||||||
.map { roomSummaries ->
|
.map { roomSummaries ->
|
||||||
roomSummaries
|
roomSummaries
|
||||||
|
|||||||
+2
-4
@@ -20,8 +20,8 @@ import io.element.android.features.home.impl.filters.aRoomListFiltersState
|
|||||||
import io.element.android.features.home.impl.model.createRoomListRoomSummary
|
import io.element.android.features.home.impl.model.createRoomListRoomSummary
|
||||||
import io.element.android.features.home.impl.search.RoomListSearchEvent
|
import io.element.android.features.home.impl.search.RoomListSearchEvent
|
||||||
import io.element.android.features.home.impl.search.RoomListSearchState
|
import io.element.android.features.home.impl.search.RoomListSearchState
|
||||||
|
import io.element.android.features.home.impl.search.aGlobalSearchState
|
||||||
import io.element.android.features.home.impl.search.aRoomListSearchState
|
import io.element.android.features.home.impl.search.aRoomListSearchState
|
||||||
import io.element.android.features.home.impl.search.createGlobalSearchPresenter
|
|
||||||
import io.element.android.features.home.impl.spacefilters.SpaceFiltersState
|
import io.element.android.features.home.impl.spacefilters.SpaceFiltersState
|
||||||
import io.element.android.features.home.impl.spacefilters.aDisabledSpaceFiltersState
|
import io.element.android.features.home.impl.spacefilters.aDisabledSpaceFiltersState
|
||||||
import io.element.android.features.invite.api.SeenInvitesStore
|
import io.element.android.features.invite.api.SeenInvitesStore
|
||||||
@@ -681,9 +681,7 @@ class RoomListPresenterTest {
|
|||||||
analyticsService = FakeAnalyticsService(),
|
analyticsService = FakeAnalyticsService(),
|
||||||
),
|
),
|
||||||
searchPresenter = searchPresenter,
|
searchPresenter = searchPresenter,
|
||||||
globalSearchPresenter = createGlobalSearchPresenter(
|
globalSearchPresenter = { aGlobalSearchState() },
|
||||||
matrixClient = client,
|
|
||||||
),
|
|
||||||
filtersPresenter = filtersPresenter,
|
filtersPresenter = filtersPresenter,
|
||||||
spaceFiltersPresenter = spaceFiltersPresenter,
|
spaceFiltersPresenter = spaceFiltersPresenter,
|
||||||
analyticsService = analyticsService,
|
analyticsService = analyticsService,
|
||||||
|
|||||||
+1
-1
@@ -202,7 +202,7 @@ class GlobalSearchPresenterTest {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal fun TestScope.createGlobalSearchPresenter(
|
private fun TestScope.createGlobalSearchPresenter(
|
||||||
roomListService: RoomListService = FakeRoomListService(),
|
roomListService: RoomListService = FakeRoomListService(),
|
||||||
messageSearchService: MessageSearchService = FakeMessageSearchService(),
|
messageSearchService: MessageSearchService = FakeMessageSearchService(),
|
||||||
featureFlagService: FeatureFlagService = FakeFeatureFlagService(),
|
featureFlagService: FeatureFlagService = FakeFeatureFlagService(),
|
||||||
|
|||||||
Reference in New Issue
Block a user