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
346869c4
Commit
346869c4
authored
Sep 29, 2017
by
Lucio Maciel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Always mutate ic_user_status_black_24dp drawable, so it don't end up in the wrong state
parent
7cb358cc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
RoomMemberListAdapter.kt
...droid/layouthelper/chatroom/list/RoomMemberListAdapter.kt
+1
-1
RoomToolbar.java
...src/main/java/chat/rocket/android/widget/RoomToolbar.java
+1
-1
No files found.
app/src/main/java/chat/rocket/android/layouthelper/chatroom/list/RoomMemberListAdapter.kt
View file @
346869c4
...
...
@@ -31,7 +31,7 @@ class RoomMemberListAdapter(private var dataSet: List<User>, private val hostnam
holder
.
name
.
text
=
user
.
name
val
userStatusDrawable
:
Drawable
?
=
VectorDrawableCompat
.
create
(
context
.
resources
,
chat
.
rocket
.
android
.
widget
.
R
.
drawable
.
ic_user_status_black_24dp
,
null
)
val
userStatusDrawable
:
Drawable
?
=
VectorDrawableCompat
.
create
(
context
.
resources
,
chat
.
rocket
.
android
.
widget
.
R
.
drawable
.
ic_user_status_black_24dp
,
null
)
?.
mutate
()
DrawableHelper
.
wrapDrawable
(
userStatusDrawable
)
when
(
user
.
status
)
{
User
.
STATUS_ONLINE
->
DrawableHelper
.
tintDrawable
(
userStatusDrawable
,
context
,
chat
.
rocket
.
android
.
widget
.
R
.
color
.
color_user_status_online
)
...
...
rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/RoomToolbar.java
View file @
346869c4
...
...
@@ -65,7 +65,7 @@ public class RoomToolbar extends Toolbar {
privateChannelDrawable
=
VectorDrawableCompat
.
create
(
getResources
(),
R
.
drawable
.
ic_lock_white_24dp
,
null
);
publicChannelDrawable
=
VectorDrawableCompat
.
create
(
getResources
(),
R
.
drawable
.
ic_hashtag_white_24dp
,
null
);
livechatChannelDrawable
=
VectorDrawableCompat
.
create
(
getResources
(),
R
.
drawable
.
ic_livechat_white_24dp
,
null
);
userStatusDrawable
=
VectorDrawableCompat
.
create
(
getResources
(),
R
.
drawable
.
ic_user_status_black_24dp
,
null
);
userStatusDrawable
=
VectorDrawableCompat
.
create
(
getResources
(),
R
.
drawable
.
ic_user_status_black_24dp
,
null
)
.
mutate
()
;
}
private
void
setNavigationIcon
(
Context
context
)
{
...
...
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