Plug screens together

2019-05-27 17:28:18 +02:00
parent 02a81dd9e1
commit dde94c0d0f
12 changed files with 49 additions and 37 deletions
--- a/vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseActivity.kt
+++ b/vector/src/main/java/im/vector/riotredesign/core/platform/VectorBaseActivity.kt
@ -296,8 +296,8 @@ abstract class VectorBaseActivity : BaseMvRxActivity() {
     * Temporary method
     * ========================================================================================== */

-    fun notImplemented() {
-        toast(getString(R.string.not_implemented))
+    fun notImplemented(message: String = "") {
+        toast(getString(R.string.not_implemented) + message.takeIf { message.isNotBlank() }.run { ": $message" })
    }

 }
--- a/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
@ -123,12 +123,6 @@ class HomeActivity : VectorBaseActivity(), ToolbarConfigurable {
                SignOutUiWorker(this).perform(Matrix.getInstance().currentSession!!)
                return true
            }
-            // TODO Temporary code here to create a room
-            R.id.tmp_menu_create_room  -> {
-                // Start Activity for now
-                startActivity(Intent(this, RoomDirectoryActivity::class.java))
-                return true
-            }
        }

        return true
--- a/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListViewModel.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/home/group/GroupListViewModel.kt
@ -24,6 +24,7 @@ import com.airbnb.mvrx.ViewModelContext
 import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.group.model.GroupSummary
 import im.vector.matrix.rx.rx
+import im.vector.riotredesign.R
 import im.vector.riotredesign.core.platform.VectorViewModel
 import im.vector.riotredesign.core.resources.StringProvider
 import im.vector.riotredesign.core.utils.LiveEvent
@ -88,8 +89,7 @@ class GroupListViewModel(initialState: GroupListViewState,
                    val myUser = session.getUser(session.sessionParams.credentials.userId)
                    val allCommunityGroup = GroupSummary(
                            groupId = ALL_COMMUNITIES_GROUP_ID,
-                            // TODO i18n
-                            displayName = "All Communities",
+                            displayName = stringProvider.getString(R.string.group_all_communities),
                            avatarUrl = myUser?.avatarUrl ?: "")
                    listOf(allCommunityGroup) + it
                }
--- a/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListFragment.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListFragment.kt
@ -16,15 +16,12 @@

 package im.vector.riotredesign.features.home.room.list

+import android.content.Intent
 import android.os.Bundle
 import android.os.Parcelable
 import androidx.annotation.StringRes
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.airbnb.mvrx.Fail
-import com.airbnb.mvrx.Incomplete
-import com.airbnb.mvrx.Success
-import com.airbnb.mvrx.args
-import com.airbnb.mvrx.fragmentViewModel
+import com.airbnb.mvrx.*
 import im.vector.matrix.android.api.failure.Failure
 import im.vector.matrix.android.api.session.room.model.RoomSummary
 import im.vector.riotredesign.R
@ -32,13 +29,11 @@ import im.vector.riotredesign.core.epoxy.LayoutManagerStateRestorer
 import im.vector.riotredesign.core.extensions.observeEvent
 import im.vector.riotredesign.core.platform.StateView
 import im.vector.riotredesign.core.platform.VectorBaseFragment
-import im.vector.riotredesign.features.home.HomeModule
 import im.vector.riotredesign.features.home.HomeNavigator
+import im.vector.riotredesign.features.roomdirectory.RoomDirectoryActivity
 import kotlinx.android.parcel.Parcelize
 import kotlinx.android.synthetic.main.fragment_room_list.*
 import org.koin.android.ext.android.inject
-import org.koin.android.scope.ext.android.bindScope
-import org.koin.android.scope.ext.android.getOrCreateScope

