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
1264e85d
Commit
1264e85d
authored
Oct 14, 2017
by
Filipe de Lima Brito
Committed by
GitHub
Oct 14, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into develop
parents
04b7b502
7d8390a7
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
24 additions
and
15 deletions
+24
-15
FileUploadProgressDialogFragment.java
...ent/chatroom/dialog/FileUploadProgressDialogFragment.java
+11
-9
dependencies.gradle
dependencies.gradle
+2
-2
build.gradle
rocket-chat-android-widgets/build.gradle
+2
-2
RoomToolbar.java
...src/main/java/chat/rocket/android/widget/RoomToolbar.java
+3
-1
AvatarHelper.kt
...in/java/chat/rocket/android/widget/helper/AvatarHelper.kt
+0
-1
FrescoHelper.kt
...in/java/chat/rocket/android/widget/helper/FrescoHelper.kt
+6
-0
No files found.
app/src/main/java/chat/rocket/android/fragment/chatroom/dialog/FileUploadProgressDialogFragment.java
View file @
1264e85d
package
chat
.
rocket
.
android
.
fragment
.
chatroom
.
dialog
;
import
android.app.Dialog
;
import
android.content.DialogInterface
;
import
android.os.Bundle
;
import
android.support.annotation.NonNull
;
import
android.support.annotation.Nullable
;
import
android.widget.ProgressBar
;
import
android.widget.TextView
;
import
android.widget.Toast
;
import
chat.rocket.android.R
;
import
chat.rocket.android.renderer.FileUploadingRenderer
;
import
chat.rocket.core.SyncState
;
import
chat.rocket.persistence.realm.models.internal.FileUploading
;
import
chat.rocket.persistence.realm.RealmObjectObserver
;
import
chat.rocket.
android.renderer.FileUploadingRenderer
;
import
chat.rocket.
persistence.realm.models.internal.FileUploading
;
/**
* dialog fragment to display progress of file uploading.
...
...
@@ -76,11 +75,14 @@ public class FileUploadProgressDialogFragment extends AbstractChatRoomDialogFrag
//TODO: prompt retry.
dismiss
();
}
else
{
new
FileUploadingRenderer
(
getContext
(),
state
)
.
progressInto
((
ProgressBar
)
getDialog
().
findViewById
(
R
.
id
.
progressBar
))
.
progressTextInto
(
(
TextView
)
getDialog
().
findViewById
(
R
.
id
.
txt_filesize_uploaded
),
(
TextView
)
getDialog
().
findViewById
(
R
.
id
.
txt_filesize_total
));
final
Dialog
dialog
=
getDialog
();
if
(
dialog
!=
null
)
{
new
FileUploadingRenderer
(
getContext
(),
state
)
.
progressInto
(
dialog
.
findViewById
(
R
.
id
.
progressBar
))
.
progressTextInto
(
dialog
.
findViewById
(
R
.
id
.
txt_filesize_uploaded
),
dialog
.
findViewById
(
R
.
id
.
txt_filesize_total
));
}
}
}
...
...
dependencies.gradle
View file @
1264e85d
...
...
@@ -16,8 +16,8 @@ ext {
okHTTP
:
"com.squareup.okhttp3:okhttp:3.8.0"
,
rxJava
:
"io.reactivex.rxjava2:rxjava:2.1.0"
,
boltTask
:
"com.parse.bolts:bolts-tasks:1.4.0"
,
textDrawable
:
"com.amulyakhare:com.amulyakhare.textdrawable:1
.0.1"
,
rxAndroid
:
"io.reactivex.rxjava2:rxandroid:2.0.1
"
rxAndroid
:
"io.reactivex.rxjava2:rxandroid:2
.0.1"
,
textDrawable
:
"com.github.rocketchat:textdrawable:1.0.2
"
]
rxbindingDependencies
=
[
rxBinding
:
"com.jakewharton.rxbinding2:rxbinding:${rxbindingVersion}"
,
...
...
rocket-chat-android-widgets/build.gradle
View file @
1264e85d
...
...
@@ -44,13 +44,13 @@ ext {
}
dependencies
{
compile
project
(
':rocket-chat-core'
)
compile
extraDependencies
.
okHTTP
;
compile
extraDependencies
.
okHTTP
compile
extraDependencies
.
textDrawable
compile
supportDependencies
.
annotation
compile
supportDependencies
.
cardView
compile
supportDependencies
.
designSupportLibrary
compile
supportDependencies
.
constrainLayout
compile
supportDependencies
.
kotlin
compile
extraDependencies
.
textDrawable
compile
rxbindingDependencies
.
rxBinding
compile
rxbindingDependencies
.
rxBindingSupport
compile
"com.android.support:support-v13:$rootProject.ext.supportLibraryVersion"
...
...
rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/RoomToolbar.java
View file @
1264e85d
...
...
@@ -16,11 +16,13 @@ import android.view.View;
import
android.widget.ImageButton
;
import
android.widget.ImageView
;
import
android.widget.TextView
;
import
chat.rocket.android.widget.helper.DrawableHelper
;
import
com.amulyakhare.textdrawable.TextDrawable
;
import
java.lang.reflect.Field
;
import
chat.rocket.android.widget.helper.DrawableHelper
;
public
class
RoomToolbar
extends
Toolbar
{
private
TextView
toolbarText
;
private
ImageView
roomTypeImage
;
...
...
rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/helper/AvatarHelper.kt
View file @
1264e85d
...
...
@@ -6,7 +6,6 @@ import android.graphics.Typeface
import
android.graphics.drawable.Drawable
import
chat.rocket.android.widget.AbsoluteUrl
import
com.amulyakhare.textdrawable.TextDrawable
import
java.net.URLEncoder
/**
...
...
rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/helper/FrescoHelper.kt
View file @
1264e85d
package
chat.rocket.android.widget.helper
import
android.graphics.Rect
import
android.graphics.drawable.Drawable
import
android.graphics.drawable.ShapeDrawable
import
android.net.Uri
import
android.support.graphics.drawable.VectorDrawableCompat
import
chat.rocket.android.widget.R
...
...
@@ -14,6 +16,10 @@ import com.facebook.drawee.view.SimpleDraweeView
object
FrescoHelper
{
fun
loadImage
(
simpleDraweeView
:
SimpleDraweeView
,
imageUri
:
String
,
placeholderDrawable
:
Drawable
)
{
// ref: https://github.com/facebook/fresco/issues/501
if
(
placeholderDrawable
is
ShapeDrawable
)
{
placeholderDrawable
.
setPadding
(
Rect
())
}
simpleDraweeView
.
hierarchy
.
setPlaceholderImage
(
placeholderDrawable
)
simpleDraweeView
.
controller
=
Fresco
.
newDraweeControllerBuilder
().
setUri
(
imageUri
).
setAutoPlayAnimations
(
true
).
build
()
}
...
...
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