Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-28 15:38:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Default Rooms Handling

Browse Source
This commit is contained in:
Valere 2021-02-25 18:50:49 +01:00
parent a901e1d179
commit 2952dca3a3
4 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
View File

@ -57,6 +57,9 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
@EpoxyAttribute
var imeOptions: Int? = null
@EpoxyAttribute
var endIconMode: Int? = null
@EpoxyAttribute
var onTextChange: ((String) -> Unit)? = null
@ -72,6 +75,10 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
holder.textInputLayout.hint = hint
holder.textInputLayout.error = errorMessage
endIconMode?.let { mode ->
holder.textInputLayout.endIconMode = mode
}
// Update only if text is different and value is not null
holder.textInputEditText.setTextSafe(value)
holder.textInputEditText.isEnabled = enabled

5
vector/src/main/java/im/vector/app/features/spaces/create/CreateSpaceViewModel.kt
View File

@ -111,7 +111,10 @@ class CreateSpaceViewModel @AssistedInject constructor(
override fun initialState(viewModelContext: ViewModelContext): CreateSpaceState? {
return CreateSpaceState(
defaultRooms = mapOf(0 to viewModelContext.activity.getString(R.string.create_spaces_default_public_room_name))
defaultRooms = mapOf(
0 to viewModelContext.activity.getString(R.string.create_spaces_default_public_room_name),
1 to viewModelContext.activity.getString(R.string.create_spaces_default_public_random_room_name)
)
)
}
}

4
vector/src/main/java/im/vector/app/features/spaces/create/SpaceDefaultRoomEpoxyController.kt
View File

@ -17,6 +17,7 @@
package im.vector.app.features.spaces.create
import com.airbnb.epoxy.TypedEpoxyController
import com.google.android.material.textfield.TextInputLayout
import im.vector.app.R
import im.vector.app.core.resources.ColorProvider
import im.vector.app.core.resources.StringProvider
@ -51,6 +52,7 @@ class SpaceDefaultRoomEpoxyController @Inject constructor(
enabled(true)
value(data?.defaultRooms?.get(0))
hint(stringProvider.getString(R.string.create_room_name_section))
endIconMode(TextInputLayout.END_ICON_CLEAR_TEXT)
showBottomSeparator(false)
onTextChange { text ->
listener?.onNameChange(0, text)
@ -62,6 +64,7 @@ class SpaceDefaultRoomEpoxyController @Inject constructor(
enabled(true)
value(data?.defaultRooms?.get(1))
hint(stringProvider.getString(R.string.create_room_name_section))
endIconMode(TextInputLayout.END_ICON_CLEAR_TEXT)
showBottomSeparator(false)
onTextChange { text ->
listener?.onNameChange(1, text)
@ -73,6 +76,7 @@ class SpaceDefaultRoomEpoxyController @Inject constructor(
enabled(true)
value(data?.defaultRooms?.get(2))
hint(stringProvider.getString(R.string.create_room_name_section))
endIconMode(TextInputLayout.END_ICON_CLEAR_TEXT)
showBottomSeparator(false)
onTextChange { text ->
listener?.onNameChange(2, text)

1
vector/src/main/res/values/strings.xml
View File

@ -3276,6 +3276,7 @@
<string name="create_spaces_room_public_header">What are some discussions you want to have in Runner’s World?</string>
<string name="create_spaces_room_public_header_desc">We’ll create rooms for them, and auto-join everyone. You can add more later too.</string>
<string name="create_spaces_default_public_room_name">General</string>
<string name="create_spaces_default_public_random_room_name">Random</string>
<string name="create_spaces_loading_message">Creating Space…</string>
<string name="invite_people_to_your_space">Invite people to your space</string>
<string name="invite_people_to_your_space_desc">It’s just you at the moment. %s will be even better with others.</string>