@Parcelize
 data class RoomListParams(
@ -82,7 +77,8 @@ class RoomListFragment : VectorBaseFragment(), RoomSummaryController.Callback {
    private fun setupCreateRoomButton() {
        createRoomButton.setImageResource(R.drawable.ic_add_white)
        createRoomButton.setOnClickListener {
-            vectorBaseActivity.notImplemented()
+            // Start Activity for now
+            startActivity(Intent(requireActivity(), RoomDirectoryActivity::class.java))
        }
    }

--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsController.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsController.kt
@ -83,23 +83,27 @@ class PublicRoomsController(private val stringProvider: StringProvider,
            avatarUrl(publicRoom.avatarUrl)
            roomName(publicRoom.name)
            nbOfMembers(publicRoom.numJoinedMembers)
-            when {
-                viewState.joinedRoomsIds.contains(publicRoom.roomId)       -> joinState(PublicRoomItem.JoinState.JOINED)
-                viewState.joiningRoomsIds.contains(publicRoom.roomId)      -> joinState(PublicRoomItem.JoinState.JOINING)
-                viewState.joiningErrorRoomsIds.contains(publicRoom.roomId) -> joinState(PublicRoomItem.JoinState.JOINING_ERROR)
-                else                                                       -> joinState(PublicRoomItem.JoinState.NOT_JOINED)
+
+            val joinState = when {
+                viewState.joinedRoomsIds.contains(publicRoom.roomId)       -> PublicRoomItem.JoinState.JOINED
+                viewState.joiningRoomsIds.contains(publicRoom.roomId)      -> PublicRoomItem.JoinState.JOINING
+                viewState.joiningErrorRoomsIds.contains(publicRoom.roomId) -> PublicRoomItem.JoinState.JOINING_ERROR
+                else                                                       -> PublicRoomItem.JoinState.NOT_JOINED
            }
+
+            joinState(joinState)
+
            joinListener {
                callback?.onPublicRoomJoin(publicRoom)
            }
            globalListener {
-                callback?.onPublicRoomClicked(publicRoom)
+                callback?.onPublicRoomClicked(publicRoom, joinState)
            }
        }
    }

    interface Callback {
-        fun onPublicRoomClicked(publicRoom: PublicRoom)
+        fun onPublicRoomClicked(publicRoom: PublicRoom, joinState: PublicRoomItem.JoinState)
        fun onPublicRoomJoin(publicRoom: PublicRoom)
        fun loadMore()
    }
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/PublicRoomsFragment.kt
@ -30,6 +30,8 @@ import im.vector.riotredesign.R
 import im.vector.riotredesign.core.error.ErrorFormatter
 import im.vector.riotredesign.core.extensions.addFragmentToBackstack
 import im.vector.riotredesign.core.platform.VectorBaseFragment
+import im.vector.riotredesign.features.home.room.detail.RoomDetailActivity
+import im.vector.riotredesign.features.home.room.detail.RoomDetailArgs
 import im.vector.riotredesign.features.roomdirectory.picker.RoomDirectoryPickerFragment
 import io.reactivex.rxkotlin.subscribeBy
 import kotlinx.android.synthetic.main.fragment_public_rooms.*
@ -114,9 +116,25 @@ class PublicRoomsFragment : VectorBaseFragment(), PublicRoomsController.Callback
        publicRoomsList.setController(publicRoomsController)
    }

-    override fun onPublicRoomClicked(publicRoom: PublicRoom) {
+    override fun onPublicRoomClicked(publicRoom: PublicRoom, joinState: PublicRoomItem.JoinState) {
        Timber.v("PublicRoomClicked: $publicRoom")
-        vectorBaseActivity.notImplemented()
+
+        when (joinState) {
+            PublicRoomItem.JoinState.JOINED        -> {
+                val args = RoomDetailArgs(publicRoom.roomId)
+                val roomDetailIntent = RoomDetailActivity.newIntent(requireActivity(), args)
+                requireActivity().startActivity(roomDetailIntent)
+            }
+            PublicRoomItem.JoinState.NOT_JOINED,
+            PublicRoomItem.JoinState.JOINING_ERROR -> {
+                // ROOM PREVIEW
+                vectorBaseActivity.notImplemented("Opening room preview")
+            }
+            else                                   -> {
+                Snackbar.make(publicRoomsCoordinator, getString(R.string.please_wait), Snackbar.LENGTH_SHORT)
+                        .show()
+            }
+        }
    }

    override fun onPublicRoomJoin(publicRoom: PublicRoom) {
--- a/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerController.kt
+++ b/vector/src/main/java/im/vector/riotredesign/features/roomdirectory/picker/RoomDirectoryPickerController.kt
@ -88,7 +88,7 @@ class RoomDirectoryPickerController(private val stringProvider: StringProvider,
    }

    interface Callback {
-        fun onRoomDirectoryClicked(roomDirectory: RoomDirectoryData)
+        fun onRoomDirectoryClicked(roomDirectoryData: RoomDirectoryData)
        fun retry()
    }