mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-26 11:26:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

Rename to avoid collision with Matrix Spaces

Browse source
This commit is contained in:
Benoit Marty 2021-05-27 16:55:40 +02:00
parent e925d29037
commit f559ae1b35
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
vector/src/main/java/im/vector/app/core/ui/list/GenericSpaceItem.kt → vector/src/main/java/im/vector/app/core/ui/list/VerticalMarginItem.kt
View file

@ -26,8 +26,8 @@ import im.vector.app.core.epoxy.VectorEpoxyModel
/**
* A generic item with empty space.
*/
@EpoxyModelClass(layout = R.layout.item_generic_space)
abstract class GenericSpaceItem : VectorEpoxyModel<GenericSpaceItem.Holder>() {
@EpoxyModelClass(layout = R.layout.item_vertical_margin)
abstract class VerticalMarginItem : VectorEpoxyModel<VerticalMarginItem.Holder>() {
@EpoxyAttribute
var heightInPx: Int = 0
@ -40,6 +40,6 @@ abstract class GenericSpaceItem : VectorEpoxyModel<GenericSpaceItem.Holder>() {
}
class Holder : VectorEpoxyHolder() {
val space by bind<View>(R.id.item_generic_space)
val space by bind<View>(R.id.item_vertical_margin_space)
}
}

8
vector/src/main/java/im/vector/app/features/roomdirectory/picker/RoomDirectoryPickerController.kt
View file

@ -36,7 +36,7 @@ import im.vector.app.core.extensions.join
import im.vector.app.core.resources.ColorProvider
import im.vector.app.core.resources.StringProvider
import im.vector.app.core.ui.list.genericButtonItem
import im.vector.app.core.ui.list.genericSpaceItem
import im.vector.app.core.ui.list.verticalMarginItem
import im.vector.app.core.utils.DimensionConverter
import im.vector.app.features.discovery.settingsContinueCancelItem
import im.vector.app.features.discovery.settingsInformationItem
@ -69,7 +69,7 @@ class RoomDirectoryPickerController @Inject constructor(
between = { idx, _ -> buildDivider(idx) }
)
buildForm(data)
genericSpaceItem {
verticalMarginItem {
id("space_bottom")
heightInPx(host.dimensionConverter.dpToPx(16))
}
@ -93,7 +93,7 @@ class RoomDirectoryPickerController @Inject constructor(
buildDivider(1000)
val host = this
if (data.inEditMode) {
genericSpaceItem {
verticalMarginItem {
id("form_space")
heightInPx(host.dimensionConverter.dpToPx(16))
}
@ -102,7 +102,7 @@ class RoomDirectoryPickerController @Inject constructor(
message(host.stringProvider.getString(R.string.directory_add_a_new_server_prompt))
colorProvider(host.colorProvider)
}
genericSpaceItem {
verticalMarginItem {
id("form_space_2")
heightInPx(host.dimensionConverter.dpToPx(8))
}

2
vector/src/main/res/layout/item_generic_space.xml → vector/src/main/res/layout/item_vertical_margin.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Space xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/item_generic_space"
android:id="@+id/item_vertical_margin_space"
android:layout_width="match_parent"
android:layout_height="@dimen/layout_vertical_margin" />