Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
72430ee3
Commit
72430ee3
authored
Mar 05, 2018
by
Leonardo Aramaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert erroneous refactoring
parent
71809156
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
5 deletions
+4
-5
ChatRoomPresenter.kt
...rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+1
-2
fragment_authentication_sign_up.xml
app/src/main/res/layout/fragment_authentication_sign_up.xml
+2
-2
fragment_profile.xml
app/src/main/res/layout/fragment_profile.xml
+1
-1
No files found.
app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
View file @
72430ee3
...
...
@@ -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
...
...
app/src/main/res/layout/fragment_authentication_sign_up.xml
View file @
72430ee3
...
...
@@ -16,7 +16,7 @@
app:layout_constraintTop_toTopOf=
"parent"
/>
<EditText
android:id=
"@+id/text_
user
name"
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_
user
name"
/>
app:layout_constraintTop_toBottomOf=
"@+id/text_name"
/>
<EditText
android:id=
"@+id/text_password"
...
...
app/src/main/res/layout/fragment_profile.xml
View file @
72430ee3
...
...
@@ -24,7 +24,7 @@
android:layout_marginTop=
"32dp"
/>
<EditText
android:id=
"@+id/text_
user
name"
android:id=
"@+id/text_name"
style=
"@style/Profile.EditText"
android:layout_marginTop=
"32dp"
android:drawableStart=
"@drawable/ic_person_black_24dp"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment