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
2631f48b
Commit
2631f48b
authored
Sep 18, 2017
by
Filipe de Lima Brito
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Delete RoomPinnedMessagesAdapter.kt
parent
fd1ff332
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
525 additions
and
576 deletions
+525
-576
RoomFragment.java
...a/chat/rocket/android/fragment/chatroom/RoomFragment.java
+525
-527
RoomPinnedMessagesAdapter.kt
...d/layouthelper/chatroom/list/RoomPinnedMessagesAdapter.kt
+0
-49
No files found.
app/src/main/java/chat/rocket/android/fragment/chatroom/RoomFragment.java
View file @
2631f48b
...
...
@@ -2,6 +2,7 @@ package chat.rocket.android.fragment.chatroom;
import
android.Manifest
;
import
android.app.Activity
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.net.Uri
;
import
android.os.Bundle
;
...
...
@@ -28,6 +29,7 @@ import java.util.List;
import
chat.rocket.android.BackgroundLooper
;
import
chat.rocket.android.R
;
import
chat.rocket.android.activity.MainActivity
;
import
chat.rocket.android.activity.room.RoomActivity
;
import
chat.rocket.android.api.MethodCallHelper
;
import
chat.rocket.android.fragment.chatroom.dialog.FileUploadProgressDialogFragment
;
import
chat.rocket.android.fragment.chatroom.dialog.MessageOptionsDialogFragment
;
...
...
@@ -131,7 +133,8 @@ public class RoomFragment extends AbstractChatRoomFragment implements
private
SlidingPaneLayout
pane
;
private
SidebarMainFragment
sidebarFragment
;
public
RoomFragment
()
{}
public
RoomFragment
()
{
}
/**
* create fragment with roomId.
...
...
@@ -648,17 +651,12 @@ public class RoomFragment extends AbstractChatRoomFragment implements
}
private
void
showRoomListFragment
(
int
actionId
)
{
RoomListFragment
roomListFragment
=
RoomListFragment
.
Companion
.
newInstance
(
actionId
,
roomId
,
roomType
,
hostname
,
token
,
userId
);
MainActivity
activity
=
((
MainActivity
)
getActivity
());
FragmentTransaction
ft
=
activity
.
getSupportFragmentManager
().
beginTransaction
();
ft
.
replace
(
activity
.
getLayoutContainerForFragment
(),
roomListFragment
,
"roomListFragment"
);
ft
.
addToBackStack
(
null
);
ft
.
commit
();
Intent
intent
=
new
Intent
(
getActivity
(),
RoomActivity
.
class
).
putExtra
(
"actionId"
,
actionId
)
.
putExtra
(
"roomId"
,
roomId
)
.
putExtra
(
"roomType"
,
roomType
)
.
putExtra
(
"hostname"
,
hostname
)
.
putExtra
(
"token"
,
token
)
.
putExtra
(
"userId"
,
userId
);
startActivity
(
intent
);
}
}
\ No newline at end of file
app/src/main/java/chat/rocket/android/layouthelper/chatroom/list/RoomPinnedMessagesAdapter.kt
deleted
100644 → 0
View file @
fd1ff332
package
chat.rocket.android.layouthelper.chatroom.list
import
android.support.v7.widget.RecyclerView
import
android.view.LayoutInflater
import
android.view.View
import
android.view.ViewGroup
import
android.widget.TextView
import
chat.rocket.android.R
import
chat.rocket.android.helper.DateTime
import
chat.rocket.android.widget.RocketChatAvatar
import
chat.rocket.android.widget.helper.UserAvatarHelper
import
chat.rocket.android.widget.message.RocketChatMessageLayout
import
chat.rocket.core.models.Message
import
kotlinx.android.synthetic.main.list_item_message_newday.view.*
import
kotlinx.android.synthetic.main.list_item_normal_message.view.*
class
RoomPinnedMessagesAdapter
(
private
val
dataSet
:
List
<
Message
>,
private
val
hostname
:
String
)
:
RecyclerView
.
Adapter
<
RoomPinnedMessagesAdapter
.
ViewHolder
>()
{
override
fun
onCreateViewHolder
(
parent
:
ViewGroup
,
viewType
:
Int
):
ViewHolder
{
val
view
=
LayoutInflater
.
from
(
parent
.
context
).
inflate
(
R
.
layout
.
list_item_normal_message
,
parent
,
false
)
return
ViewHolder
(
view
)
}
override
fun
onBindViewHolder
(
holder
:
ViewHolder
,
position
:
Int
)
{
val
message
=
dataSet
[
position
]
val
username
=
message
.
user
?.
username
if
(
username
!=
null
)
{
val
placeholderDrawable
=
UserAvatarHelper
.
getTextDrawable
(
username
,
holder
.
userAvatar
.
context
)
holder
.
userAvatar
.
loadImage
(
UserAvatarHelper
.
getUri
(
hostname
,
username
),
placeholderDrawable
)
holder
.
usernameText
.
text
=
username
}
else
{
holder
.
userAvatar
.
visibility
=
View
.
GONE
holder
.
usernameText
.
visibility
=
View
.
GONE
}
holder
.
newDayText
.
text
=
DateTime
.
fromEpocMs
(
message
.
timestamp
,
DateTime
.
Format
.
DATE
)
holder
.
messageBody
.
setText
(
message
.
message
)
}
override
fun
getItemCount
():
Int
=
dataSet
.
size
class
ViewHolder
(
itemView
:
View
)
:
RecyclerView
.
ViewHolder
(
itemView
)
{
val
userAvatar
:
RocketChatAvatar
=
itemView
.
user_avatar
val
usernameText
:
TextView
=
itemView
.
username
val
messageBody
:
RocketChatMessageLayout
=
itemView
.
message_body
val
newDayText
:
TextView
=
itemView
.
newday_text
}
}
\ No newline at end of file
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