Commit 72430ee3 authored by Leonardo Aramaki's avatar Leonardo Aramaki

Revert erroneous refactoring

parent 71809156
......@@ -437,8 +437,7 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
try {
val chatRooms = getChatRoomsInteractor.get(currentServer)
.filterNot {
it.type.toString() == RoomType.DIRECT_MESSAGE.toString() ||
it.type.toString() == RoomType.DIRECT_MESSAGE.toString()
it.type is RoomType.DirectMessage || it.type is RoomType.Livechat
}
.map { chatRoom ->
val name = chatRoom.name
......
......@@ -16,7 +16,7 @@
app:layout_constraintTop_toTopOf="parent" />
<EditText
android:id="@+id/text_username"
android:id="@+id/text_name"
style="@style/Authentication.EditText"
android:layout_marginTop="32dp"
android:drawableStart="@drawable/ic_person_black_24dp"
......@@ -37,7 +37,7 @@
android:inputType="text"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/text_username" />
app:layout_constraintTop_toBottomOf="@+id/text_name" />
<EditText
android:id="@+id/text_password"
......
......@@ -24,7 +24,7 @@
android:layout_marginTop="32dp" />
<EditText
android:id="@+id/text_username"
android:id="@+id/text_name"
style="@style/Profile.EditText"
android:layout_marginTop="32dp"
android:drawableStart="@drawable/ic_person_black_24dp"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment