filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code review

This commit is contained in:
Valere 2021-09-17 14:26:25 +02:00
parent 6d023188da
commit d2af7e3f91
11 changed files with 28 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.d/3752.feature
View File

@ -1 +1 @@
Better expose adding spaces as Subspaces #3752
Better expose adding spaces as Subspaces

5
vector/src/main/java/im/vector/app/AppStateHandler.kt
View File

@ -67,11 +67,10 @@ class AppStateHandler @Inject constructor(
return selectedSpaceDataSource.currentValue?.orNull()?.let {
if (it is RoomGroupingMethod.BySpace) {
// try to refresh sum?
return it.spaceSummary?.roomId?.let { activeSessionHolder.getSafeActiveSession()?.getRoomSummary(it) }?.let {
it.spaceSummary?.roomId?.let { activeSessionHolder.getSafeActiveSession()?.getRoomSummary(it) }?.let {
RoomGroupingMethod.BySpace(it)
} ?: it
}
return it
} else it
}
}

8
vector/src/main/java/im/vector/app/core/extensions/ViewExtensions.kt
View File

@ -16,11 +16,14 @@
package im.vector.app.core.extensions
import android.graphics.drawable.Drawable
import android.text.InputType
import android.view.View
import android.view.ViewGroup
import android.widget.EditText
import android.widget.ImageView
import androidx.appcompat.widget.SearchView
import androidx.core.view.isVisible
import im.vector.app.R
/**
@ -50,3 +53,8 @@ fun View.getMeasurements(): Pair<Int, Int> {
val height = measuredHeight
return width to height
}
fun ImageView.setDrawableOrHide(drawableRes: Drawable?) {
setImageDrawable(drawableRes)
isVisible = drawableRes != null
}

4
vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
View File

@ -26,6 +26,7 @@ import androidx.core.view.isGone
import androidx.core.view.isInvisible
import androidx.core.view.isVisible
import im.vector.app.R
import im.vector.app.core.extensions.setDrawableOrHide
import im.vector.app.core.extensions.setTextOrHide
import im.vector.app.databinding.ViewBottomSheetActionButtonBinding
import im.vector.app.features.themes.ThemeUtils
@ -80,8 +81,7 @@ class BottomSheetActionButton @JvmOverloads constructor(
var rightIcon: Drawable? = null
set(value) {
field = value
views.bottomSheetActionIcon.setImageDrawable(value)
views.bottomSheetActionIcon.isVisible = field != null
views.bottomSheetActionIcon.setDrawableOrHide(value)
}
var tint: Int? = null

2
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomActivity.kt
View File

@ -55,7 +55,7 @@ class CreateRoomActivity : VectorBaseActivity<ActivitySimpleBinding>(), ToolbarC
CreateRoomFragment::class.java,
CreateRoomArgs(
intent?.getStringExtra(INITIAL_NAME) ?: "",
isSubSpace = intent?.getBooleanExtra(IS_SPACE, false) ?: false
isSpace = intent?.getBooleanExtra(IS_SPACE, false) ?: false
)
)
}

10
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomFragment.kt
View File

@ -53,7 +53,7 @@ import javax.inject.Inject
data class CreateRoomArgs(
val initialName: String,
val parentSpaceId: String? = null,
val isSubSpace: Boolean = false
val isSpace: Boolean = false
) : Parcelable
class CreateRoomFragment @Inject constructor(
@ -98,7 +98,7 @@ class CreateRoomFragment @Inject constructor(
override fun onResume() {
super.onResume()
views.createRoomTitle.text = getString(if (args.isSubSpace) R.string.create_new_space else R.string.create_new_room)
views.createRoomTitle.text = getString(if (args.isSpace) R.string.create_new_space else R.string.create_new_room)
}
private fun setupRoomJoinRuleSharedActionViewModel() {
@ -121,7 +121,7 @@ class CreateRoomFragment @Inject constructor(
private fun setupWaitingView() {
views.waitingView.waitingStatusText.isVisible = true
views.waitingView.waitingStatusText.setText(
if (args.isSubSpace) R.string.create_space_in_progress else R.string.create_room_in_progress
if (args.isSpace) R.string.create_space_in_progress else R.string.create_room_in_progress
)
}
@ -133,7 +133,7 @@ class CreateRoomFragment @Inject constructor(
}
private fun setupRecyclerView() {
if (args.isSubSpace) {
if (args.isSpace) {
views.createRoomForm.configureWith(createSpaceController)
createSpaceController.listener = this
} else {
@ -236,7 +236,7 @@ class CreateRoomFragment @Inject constructor(
sharedActionViewModel.post(RoomDirectorySharedAction.Close)
} else {
// Populate list with Epoxy
if (args.isSubSpace) {
if (args.isSpace) {
createSpaceController.setData(state)
} else {
createRoomController.setData(state)

2
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomViewState.kt
View File

@ -44,7 +44,7 @@ data class CreateRoomViewState(
constructor(args: CreateRoomArgs) : this(
roomName = args.initialName,
parentSpaceId = args.parentSpaceId,
isSubSpace = args.isSubSpace
isSubSpace = args.isSpace
)
/**

12
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateSubSpaceController.kt
View File

@ -47,13 +47,11 @@ class CreateSubSpaceController @Inject constructor(
private fun buildForm(data: CreateRoomViewState, enableFormElement: Boolean) {
val host = this
if (data.isSubSpace) {
genericPillItem {
id("beta")
imageRes(R.drawable.ic_beta_pill)
tintIcon(false)
text(host.stringProvider.getString(R.string.space_add_space_to_any_space_you_manage))
}
genericPillItem {
id("beta")
imageRes(R.drawable.ic_beta_pill)
tintIcon(false)
text(host.stringProvider.getString(R.string.space_add_space_to_any_space_you_manage))
}
formEditableSquareAvatarItem {

14
vector/src/main/java/im/vector/app/features/spaces/manage/SpaceAddRoomSpaceChooserBottomSheet.kt
View File

@ -17,27 +17,17 @@
package im.vector.app.features.spaces.manage
import android.os.Bundle
import android.os.Parcelable
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.setFragmentResult
import com.airbnb.mvrx.args
import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
import im.vector.app.databinding.BottomSheetAddRoomsOrSpacesToSpaceBinding
import kotlinx.parcelize.Parcelize
class SpaceAddRoomSpaceChooserBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetAddRoomsOrSpacesToSpaceBinding>() {
@Parcelize
data class Args(
val spaceId: String
) : Parcelable
override val showExpanded = true
private val addSubRoomsArgs: Args by args()
override fun getBinding(inflater: LayoutInflater, container: ViewGroup?) =
BottomSheetAddRoomsOrSpacesToSpaceBinding.inflate(inflater, container, false)
@ -68,9 +58,7 @@ class SpaceAddRoomSpaceChooserBottomSheet : VectorBaseBottomSheetDialogFragment<
fun newInstance(spaceId: String)
: SpaceAddRoomSpaceChooserBottomSheet {
return SpaceAddRoomSpaceChooserBottomSheet().apply {
setArguments(Args(spaceId))
}
return SpaceAddRoomSpaceChooserBottomSheet()
}
}
}

2
vector/src/main/java/im/vector/app/features/spaces/manage/SpaceManageActivity.kt
View File

@ -153,7 +153,7 @@ class SpaceManageActivity : VectorBaseActivity<ActivitySimpleLoadingBinding>(),
addFragmentToBackstack(
R.id.simpleFragmentContainer,
CreateRoomFragment::class.java,
CreateRoomArgs("", parentSpaceId = args?.spaceId, isSubSpace = true)
CreateRoomArgs("", parentSpaceId = args?.spaceId, isSpace = true)
)
}
SpaceManagedSharedViewEvents.NavigateToManageRooms -> {

2
vector/src/main/res/layout/bottom_sheet_add_rooms_or_spaces_to_space.xml
View File

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?colorSurface"
android:background="?android:colorBackground"
android:orientation="vertical">
<TextView