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
be7e816a
Commit
be7e816a
authored
Dec 06, 2018
by
Filipe de Lima Brito
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updates material library version.
parent
da111591
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
13 deletions
+15
-13
RoomViewHolder.kt
...a/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt
+14
-12
dependencies.gradle
dependencies.gradle
+1
-1
No files found.
app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt
View file @
be7e816a
...
@@ -10,7 +10,6 @@ import chat.rocket.android.R
...
@@ -10,7 +10,6 @@ import chat.rocket.android.R
import
chat.rocket.android.chatrooms.adapter.model.RoomUiModel
import
chat.rocket.android.chatrooms.adapter.model.RoomUiModel
import
chat.rocket.common.model.RoomType
import
chat.rocket.common.model.RoomType
import
chat.rocket.common.model.UserStatus
import
chat.rocket.common.model.UserStatus
import
chat.rocket.common.util.ifNull
import
kotlinx.android.synthetic.main.item_chat.view.*
import
kotlinx.android.synthetic.main.item_chat.view.*
import
kotlinx.android.synthetic.main.unread_messages_badge.view.*
import
kotlinx.android.synthetic.main.unread_messages_badge.view.*
...
@@ -57,17 +56,20 @@ class RoomViewHolder(itemView: View, private val listener: (RoomUiModel) -> Unit
...
@@ -57,17 +56,20 @@ class RoomViewHolder(itemView: View, private val listener: (RoomUiModel) -> Unit
text_total_unread_messages
.
isInvisible
=
true
text_total_unread_messages
.
isInvisible
=
true
}
}
if
(
room
.
alert
||
room
.
unread
!=
null
)
{
context
?.
let
{
text_timestamp
.
setTextAppearance
(
if
(
room
.
alert
||
room
.
unread
!=
null
)
{
context
,
text_timestamp
.
setTextAppearance
(
it
,
R
.
style
.
ChatList_Timestamp_Unread_TextView
)
R
.
style
.
ChatList_Timestamp_Unread_TextView
text_last_message
.
setTextAppearance
(
)
it
,
text_last_message
.
setTextAppearance
(
R
.
style
.
ChatList_LastMessage_Unread_TextView
context
,
)
R
.
style
.
ChatList_LastMessage_Unread_TextView
text_total_unread_messages
.
text
=
"!"
)
text_total_unread_messages
.
isVisible
=
true
text_total_unread_messages
.
text
=
"!"
}
else
{
text_total_unread_messages
.
isVisible
=
true
text_timestamp
.
setTextAppearance
(
it
,
R
.
style
.
ChatList_Timestamp_TextView
)
text_last_message
.
setTextAppearance
(
it
,
R
.
style
.
ChatList_LastMessage_TextView
)
text_total_unread_messages
.
isInvisible
=
true
}
}
}
setOnClickListener
{
listener
(
room
)
}
setOnClickListener
{
listener
(
room
)
}
...
...
dependencies.gradle
View file @
be7e816a
...
@@ -26,7 +26,7 @@ ext {
...
@@ -26,7 +26,7 @@ ext {
playServices
:
'16.0.0'
,
playServices
:
'16.0.0'
,
exoPlayer
:
'2.8.2'
,
exoPlayer
:
'2.8.2'
,
flexbox
:
'1.1.0'
,
flexbox
:
'1.1.0'
,
material
:
'1.0.0
-beta01
'
,
material
:
'1.0.0'
,
room
:
'2.0.0'
,
room
:
'2.0.0'
,
lifecycle
:
'2.0.0'
,
lifecycle
:
'2.0.0'
,
...
...
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