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
5e6ad5c8
Commit
5e6ad5c8
authored
Jul 01, 2017
by
Filipe de Lima Brito
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename attrs
parent
7863cc5b
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
61 additions
and
63 deletions
+61
-63
RoomFragment.java
...a/chat/rocket/android/fragment/chatroom/RoomFragment.java
+48
-50
OnBackPressListener.java
.../java/chat/rocket/android/helper/OnBackPressListener.java
+1
-1
MessageRenderer.java
...in/java/chat/rocket/android/renderer/MessageRenderer.java
+1
-2
NewMessageObserver.java
...t/rocket/android/service/observer/NewMessageObserver.java
+1
-2
fragment_room_main.xml
app/src/main/res/layout/fragment_room_main.xml
+10
-8
No files found.
app/src/main/java/chat/rocket/android/fragment/chatroom/RoomFragment.java
View file @
5e6ad5c8
This diff is collapsed.
Click to expand it.
app/src/main/java/chat/rocket/android/helper/OnBackPressListener.java
View file @
5e6ad5c8
...
...
@@ -10,4 +10,4 @@ public interface OnBackPressListener {
* @return whether back is handled or not.
*/
boolean
onBackPressed
();
}
}
\ No newline at end of file
app/src/main/java/chat/rocket/android/renderer/MessageRenderer.java
View file @
5e6ad5c8
...
...
@@ -40,8 +40,7 @@ public class MessageRenderer extends AbstractRenderer<Message> {
*/
public
MessageRenderer
avatarInto
(
RocketChatAvatar
rocketChatAvatar
,
AbsoluteUrl
absoluteUrl
)
{
if
(
object
.
getSyncState
()
==
SyncState
.
FAILED
)
{
rocketChatAvatar
.
loadImage
(
VectorDrawableCompat
.
create
(
context
.
getResources
(),
R
.
drawable
.
ic_error_outline_black_24dp
,
null
));
rocketChatAvatar
.
loadImage
(
VectorDrawableCompat
.
create
(
context
.
getResources
(),
R
.
drawable
.
ic_error_outline_black_24dp
,
null
));
}
else
if
(
TextUtils
.
isEmpty
(
object
.
getAvatar
()))
{
userRenderer
.
avatarInto
(
rocketChatAvatar
,
absoluteUrl
);
}
else
{
...
...
app/src/main/java/chat/rocket/android/service/observer/NewMessageObserver.java
View file @
5e6ad5c8
...
...
@@ -21,8 +21,7 @@ public class NewMessageObserver extends AbstractModelObserver<RealmMessage> {
private
final
MethodCallHelper
methodCall
;
public
NewMessageObserver
(
Context
context
,
String
hostname
,
RealmHelper
realmHelper
,
DDPClientRef
ddpClientRef
)
{
public
NewMessageObserver
(
Context
context
,
String
hostname
,
RealmHelper
realmHelper
,
DDPClientRef
ddpClientRef
)
{
super
(
context
,
hostname
,
realmHelper
,
ddpClientRef
);
methodCall
=
new
MethodCallHelper
(
realmHelper
,
ddpClientRef
);
...
...
app/src/main/res/layout/fragment_room_main.xml
View file @
5e6ad5c8
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:id=
"@+id/message_list_root"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
xmlns:tools=
"http://schemas.android.com/tools"
android:id=
"@+id/messageListRelativeLayout"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
tools:context=
"chat.rocket.android.fragment.chatroom.RoomFragment"
>
<android.support.v7.widget.RecyclerView
android:id=
"@+id/
recyclerv
iew"
android:id=
"@+id/
messageRecyclerV
iew"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_above=
"@+id/message
_c
omposer"
/>
android:layout_above=
"@+id/message
C
omposer"
/>
<chat.rocket.android.widget.message.MessageFormLayout
android:id=
"@+id/message
_c
omposer"
android:id=
"@+id/message
C
omposer"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:
theme=
"@style/Theme.AppCompat.Light
"
android:
layout_alignParentBottom=
"true
"
/>
android:
layout_alignParentBottom=
"true
"
android:
theme=
"@style/Theme.AppCompat.Light
"
/>
</RelativeLayout>
\ 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