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
b659f8c8
Commit
b659f8c8
authored
Jan 27, 2017
by
Tiago Cunha
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PR based feedback
parent
dfec623b
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
16 additions
and
16 deletions
+16
-16
SidebarMainFragment.java
.../rocket/android/fragment/sidebar/SidebarMainFragment.java
+1
-1
Avatar.java
app/src/main/java/chat/rocket/android/helper/Avatar.java
+1
-1
AbstractMessageViewHolder.java
...roid/layouthelper/chatroom/AbstractMessageViewHolder.java
+1
-1
RoomUserViewHolder.java
...roid/layouthelper/chatroom/dialog/RoomUserViewHolder.java
+1
-1
SuggestUserAdapter.java
...droid/layouthelper/sidebar/dialog/SuggestUserAdapter.java
+1
-1
MessageRenderer.java
...in/java/chat/rocket/android/renderer/MessageRenderer.java
+1
-1
UserRenderer.java
.../main/java/chat/rocket/android/renderer/UserRenderer.java
+1
-1
fragment_sidebar_main.xml
app/src/main/res/layout/fragment_sidebar_main.xml
+1
-1
list_item_normal_message.xml
app/src/main/res/layout/list_item_normal_message.xml
+1
-1
list_item_system_message.xml
app/src/main/res/layout/list_item_system_message.xml
+1
-1
listitem_room_user.xml
app/src/main/res/layout/listitem_room_user.xml
+1
-1
RocketChatAvatar.java
...ain/java/chat/rocket/android/widget/RocketChatAvatar.java
+1
-1
message_inline_attachment.xml
...widgets/src/main/res/layout/message_inline_attachment.xml
+2
-2
message_inline_image.xml
...roid-widgets/src/main/res/layout/message_inline_image.xml
+2
-2
No files found.
app/src/main/java/chat/rocket/android/fragment/sidebar/SidebarMainFragment.java
View file @
b659f8c8
...
...
@@ -28,7 +28,7 @@ import chat.rocket.android.realm_helper.RealmListObserver;
import
chat.rocket.android.realm_helper.RealmObjectObserver
;
import
chat.rocket.android.realm_helper.RealmStore
;
import
chat.rocket.android.renderer.UserRenderer
;
import
chat.rocket.android.widget.
message.
RocketChatAvatar
;
import
chat.rocket.android.widget.RocketChatAvatar
;
public
class
SidebarMainFragment
extends
AbstractFragment
{
...
...
app/src/main/java/chat/rocket/android/helper/Avatar.java
View file @
b659f8c8
...
...
@@ -11,7 +11,7 @@ import com.amulyakhare.textdrawable.TextDrawable;
import
java.io.UnsupportedEncodingException
;
import
java.net.URLEncoder
;
import
chat.rocket.android.log.RCLog
;
import
chat.rocket.android.widget.
message.
RocketChatAvatar
;
import
chat.rocket.android.widget.RocketChatAvatar
;
/**
* Helper for rendering user avatar image.
...
...
app/src/main/java/chat/rocket/android/layouthelper/chatroom/AbstractMessageViewHolder.java
View file @
b659f8c8
...
...
@@ -9,7 +9,7 @@ import chat.rocket.android.helper.DateTime;
import
chat.rocket.android.helper.TextUtils
;
import
chat.rocket.android.model.SyncState
;
import
chat.rocket.android.realm_helper.RealmModelViewHolder
;
import
chat.rocket.android.widget.
message.
RocketChatAvatar
;
import
chat.rocket.android.widget.RocketChatAvatar
;
public
abstract
class
AbstractMessageViewHolder
extends
RealmModelViewHolder
<
PairedMessage
>
{
protected
final
RocketChatAvatar
avatar
;
...
...
app/src/main/java/chat/rocket/android/layouthelper/chatroom/dialog/RoomUserViewHolder.java
View file @
b659f8c8
...
...
@@ -6,7 +6,7 @@ import android.widget.ImageView;
import
android.widget.TextView
;
import
chat.rocket.android.R
;
import
chat.rocket.android.widget.
message.
RocketChatAvatar
;
import
chat.rocket.android.widget.RocketChatAvatar
;
/**
* ViewHolder for UsersOfRoom.
...
...
app/src/main/java/chat/rocket/android/layouthelper/sidebar/dialog/SuggestUserAdapter.java
View file @
b659f8c8
...
...
@@ -10,7 +10,7 @@ import chat.rocket.android.R;
import
chat.rocket.android.model.ddp.User
;
import
chat.rocket.android.realm_helper.RealmAutoCompleteAdapter
;
import
chat.rocket.android.renderer.UserRenderer
;
import
chat.rocket.android.widget.
message.
RocketChatAvatar
;
import
chat.rocket.android.widget.RocketChatAvatar
;
/**
* adapter to suggest user names.
...
...
app/src/main/java/chat/rocket/android/renderer/MessageRenderer.java
View file @
b659f8c8
...
...
@@ -12,7 +12,7 @@ import chat.rocket.android.helper.TextUtils;
import
chat.rocket.android.model.SyncState
;
import
chat.rocket.android.model.ddp.Message
;
import
chat.rocket.android.model.ddp.User
;
import
chat.rocket.android.widget.
message.
RocketChatAvatar
;
import
chat.rocket.android.widget.RocketChatAvatar
;
import
chat.rocket.android.widget.message.RocketChatMessageAttachmentsLayout
;
import
chat.rocket.android.widget.message.RocketChatMessageLayout
;
import
chat.rocket.android.widget.message.RocketChatMessageUrlsLayout
;
...
...
app/src/main/java/chat/rocket/android/renderer/UserRenderer.java
View file @
b659f8c8
...
...
@@ -8,7 +8,7 @@ import chat.rocket.android.R;
import
chat.rocket.android.helper.Avatar
;
import
chat.rocket.android.helper.TextUtils
;
import
chat.rocket.android.model.ddp.User
;
import
chat.rocket.android.widget.
message.
RocketChatAvatar
;
import
chat.rocket.android.widget.RocketChatAvatar
;
/**
* Renderer for User model.
...
...
app/src/main/res/layout/fragment_sidebar_main.xml
View file @
b659f8c8
...
...
@@ -30,7 +30,7 @@
android:layout_width=
"@dimen/margin_8"
android:layout_height=
"wrap_content"
/>
<chat.rocket.android.widget.
message.
RocketChatAvatar
<chat.rocket.android.widget.RocketChatAvatar
android:id=
"@+id/current_user_avatar"
android:layout_width=
"40dp"
android:layout_height=
"40dp"
/>
...
...
app/src/main/res/layout/list_item_normal_message.xml
View file @
b659f8c8
...
...
@@ -13,7 +13,7 @@
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"2dp"
>
<chat.rocket.android.widget.
message.
RocketChatAvatar
<chat.rocket.android.widget.RocketChatAvatar
android:id=
"@+id/user_avatar"
android:layout_width=
"32dp"
android:layout_height=
"32dp"
...
...
app/src/main/res/layout/list_item_system_message.xml
View file @
b659f8c8
...
...
@@ -12,7 +12,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
<chat.rocket.android.widget.
message.
RocketChatAvatar
<chat.rocket.android.widget.RocketChatAvatar
android:id=
"@+id/user_avatar"
android:layout_width=
"32dp"
android:layout_height=
"32dp"
...
...
app/src/main/res/layout/listitem_room_user.xml
View file @
b659f8c8
...
...
@@ -11,7 +11,7 @@
android:layout_height=
"8dp"
android:layout_margin=
"@dimen/margin_8"
/>
<chat.rocket.android.widget.
message.
RocketChatAvatar
<chat.rocket.android.widget.RocketChatAvatar
android:id=
"@+id/room_user_avatar"
android:layout_width=
"24dp"
android:layout_height=
"24dp"
/>
...
...
rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/
message/
RocketChatAvatar.java
→
rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/RocketChatAvatar.java
View file @
b659f8c8
package
chat
.
rocket
.
android
.
widget
.
message
;
package
chat
.
rocket
.
android
.
widget
;
import
android.annotation.TargetApi
;
import
android.content.Context
;
...
...
rocket-chat-android-widgets/src/main/res/layout/message_inline_attachment.xml
View file @
b659f8c8
...
...
@@ -99,9 +99,9 @@
<com.facebook.drawee.view.SimpleDraweeView
android:id=
"@+id/image"
android:layout_width=
"match_parent"
android:layout_height=
"
20
0dp"
android:layout_height=
"
15
0dp"
android:layout_marginBottom=
"8dp"
fresco:actualImageScaleType=
"fit
Center
"
/>
fresco:actualImageScaleType=
"fit
Start
"
/>
<!-- audio -->
<!-- video -->
...
...
rocket-chat-android-widgets/src/main/res/layout/message_inline_image.xml
View file @
b659f8c8
...
...
@@ -9,6 +9,6 @@
<com.facebook.drawee.view.SimpleDraweeView
android:id=
"@+id/message_inline_image"
android:layout_width=
"match_parent"
android:layout_height=
"
20
0dp"
fresco:actualImageScaleType=
"fit
Center
"
/>
android:layout_height=
"
15
0dp"
fresco:actualImageScaleType=
"fit
Start
"
/>
</FrameLayout>
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