mirror of
https://github.com/element-hq/element-android
synced 2024-10-25 12:17:25 +03:00
Cleaning
This commit is contained in:
parent
dba6784487
commit
45200572a2
3 changed files with 8 additions and 15 deletions
|
@ -22,7 +22,6 @@ import androidx.lifecycle.OnLifecycleEvent
|
||||||
import arrow.core.Option
|
import arrow.core.Option
|
||||||
import im.vector.app.core.di.ActiveSessionHolder
|
import im.vector.app.core.di.ActiveSessionHolder
|
||||||
import im.vector.app.core.utils.BehaviorDataSource
|
import im.vector.app.core.utils.BehaviorDataSource
|
||||||
import im.vector.app.features.settings.VectorPreferences
|
|
||||||
import im.vector.app.features.ui.UiStateRepository
|
import im.vector.app.features.ui.UiStateRepository
|
||||||
import io.reactivex.disposables.CompositeDisposable
|
import io.reactivex.disposables.CompositeDisposable
|
||||||
import kotlinx.coroutines.GlobalScope
|
import kotlinx.coroutines.GlobalScope
|
||||||
|
@ -51,8 +50,7 @@ fun RoomGroupingMethod.group() = (this as? RoomGroupingMethod.ByLegacyGroup)?.gr
|
||||||
class AppStateHandler @Inject constructor(
|
class AppStateHandler @Inject constructor(
|
||||||
sessionDataSource: ActiveSessionDataSource,
|
sessionDataSource: ActiveSessionDataSource,
|
||||||
private val uiStateRepository: UiStateRepository,
|
private val uiStateRepository: UiStateRepository,
|
||||||
private val activeSessionHolder: ActiveSessionHolder,
|
private val activeSessionHolder: ActiveSessionHolder
|
||||||
vectorPreferences: VectorPreferences
|
|
||||||
) : LifecycleObserver {
|
) : LifecycleObserver {
|
||||||
|
|
||||||
private val compositeDisposable = CompositeDisposable()
|
private val compositeDisposable = CompositeDisposable()
|
||||||
|
@ -100,18 +98,14 @@ class AppStateHandler @Inject constructor(
|
||||||
// sessionDataSource could already return a session while acitveSession holder still returns null
|
// sessionDataSource could already return a session while acitveSession holder still returns null
|
||||||
it.orNull()?.let { session ->
|
it.orNull()?.let { session ->
|
||||||
if (uiStateRepository.isGroupingMethodSpace(session.sessionId)) {
|
if (uiStateRepository.isGroupingMethodSpace(session.sessionId)) {
|
||||||
uiStateRepository.getSelectedSpace(session.sessionId).let { selectedSpaceId ->
|
setCurrentSpace(uiStateRepository.getSelectedSpace(session.sessionId), session)
|
||||||
setCurrentSpace(selectedSpaceId, session)
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
uiStateRepository.getSelectedGroup(session.sessionId).let { selectedGroupId ->
|
setCurrentGroup(uiStateRepository.getSelectedGroup(session.sessionId), session)
|
||||||
setCurrentGroup(selectedGroupId, session)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}.also {
|
}.also {
|
||||||
compositeDisposable.add(it)
|
compositeDisposable.add(it)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun safeActiveSpaceId(): String? {
|
fun safeActiveSpaceId(): String? {
|
||||||
|
|
|
@ -100,7 +100,7 @@ class GroupRoomListSectionBuilder(
|
||||||
appStateHandler.selectedRoomGroupingObservable
|
appStateHandler.selectedRoomGroupingObservable
|
||||||
.distinctUntilChanged()
|
.distinctUntilChanged()
|
||||||
.subscribe { groupingMethod ->
|
.subscribe { groupingMethod ->
|
||||||
val selectedGroupId = (groupingMethod as? RoomGroupingMethod.ByLegacyGroup)?.groupSummary?.groupId
|
val selectedGroupId = (groupingMethod.orNull() as? RoomGroupingMethod.ByLegacyGroup)?.groupSummary?.groupId
|
||||||
activeGroupAwareQueries.onEach { updater ->
|
activeGroupAwareQueries.onEach { updater ->
|
||||||
updater.updateQuery { query ->
|
updater.updateQuery { query ->
|
||||||
query.copy(activeGroupId = selectedGroupId)
|
query.copy(activeGroupId = selectedGroupId)
|
||||||
|
|
|
@ -136,10 +136,9 @@ class SpaceSummaryController @Inject constructor(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val isSelected = selected is RoomGroupingMethod.BySpace && selected.space() == null
|
|
||||||
homeSpaceSummaryItem {
|
homeSpaceSummaryItem {
|
||||||
id("space_home")
|
id("space_home")
|
||||||
selected(isSelected)
|
selected(selected is RoomGroupingMethod.BySpace && selected.space() == null)
|
||||||
countState(UnreadCounterBadgeView.State(homeCount.totalCount, homeCount.isHighlight))
|
countState(UnreadCounterBadgeView.State(homeCount.totalCount, homeCount.isHighlight))
|
||||||
listener { callback?.onSpaceSelected(null) }
|
listener { callback?.onSpaceSelected(null) }
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue