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
f5026f1d
Commit
f5026f1d
authored
Apr 19, 2018
by
Filipe de Lima Brito
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds temporary user status.
parent
f830bced
Changes
20
Show whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
238 additions
and
159 deletions
+238
-159
build.gradle
app/build.gradle
+2
-0
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+15
-4
AppLifecycleObserver.kt
...main/java/chat/rocket/android/app/AppLifecycleObserver.kt
+45
-0
RocketChatApplication.kt
...ain/java/chat/rocket/android/app/RocketChatApplication.kt
+13
-3
ChatRoomPresenter.kt
...rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+17
-15
PinnedMessagesPresenter.kt
.../android/chatroom/presentation/PinnedMessagesPresenter.kt
+8
-11
ChatRoomActivity.kt
.../java/chat/rocket/android/chatroom/ui/ChatRoomActivity.kt
+8
-10
ChatRoomFragment.kt
.../java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+15
-7
AppComponent.kt
app/src/main/java/chat/rocket/android/dagger/AppComponent.kt
+1
-0
AppModule.kt
.../main/java/chat/rocket/android/dagger/module/AppModule.kt
+2
-0
MainPresenter.kt
...va/chat/rocket/android/main/presentation/MainPresenter.kt
+1
-1
MainActivity.kt
...src/main/java/chat/rocket/android/main/ui/MainActivity.kt
+1
-1
MembersPresenter.kt
...t/rocket/android/members/presentation/MembersPresenter.kt
+9
-7
MembersFragment.kt
...in/java/chat/rocket/android/members/ui/MembersFragment.kt
+0
-1
AboutActivity.kt
...va/chat/rocket/android/settings/about/ui/AboutActivity.kt
+4
-6
PasswordPresenter.kt
...droid/settings/password/presentation/PasswordPresenter.kt
+6
-4
strings.xml
app/src/main/res/values-hi-rIN/strings.xml
+2
-2
strings.xml
app/src/main/res/values-pt-rBR/strings.xml
+2
-2
strings.xml
app/src/main/res/values/strings.xml
+2
-2
dependencies.gradle
dependencies.gradle
+85
-83
No files found.
app/build.gradle
View file @
f5026f1d
...
...
@@ -78,6 +78,8 @@ dependencies {
implementation
libraries
.
room
kapt
libraries
.
roomProcessor
implementation
libraries
.
roomRxjava
implementation
libraries
.
lifecycleExtensions
kapt
libraries
.
lifecycleCompiler
implementation
libraries
.
rxKotlin
implementation
libraries
.
rxAndroid
...
...
app/src/main/AndroidManifest.xml
View file @
f5026f1d
...
...
@@ -50,37 +50,52 @@
android:scheme=
"https"
/>
</intent-filter>
</activity>
<activity
android:name=
".server.ui.ChangeServerActivity"
android:theme=
"@style/AuthenticationTheme"
/>
<activity
android:name=
".main.ui.MainActivity"
android:theme=
"@style/AppTheme"
android:windowSoftInputMode=
"adjustResize|stateAlwaysHidden"
/>
<activity
android:name=
".webview.ui.WebViewActivity"
android:theme=
"@style/AppTheme"
android:windowSoftInputMode=
"adjustResize|stateAlwaysHidden"
/>
<activity
android:name=
".webview.cas.ui.CasWebViewActivity"
android:theme=
"@style/AppTheme"
android:windowSoftInputMode=
"adjustResize|stateAlwaysHidden"
/>
<activity
android:name=
".webview.oauth.ui.OauthWebViewActivity"
android:theme=
"@style/AppTheme"
android:windowSoftInputMode=
"adjustResize|stateAlwaysHidden"
/>
<activity
android:name=
".chatroom.ui.ChatRoomActivity"
android:theme=
"@style/AppTheme"
android:windowSoftInputMode=
"adjustResize|stateAlwaysHidden"
/>
<!-- TODO: Change to fragment-->
<activity
android:name=
".chatroom.ui.PinnedMessagesActivity"
android:theme=
"@style/AppTheme"
android:windowSoftInputMode=
"adjustResize|stateAlwaysHidden"
/>
<!-- TODO: Change to fragment-->
<activity
android:name=
".settings.password.ui.PasswordActivity"
android:theme=
"@style/AppTheme"
/>
<!-- TODO: Change to fragment-->
<activity
android:name=
".settings.about.ui.AboutActivity"
android:theme=
"@style/AppTheme"
/>
<receiver
android:name=
"com.google.android.gms.gcm.GcmReceiver"
android:exported=
"true"
...
...
@@ -124,10 +139,6 @@
<meta-data
android:name=
"io.fabric.ApiKey"
android:value=
"12ac6e94f850aaffcdff52001af77ca415d06a43"
/>
<activity
android:name=
".settings.about.ui.AboutActivity"
android:theme=
"@style/AppTheme"
/>
</application>
</manifest>
app/src/main/java/chat/rocket/android/app/AppLifecycleObserver.kt
0 → 100644
View file @
f5026f1d
package
chat.rocket.android.app
import
android.arch.lifecycle.Lifecycle
import
android.arch.lifecycle.LifecycleObserver
import
android.arch.lifecycle.OnLifecycleEvent
import
chat.rocket.android.server.domain.GetAccountInteractor
import
chat.rocket.android.server.domain.GetCurrentServerInteractor
import
chat.rocket.android.server.infraestructure.RocketChatClientFactory
import
chat.rocket.common.RocketChatException
import
chat.rocket.common.model.UserStatus
import
chat.rocket.core.internal.realtime.setTemporaryStatus
import
kotlinx.coroutines.experimental.launch
import
timber.log.Timber
import
javax.inject.Inject
class
AppLifecycleObserver
@Inject
constructor
(
private
val
serverInteractor
:
GetCurrentServerInteractor
,
private
val
factory
:
RocketChatClientFactory
,
private
val
getAccountInteractor
:
GetAccountInteractor
)
:
LifecycleObserver
{
@OnLifecycleEvent
(
Lifecycle
.
Event
.
ON_START
)
fun
onEnterForeground
()
{
changeTemporaryStatus
(
UserStatus
.
Online
())
}
@OnLifecycleEvent
(
Lifecycle
.
Event
.
ON_STOP
)
fun
onEnterBackground
()
{
changeTemporaryStatus
(
UserStatus
.
Away
())
}
private
fun
changeTemporaryStatus
(
userStatus
:
UserStatus
)
{
launch
{
val
currentServer
=
serverInteractor
.
get
()
val
account
=
currentServer
?.
let
{
getAccountInteractor
.
get
(
currentServer
)
}
val
client
=
account
?.
let
{
factory
.
create
(
currentServer
)
}
try
{
client
?.
setTemporaryStatus
(
userStatus
)
}
catch
(
exception
:
RocketChatException
)
{
Timber
.
e
(
exception
)
}
}
}
}
\ No newline at end of file
app/src/main/java/chat/rocket/android/app/RocketChatApplication.kt
View file @
f5026f1d
...
...
@@ -3,6 +3,7 @@ package chat.rocket.android.app
import
android.app.Activity
import
android.app.Application
import
android.app.Service
import
android.arch.lifecycle.ProcessLifecycleOwner
import
android.content.BroadcastReceiver
import
android.content.Context
import
android.content.SharedPreferences
...
...
@@ -43,10 +44,12 @@ import timber.log.Timber
import
java.lang.ref.WeakReference
import
javax.inject.Inject
class
RocketChatApplication
:
Application
(),
HasActivityInjector
,
HasServiceInjector
,
HasBroadcastReceiverInjector
{
@Inject
lateinit
var
appLifecycleObserver
:
AppLifecycleObserver
@Inject
lateinit
var
activityDispatchingAndroidInjector
:
DispatchingAndroidInjector
<
Activity
>
...
...
@@ -84,7 +87,14 @@ class RocketChatApplication : Application(), HasActivityInjector, HasServiceInje
override
fun
onCreate
()
{
super
.
onCreate
()
DaggerAppComponent
.
builder
().
application
(
this
).
build
().
inject
(
this
)
DaggerAppComponent
.
builder
()
.
application
(
this
)
.
build
()
.
inject
(
this
)
ProcessLifecycleOwner
.
get
()
.
lifecycle
.
addObserver
(
appLifecycleObserver
)
// TODO - remove this on the future, temporary migration stuff for pre-release versions.
migrateInternalTokens
()
...
...
app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
View file @
f5026f1d
...
...
@@ -42,7 +42,8 @@ import timber.log.Timber
import
java.util.*
import
javax.inject.Inject
class
ChatRoomPresenter
@Inject
constructor
(
private
val
view
:
ChatRoomView
,
class
ChatRoomPresenter
@Inject
constructor
(
private
val
view
:
ChatRoomView
,
private
val
navigator
:
ChatRoomNavigator
,
private
val
strategy
:
CancelStrategy
,
getSettingsInteractor
:
GetSettingsInteractor
,
...
...
@@ -56,7 +57,8 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
private
val
localRepository
:
LocalRepository
,
factory
:
ConnectionManagerFactory
,
private
val
mapper
:
ViewModelMapper
,
private
val
jobSchedulerInteractor
:
JobSchedulerInteractor
)
{
private
val
jobSchedulerInteractor
:
JobSchedulerInteractor
)
{
private
val
currentServer
=
serverInteractor
.
get
()
!!
private
val
manager
=
factory
.
create
(
currentServer
)
private
val
client
=
manager
.
client
...
...
app/src/main/java/chat/rocket/android/chatroom/presentation/PinnedMessagesPresenter.kt
View file @
f5026f1d
...
...
@@ -4,27 +4,24 @@ import chat.rocket.android.chatroom.viewmodel.ViewModelMapper
import
chat.rocket.android.core.lifecycle.CancelStrategy
import
chat.rocket.android.server.domain.GetChatRoomsInteractor
import
chat.rocket.android.server.domain.GetCurrentServerInteractor
import
chat.rocket.android.server.domain.GetSettingsInteractor
import
chat.rocket.android.server.infraestructure.RocketChatClientFactory
import
chat.rocket.android.util.extensions.launchUI
import
chat.rocket.common.RocketChatException
import
chat.rocket.common.util.ifNull
import
chat.rocket.core.internal.rest.getRoomPinnedMessages
import
chat.rocket.core.model.Value
import
chat.rocket.core.model.isSystemMessage
import
timber.log.Timber
import
javax.inject.Inject
class
PinnedMessagesPresenter
@Inject
constructor
(
private
val
view
:
PinnedMessagesView
,
class
PinnedMessagesPresenter
@Inject
constructor
(
private
val
view
:
PinnedMessagesView
,
private
val
strategy
:
CancelStrategy
,
private
val
serverInteractor
:
GetCurrentServerInteractor
,
private
val
roomsInteractor
:
GetChatRoomsInteractor
,
private
val
mapper
:
ViewModelMapper
,
factory
:
RocketChatClientFactory
,
getSettingsInteractor
:
GetSettingsInteractor
)
{
factory
:
RocketChatClientFactory
)
{
private
val
client
=
factory
.
create
(
serverInteractor
.
get
()
!!
)
private
var
settings
:
Map
<
String
,
Value
<
Any
>>
=
getSettingsInteractor
.
get
(
serverInteractor
.
get
()
!!
)
private
var
pinnedMessagesListOffset
:
Int
=
0
/**
...
...
app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomActivity.kt
View file @
f5026f1d
...
...
@@ -3,7 +3,6 @@ package chat.rocket.android.chatroom.ui
import
DrawableHelper
import
android.content.Context
import
android.content.Intent
import
android.graphics.drawable.Drawable
import
android.os.Bundle
import
android.support.v4.app.Fragment
import
android.support.v7.app.AppCompatActivity
...
...
@@ -15,22 +14,21 @@ import chat.rocket.android.util.extensions.addFragment
import
chat.rocket.android.util.extensions.textContent
import
chat.rocket.common.model.RoomType
import
chat.rocket.common.model.roomTypeOf
import
chat.rocket.common.util.ifNull
import
dagger.android.AndroidInjection
import
dagger.android.AndroidInjector
import
dagger.android.DispatchingAndroidInjector
import
dagger.android.support.HasSupportFragmentInjector
import
kotlinx.android.synthetic.main.app_bar_chat_room.*
import
javax.inject.Inject
import
timber.log.Timber
fun
Context
.
chatRoomIntent
(
chatRoomId
:
String
,
fun
Context
.
chatRoomIntent
(
chatRoomId
:
String
,
chatRoomName
:
String
,
chatRoomType
:
String
,
isChatRoomReadOnly
:
Boolean
,
chatRoomLastSeen
:
Long
,
isChatRoomSubscribed
:
Boolean
=
true
):
Intent
{
isChatRoomSubscribed
:
Boolean
=
true
):
Intent
{
return
Intent
(
this
,
ChatRoomActivity
::
class
.
java
).
apply
{
putExtra
(
INTENT_CHAT_ROOM_ID
,
chatRoomId
)
putExtra
(
INTENT_CHAT_ROOM_NAME
,
chatRoomName
)
...
...
app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
View file @
f5026f1d
...
...
@@ -42,12 +42,14 @@ import kotlinx.android.synthetic.main.message_list.*
import
java.util.concurrent.atomic.AtomicInteger
import
javax.inject.Inject
fun
newInstance
(
chatRoomId
:
String
,
fun
newInstance
(
chatRoomId
:
String
,
chatRoomName
:
String
,
chatRoomType
:
String
,
isChatRoomReadOnly
:
Boolean
,
chatRoomLastSeen
:
Long
,
isSubscribed
:
Boolean
=
true
):
Fragment
{
isSubscribed
:
Boolean
=
true
):
Fragment
{
return
ChatRoomFragment
().
apply
{
arguments
=
Bundle
(
1
).
apply
{
putString
(
BUNDLE_CHAT_ROOM_ID
,
chatRoomId
)
...
...
@@ -114,7 +116,13 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
setHasOptionsMenu
(
true
)
}
override
fun
onCreateView
(
inflater
:
LayoutInflater
,
container
:
ViewGroup
?,
savedInstanceState
:
Bundle
?):
View
?
=
container
?.
inflate
(
R
.
layout
.
fragment_chat_room
)
override
fun
onCreateView
(
inflater
:
LayoutInflater
,
container
:
ViewGroup
?,
savedInstanceState
:
Bundle
?
):
View
?
{
return
container
?.
inflate
(
R
.
layout
.
fragment_chat_room
)
}
override
fun
onViewCreated
(
view
:
View
,
savedInstanceState
:
Bundle
?)
{
super
.
onViewCreated
(
view
,
savedInstanceState
)
...
...
app/src/main/java/chat/rocket/android/dagger/AppComponent.kt
View file @
f5026f1d
package
chat.rocket.android.dagger
import
android.app.Application
import
chat.rocket.android.app.AppLifecycleObserver
import
chat.rocket.android.app.RocketChatApplication
import
chat.rocket.android.chatroom.service.MessageService
import
chat.rocket.android.dagger.module.ActivityBuilder
...
...
app/src/main/java/chat/rocket/android/dagger/module/AppModule.kt
View file @
f5026f1d
...
...
@@ -4,6 +4,7 @@ import android.app.Application
import
android.app.NotificationManager
import
android.app.job.JobInfo
import
android.app.job.JobScheduler
import
android.arch.lifecycle.LifecycleOwner
import
android.arch.persistence.room.Room
import
android.content.ComponentName
import
android.content.Context
...
...
@@ -14,6 +15,7 @@ import chat.rocket.android.app.RocketChatDatabase
import
chat.rocket.android.authentication.infraestructure.SharedPreferencesMultiServerTokenRepository
import
chat.rocket.android.authentication.infraestructure.SharedPreferencesTokenRepository
import
chat.rocket.android.chatroom.service.MessageService
import
chat.rocket.android.core.lifecycle.CancelStrategy
import
chat.rocket.android.dagger.qualifier.ForFresco
import
chat.rocket.android.dagger.qualifier.ForMessages
import
chat.rocket.android.helper.FrescoAuthInterceptor
...
...
app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt
View file @
f5026f1d
...
...
@@ -135,7 +135,7 @@ class MainPresenter @Inject constructor(
navigator
.
toServerScreen
()
}
fun
changeStatus
(
userStatus
:
UserStatus
)
{
fun
change
Default
Status
(
userStatus
:
UserStatus
)
{
launchUI
(
strategy
)
{
try
{
client
.
setDefaultStatus
(
userStatus
)
...
...
app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
View file @
f5026f1d
...
...
@@ -138,7 +138,7 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector, HasSupp
accounts_list
.
layoutManager
=
LinearLayoutManager
(
this
)
accounts_list
.
adapter
=
AccountsAdapter
(
accounts
,
object
:
Selector
{
override
fun
onStatusSelected
(
userStatus
:
UserStatus
)
{
presenter
.
changeStatus
(
userStatus
)
presenter
.
change
Default
Status
(
userStatus
)
}
override
fun
onAccountSelected
(
serverUrl
:
String
)
{
...
...
app/src/main/java/chat/rocket/android/members/presentation/MembersPresenter.kt
View file @
f5026f1d
...
...
@@ -14,12 +14,14 @@ import chat.rocket.core.RocketChatClient
import
chat.rocket.core.internal.rest.getMembers
import
javax.inject.Inject
class
MembersPresenter
@Inject
constructor
(
private
val
view
:
MembersView
,
class
MembersPresenter
@Inject
constructor
(
private
val
view
:
MembersView
,
private
val
navigator
:
MembersNavigator
,
private
val
strategy
:
CancelStrategy
,
private
val
serverInteractor
:
GetCurrentServerInteractor
,
serverInteractor
:
GetCurrentServerInteractor
,
factory
:
RocketChatClientFactory
,
private
val
mapper
:
MemberViewModelMapper
)
{
private
val
mapper
:
MemberViewModelMapper
)
{
private
val
client
:
RocketChatClient
=
factory
.
create
(
serverInteractor
.
get
()
!!
)
fun
loadChatRoomsMembers
(
chatRoomId
:
String
,
chatRoomType
:
String
,
offset
:
Long
=
0
)
{
...
...
app/src/main/java/chat/rocket/android/members/ui/MembersFragment.kt
View file @
f5026f1d
...
...
@@ -25,7 +25,6 @@ import dagger.android.support.AndroidSupportInjection
import
kotlinx.android.synthetic.main.fragment_members.*
import
javax.inject.Inject
fun
newInstance
(
chatRoomId
:
String
,
chatRoomType
:
String
):
Fragment
{
return
MembersFragment
().
apply
{
arguments
=
Bundle
(
1
).
apply
{
...
...
app/src/main/java/chat/rocket/android/settings/about/ui/AboutActivity.kt
View file @
f5026f1d
package
chat.rocket.android.settings.about.ui
import
android.support.v7.app.AppCompatActivity
import
android.os.Bundle
import
android.support.v7.app.AppCompatActivity
import
chat.rocket.android.BuildConfig
import
chat.rocket.android.R
import
chat.rocket.android.util.extensions.textContent
...
...
@@ -19,15 +19,13 @@ class AboutActivity : AppCompatActivity() {
}
private
fun
setupViews
()
{
val
versionName
=
resources
.
getString
(
R
.
string
.
msg_version
)
+
" "
+
BuildConfig
.
VERSION_NAME
val
versionCode
=
resources
.
getString
(
R
.
string
.
msg_build
)+
" #"
+
BuildConfig
.
VERSION_CODE
text_version_name
.
text
=
versionName
text_build_number
.
text
=
versionCode
text_version_name
.
text
=
getString
(
R
.
string
.
msg_version
,
BuildConfig
.
VERSION_NAME
)
text_build_number
.
text
=
getString
(
R
.
string
.
msg_build
,
BuildConfig
.
VERSION_CODE
)
}
private
fun
setupToolbar
()
{
setSupportActionBar
(
toolbar
)
text_change_password
.
textContent
=
resources
.
getString
(
R
.
string
.
title_about
)
text_change_password
.
textContent
=
getString
(
R
.
string
.
title_about
)
}
override
fun
onBackPressed
()
{
...
...
app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordPresenter.kt
View file @
f5026f1d
...
...
@@ -11,10 +11,12 @@ import chat.rocket.core.internal.rest.me
import
chat.rocket.core.internal.rest.updateProfile
import
javax.inject.Inject
class
PasswordPresenter
@Inject
constructor
(
private
val
view
:
PasswordView
,
class
PasswordPresenter
@Inject
constructor
(
private
val
view
:
PasswordView
,
private
val
strategy
:
CancelStrategy
,
serverInteractor
:
GetCurrentServerInteractor
,
factory
:
RocketChatClientFactory
){
factory
:
RocketChatClientFactory
)
{
private
val
serverUrl
=
serverInteractor
.
get
()
!!
private
val
client
:
RocketChatClient
=
factory
.
create
(
serverUrl
)
...
...
app/src/main/res/values-hi-rIN/strings.xml
View file @
f5026f1d
...
...
@@ -87,8 +87,8 @@
<string
name=
"msg_ver_not_minimum"
>
ऐसा लगता है कि आपका सर्वर संस्करण न्यूनतम आवश्यक संस्करण %1$s से कम है।\nकृपया लॉगिन करने के लिए अपने सर्वर को अपग्रेड करें!
</string>
<string
name=
"msg_version"
>
वर्शन
</string>
<string
name=
"msg_build"
>
बिल्ड
</string>
<string
name=
"msg_version"
>
वर्शन
%1$s
</string>
<string
name=
"msg_build"
>
बिल्ड
%1$d
</string>
<!-- System messages -->
<string
name=
"message_room_name_changed"
>
%2$s ने रूम का नाम बदलकर %1$s किया
</string>
...
...
app/src/main/res/values-pt-rBR/strings.xml
View file @
f5026f1d
...
...
@@ -80,8 +80,8 @@
<string
name=
"msg_preview_audio"
>
Audio
</string>
<string
name=
"msg_preview_photo"
>
Foto
</string>
<string
name=
"msg_no_messages_yet"
>
Nenhuma mensagem ainda
</string>
<string
name=
"msg_version"
>
Versão
</string>
<string
name=
"msg_build"
>
Build
</string>
<string
name=
"msg_version"
>
Versão
%1$s
</string>
<string
name=
"msg_build"
>
Build
%1$d
</string>
<string
name=
"msg_ok"
>
OK
</string>
<string
name=
"msg_ver_not_recommended"
>
Parece que a versão do seu servidor está abaixo da recomendada %1$s.\nVocê ainda assim pode logar e continuar mas podem ocorrer alguns problemas inesperados.
...
...
app/src/main/res/values/strings.xml
View file @
f5026f1d
...
...
@@ -82,8 +82,8 @@
<string
name=
"msg_preview_audio"
>
Audio
</string>
<string
name=
"msg_preview_photo"
>
Photo
</string>
<string
name=
"msg_no_messages_yet"
>
No messages yet
</string>
<string
name=
"msg_version"
>
Version
</string>
<string
name=
"msg_build"
>
Build
</string>
<string
name=
"msg_version"
>
Version
%1$s
</string>
<string
name=
"msg_build"
>
Build
%1$d
</string>
<string
name=
"msg_ok"
>
OK
</string>
<string
name=
"msg_ver_not_recommended"
>
Looks like your server version is below the recommended version %1$s.\nYou can still login but you may experience unexpected behaviors.
</string>
...
...
dependencies.gradle
View file @
f5026f1d
...
...
@@ -16,6 +16,7 @@ ext {
exoPlayer
:
'2.6.0'
,
playServices
:
'11.8.0'
,
room
:
'1.0.0'
,
lifecycle
:
'1.1.1'
,
rxKotlin
:
'2.2.0'
,
rxAndroid
:
'2.0.2'
,
moshi
:
'1.6.0-SNAPSHOT'
,
...
...
@@ -28,7 +29,7 @@ ext {
frescoImageViewer
:
'0.5.1'
,
markwon
:
'1.0.3'
,
sheetMenu
:
'1.3.3'
,
aVLoadingIndicatorView
:
'2.1.3'
,
aVLoadingIndicatorView
:
'2.1.3'
,
flexbox
:
'0.3.2'
,
// For testing
...
...
@@ -63,6 +64,8 @@ ext {
room
:
"android.arch.persistence.room:runtime:${versions.room}"
,
roomProcessor
:
"android.arch.persistence.room:compiler:${versions.room}"
,
roomRxjava
:
"android.arch.persistence.room:rxjava2:${versions.room}"
,
lifecycleExtensions
:
"android.arch.lifecycle:extensions:${versions.lifecycle}"
,
lifecycleCompiler
:
"android.arch.lifecycle:compiler:${versions.lifecycle}"
,
rxKotlin
:
"io.reactivex.rxjava2:rxkotlin:${versions.rxKotlin}"
,
rxAndroid
:
"io.reactivex.rxjava2:rxandroid:${versions.rxAndroid}"
,
...
...
@@ -92,7 +95,7 @@ ext {
sheetMenu
:
"com.github.whalemare:sheetmenu:${versions.sheetMenu}"
,
aVLoadingIndicatorView
:
"com.wang.avi:library:${versions.aVLoadingIndicatorView}"
,
aVLoadingIndicatorView:
"com.wang.avi:library:${versions.aVLoadingIndicatorView}"
,
// For testing
junit
:
"junit:junit:$versions.junit"
,
...
...
@@ -100,5 +103,4 @@ ext {
roomTest
:
"android.arch.persistence.room:testing:${versions.room}"
,
truth
:
"com.google.truth:truth:$versions.truth"
,
]
}
\ 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