From 5cbb1d99c7c657f8801c777dbed5e137fa7dc97c Mon Sep 17 00:00:00 2001 From: Valere Date: Mon, 10 Jan 2022 17:38:35 +0100 Subject: [PATCH] Code review --- .../features/roomdirectory/createroom/CreateRoomActivity.kt | 6 +++++- .../roomdirectory/createroom/CreateRoomViewModel.kt | 6 +++--- .../im/vector/app/features/spaces/SpaceExploreActivity.kt | 6 ++---- .../app/features/spaces/explore/SpaceDirectoryViewModel.kt | 4 ++-- vector/src/main/res/layout/fragment_space_directory.xml | 4 +--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt index 058bd97fbd..88bead5244 100644 --- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt @@ -83,7 +83,7 @@ class CreateRoomActivity : VectorBaseActivity(), ToolbarC companion object { - const val RESULT_CREATED_ROOM_ID = "RESULT_CREATED_ROOM_ID" + private const val RESULT_CREATED_ROOM_ID = "RESULT_CREATED_ROOM_ID" fun getIntent(context: Context, initialName: String = "", @@ -99,5 +99,9 @@ class CreateRoomActivity : VectorBaseActivity(), ToolbarC )) } } + + fun getCreatedRoomId(data: Intent?): String? { + return data?.extras?.getString(RESULT_CREATED_ROOM_ID) + } } } diff --git a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt index 34f51b92a8..cd2bcd9924 100644 --- a/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewModel.kt @@ -25,9 +25,9 @@ import com.airbnb.mvrx.Uninitialized import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject +import im.vector.app.AppStateHandler import im.vector.app.core.di.MavericksAssistedViewModelFactory import im.vector.app.core.di.hiltMavericksViewModelFactory -import im.vector.app.AppStateHandler import im.vector.app.core.extensions.exhaustive import im.vector.app.core.platform.VectorViewModel import im.vector.app.features.raw.wellknown.getElementWellknown @@ -53,10 +53,10 @@ import org.matrix.android.sdk.api.session.room.model.create.CreateRoomPreset import org.matrix.android.sdk.api.session.room.model.create.RestrictedRoomPreset import timber.log.Timber -class CreateRoomViewModel @AssistedInject constructor(@Assisted val initialState: CreateRoomViewState, +class CreateRoomViewModel @AssistedInject constructor(@Assisted private val initialState: CreateRoomViewState, private val session: Session, private val rawService: RawService, - private val vectorPreferences: VectorPreferences, + vectorPreferences: VectorPreferences, appStateHandler: AppStateHandler ) : VectorViewModel(initialState) { diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt index ead1736d3c..f4610805bc 100644 --- a/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt +++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceExploreActivity.kt @@ -26,17 +26,15 @@ import com.airbnb.mvrx.Mavericks import com.airbnb.mvrx.viewModel import dagger.hilt.android.AndroidEntryPoint import im.vector.app.R -import im.vector.app.core.extensions.commitTransaction import im.vector.app.core.extensions.registerStartForActivityResult import im.vector.app.core.extensions.replaceFragment import im.vector.app.core.platform.VectorBaseActivity import im.vector.app.databinding.ActivitySimpleBinding import im.vector.app.features.matrixto.MatrixToBottomSheet -import im.vector.app.features.roomdirectory.createroom.CreateRoomActivity import im.vector.app.features.navigation.Navigator +import im.vector.app.features.roomdirectory.createroom.CreateRoomActivity import im.vector.app.features.spaces.explore.SpaceDirectoryArgs import im.vector.app.features.spaces.explore.SpaceDirectoryFragment -import im.vector.app.features.spaces.explore.SpaceDirectoryState import im.vector.app.features.spaces.explore.SpaceDirectoryViewAction import im.vector.app.features.spaces.explore.SpaceDirectoryViewEvents import im.vector.app.features.spaces.explore.SpaceDirectoryViewModel @@ -52,7 +50,7 @@ class SpaceExploreActivity : VectorBaseActivity(), Matrix private val createRoomResultLauncher = registerStartForActivityResult { activityResult -> if (activityResult.resultCode == Activity.RESULT_OK) { - activityResult.data?.extras?.getString(CreateRoomActivity.RESULT_CREATED_ROOM_ID)?.let { + CreateRoomActivity.getCreatedRoomId(activityResult.data)?.let { // we want to refresh from API sharedViewModel.handle(SpaceDirectoryViewAction.RefreshUntilFound(it)) } diff --git a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt index 0b357a900b..abc70ccbc1 100644 --- a/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/spaces/explore/SpaceDirectoryViewModel.kt @@ -273,8 +273,8 @@ class SpaceDirectoryViewModel @AssistedInject constructor( ) knownSummaries = ( - knownSummaries - + (paginate.children.mapNotNull { + knownSummaries + + (paginate.children.mapNotNull { session.getRoomSummary(it.childRoomId) ?.takeIf { it.membership == Membership.JOIN } // only take if joined because it will be up to date (synced) }) diff --git a/vector/src/main/res/layout/fragment_space_directory.xml b/vector/src/main/res/layout/fragment_space_directory.xml index c638ce25bd..bc77bb1474 100644 --- a/vector/src/main/res/layout/fragment_space_directory.xml +++ b/vector/src/main/res/layout/fragment_space_directory.xml @@ -60,9 +60,7 @@ android:layout_marginBottom="16dp " android:contentDescription="@string/a11y_create_room" android:scaleType="center" - app:maxImageSize="20dp" android:src="@drawable/ic_fab_add" - android:visibility="visible" - tools:visibility="visible" /> + app:maxImageSize="20dp" /> \ No newline at end of file