mirror of
https://github.com/vector-im/element-android.git
synced 2024-11-15 01:35:07 +08:00
Iterate on navigation... We have to think about backstack, maybe using a finite state machine. WIP
This commit is contained in:
parent
337fd075dd
commit
c42be8141e
@ -0,0 +1,4 @@
|
||||
package im.vector.riotredesign.features
|
||||
|
||||
class RootFlowCoordinator {
|
||||
}
|
@ -0,0 +1,4 @@
|
||||
package im.vector.riotredesign.features.home
|
||||
|
||||
class HomeFlowCoordinator {
|
||||
}
|
@ -1,11 +1,10 @@
|
||||
package im.vector.riotredesign.core
|
||||
package im.vector.riotredesign.features.home
|
||||
|
||||
import android.net.Uri
|
||||
import im.vector.matrix.android.api.permalinks.PermalinkData
|
||||
import im.vector.matrix.android.api.permalinks.PermalinkParser
|
||||
import im.vector.riotredesign.features.home.HomeNavigator
|
||||
|
||||
class HomePermalinkNavigator(private val navigator: HomeNavigator) {
|
||||
class HomePermalinkHandler(private val navigator: HomeNavigator) {
|
||||
|
||||
fun launch(deepLink: String?) {
|
||||
val uri = deepLink?.let { Uri.parse(it) }
|
@ -4,6 +4,7 @@ import android.support.v4.app.FragmentActivity
|
||||
import com.airbnb.mvrx.BaseMvRxViewModel
|
||||
import com.airbnb.mvrx.MvRxViewModelFactory
|
||||
import im.vector.matrix.android.api.Matrix
|
||||
import im.vector.matrix.android.api.permalinks.PermalinkData
|
||||
import im.vector.matrix.android.api.session.Session
|
||||
import im.vector.matrix.rx.rx
|
||||
|
||||
@ -28,16 +29,39 @@ class HomeViewModel(initialState: HomeViewState, private val session: Session) :
|
||||
is HomeActions.SelectRoom -> handleSelectRoom(action)
|
||||
is HomeActions.SelectGroup -> handleSelectGroup(action)
|
||||
is HomeActions.RoomDisplayed -> setState { copy(shouldOpenRoomDetail = false) }
|
||||
is HomeActions.PermalinkClicked -> handlePermalinkClicked(action)
|
||||
}
|
||||
}
|
||||
|
||||
// PRIVATE METHODS *****************************************************************************
|
||||
|
||||
private fun handlePermalinkClicked(action: HomeActions.PermalinkClicked) {
|
||||
withState { state ->
|
||||
when (action.permalinkData) {
|
||||
is PermalinkData.EventLink -> {
|
||||
|
||||
}
|
||||
is PermalinkData.RoomLink -> {
|
||||
|
||||
}
|
||||
is PermalinkData.GroupLink -> {
|
||||
|
||||
}
|
||||
is PermalinkData.UserLink -> {
|
||||
|
||||
}
|
||||
is PermalinkData.FallbackLink -> {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun handleSelectRoom(action: HomeActions.SelectRoom) {
|
||||
withState { state ->
|
||||
if (state.selectedRoom?.roomId != action.roomSummary.roomId) {
|
||||
if (state.selectedRoomId != action.roomSummary.roomId) {
|
||||
session.saveLastSelectedRoom(action.roomSummary)
|
||||
setState { copy(selectedRoom = action.roomSummary, shouldOpenRoomDetail = true) }
|
||||
setState { copy(selectedRoomId = action.roomSummary.roomId, shouldOpenRoomDetail = true) }
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -56,21 +80,20 @@ class HomeViewModel(initialState: HomeViewState, private val session: Session) :
|
||||
session
|
||||
.rx().liveRoomSummaries()
|
||||
.execute { async ->
|
||||
|
||||
val summaries = async()
|
||||
val directRooms = summaries?.filter { it.isDirect } ?: emptyList()
|
||||
val groupRooms = summaries?.filter { !it.isDirect } ?: emptyList()
|
||||
|
||||
val selectedRoom = selectedRoom
|
||||
?: session.lastSelectedRoom()
|
||||
?: directRooms.firstOrNull()
|
||||
?: groupRooms.firstOrNull()
|
||||
val selectedRoomId = selectedRoomId
|
||||
?: session.lastSelectedRoom()?.roomId
|
||||
?: directRooms.firstOrNull()?.roomId
|
||||
?: groupRooms.firstOrNull()?.roomId
|
||||
|
||||
copy(
|
||||
asyncRooms = async,
|
||||
directRooms = directRooms,
|
||||
groupRooms = groupRooms,
|
||||
selectedRoom = selectedRoom
|
||||
selectedRoomId = selectedRoomId
|
||||
)
|
||||
}
|
||||
}
|
||||
|
@ -10,7 +10,8 @@ data class HomeViewState(
|
||||
val asyncRooms: Async<List<RoomSummary>> = Uninitialized,
|
||||
val directRooms: List<RoomSummary> = emptyList(),
|
||||
val groupRooms: List<RoomSummary> = emptyList(),
|
||||
val selectedRoom: RoomSummary? = null,
|
||||
val selectedRoomId: String? = null,
|
||||
val selectedEventId: String? = null,
|
||||
val shouldOpenRoomDetail: Boolean = true,
|
||||
val asyncGroups: Async<List<GroupSummary>> = Uninitialized,
|
||||
val selectedGroup: GroupSummary? = null
|
||||
|
@ -7,6 +7,7 @@ import android.support.v7.widget.LinearLayoutManager
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import com.airbnb.mvrx.activityViewModel
|
||||
import im.vector.matrix.android.api.Matrix
|
||||
import im.vector.matrix.android.api.MatrixCallback
|
||||
import im.vector.matrix.android.api.permalinks.PermalinkParser
|
||||
@ -20,11 +21,12 @@ import im.vector.riotredesign.core.platform.ToolbarConfigurable
|
||||
import im.vector.riotredesign.core.utils.FragmentArgumentDelegate
|
||||
import im.vector.riotredesign.core.utils.UnsafeFragmentArgumentDelegate
|
||||
import im.vector.riotredesign.features.home.AvatarRenderer
|
||||
import im.vector.riotredesign.features.home.HomeActions
|
||||
import im.vector.riotredesign.features.home.HomeViewModel
|
||||
import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController
|
||||
import kotlinx.android.synthetic.main.fragment_room_detail.*
|
||||
import org.koin.android.ext.android.inject
|
||||
import org.koin.core.parameter.parametersOf
|
||||
import timber.log.Timber
|
||||
|
||||
class RoomDetailFragment : RiotFragment(), TimelineEventController.Callback {
|
||||
|
||||
@ -38,6 +40,7 @@ class RoomDetailFragment : RiotFragment(), TimelineEventController.Callback {
|
||||
}
|
||||
}
|
||||
|
||||
private val viewModel: HomeViewModel by activityViewModel()
|
||||
private val currentSession = Matrix.getInstance().currentSession
|
||||
private var roomId: String by UnsafeFragmentArgumentDelegate()
|
||||
private var eventId: String? by FragmentArgumentDelegate()
|
||||
@ -106,7 +109,7 @@ class RoomDetailFragment : RiotFragment(), TimelineEventController.Callback {
|
||||
|
||||
override fun onUrlClicked(url: String) {
|
||||
val permalinkData = PermalinkParser.parse(url)
|
||||
Timber.v("Permalink data : $permalinkData")
|
||||
viewModel.accept(HomeActions.PermalinkClicked(permalinkData))
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -50,8 +50,8 @@ class RoomListFragment : RiotFragment(), RoomSummaryController.Callback {
|
||||
is Success -> renderSuccess(state)
|
||||
is Fail -> renderFailure(state.asyncRooms.error)
|
||||
}
|
||||
if (state.shouldOpenRoomDetail && state.selectedRoom != null) {
|
||||
homeNavigator.openRoomDetail(state.selectedRoom.roomId, null)
|
||||
if (state.shouldOpenRoomDetail && state.selectedRoomId != null) {
|
||||
homeNavigator.openRoomDetail(state.selectedRoomId, null)
|
||||
viewModel.accept(HomeActions.RoomDisplayed)
|
||||
}
|
||||
}
|
||||
|
@ -34,7 +34,7 @@ class RoomSummaryController(private val callback: Callback? = null
|
||||
.isNotEmpty()
|
||||
}
|
||||
}
|
||||
buildRoomModels(filteredDirectRooms, viewState.selectedRoom)
|
||||
buildRoomModels(filteredDirectRooms, viewState.selectedRoomId)
|
||||
}
|
||||
|
||||
RoomCategoryItem(
|
||||
@ -52,14 +52,14 @@ class RoomSummaryController(private val callback: Callback? = null
|
||||
val filteredGroupRooms = viewState.groupRooms.filter {
|
||||
viewState.selectedGroup?.roomIds?.contains(it.roomId) ?: true
|
||||
}
|
||||
buildRoomModels(filteredGroupRooms, viewState.selectedRoom)
|
||||
buildRoomModels(filteredGroupRooms, viewState.selectedRoomId)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private fun buildRoomModels(summaries: List<RoomSummary>, selected: RoomSummary?) {
|
||||
private fun buildRoomModels(summaries: List<RoomSummary>, selectedRoomId: String?) {
|
||||
summaries.forEach { roomSummary ->
|
||||
val isSelected = roomSummary.roomId == selected?.roomId
|
||||
val isSelected = roomSummary.roomId == selectedRoomId
|
||||
RoomSummaryItem(
|
||||
roomName = roomSummary.displayName,
|
||||
avatarUrl = roomSummary.avatarUrl,
|
||||
|
@ -0,0 +1,2 @@
|
||||
package im.vector.riotredesign.features.login
|
||||
|
Loading…
Reference in New Issue
Block a user