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
5f6c73b6
Commit
5f6c73b6
authored
Sep 29, 2017
by
Lucio Maciel
Committed by
GitHub
Sep 29, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into fix-keyboard-hidden-again
parents
23b09085
7cb358cc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
RoomListItemView.kt
...a/chat/rocket/android/widget/internal/RoomListItemView.kt
+2
-4
No files found.
rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/internal/RoomListItemView.kt
View file @
5f6c73b6
...
...
@@ -9,8 +9,6 @@ import android.support.graphics.drawable.VectorDrawableCompat
import
android.util.AttributeSet
import
android.view.View
import
android.widget.FrameLayout
import
android.widget.LinearLayout
import
chat.rocket.android.widget.R
import
chat.rocket.android.widget.helper.DrawableHelper
import
kotlinx.android.synthetic.main.room_list_item.view.*
...
...
@@ -23,7 +21,7 @@ class RoomListItemView : FrameLayout {
private
val
privateChannelDrawable
:
Drawable
?
=
VectorDrawableCompat
.
create
(
resources
,
R
.
drawable
.
ic_lock_white_24dp
,
null
)
private
val
publicChannelDrawable
:
Drawable
?
=
VectorDrawableCompat
.
create
(
resources
,
R
.
drawable
.
ic_hashtag_white_24dp
,
null
)
private
val
liveChatChannelDrawable
:
Drawable
?
=
VectorDrawableCompat
.
create
(
resources
,
R
.
drawable
.
ic_livechat_white_24dp
,
null
)
private
val
userStatusDrawable
:
Drawable
?
=
VectorDrawableCompat
.
create
(
resources
,
R
.
drawable
.
ic_user_status_black_24dp
,
null
)
private
val
userStatusDrawable
:
Drawable
?
=
VectorDrawableCompat
.
create
(
resources
,
R
.
drawable
.
ic_user_status_black_24dp
,
null
)
?.
mutate
()
constructor
(
context
:
Context
)
:
super
(
context
)
{
initialize
(
context
)
...
...
@@ -43,7 +41,7 @@ class RoomListItemView : FrameLayout {
}
private
fun
initialize
(
context
:
Context
)
{
layoutParams
=
Linear
Layout
.
LayoutParams
(
FrameLayout
.
LayoutParams
.
MATCH_PARENT
,
FrameLayout
.
LayoutParams
.
WRAP_CONTENT
)
layoutParams
=
Frame
Layout
.
LayoutParams
(
FrameLayout
.
LayoutParams
.
MATCH_PARENT
,
FrameLayout
.
LayoutParams
.
WRAP_CONTENT
)
val
array
=
context
.
theme
...
...
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