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
0cf32df9
Commit
0cf32df9
authored
May 18, 2018
by
Lucio Maciel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate to AndroidX (jetpack)
parent
9e70822c
Changes
124
Hide whitespace changes
Inline
Side-by-side
Showing
124 changed files
with
296 additions
and
363 deletions
+296
-363
build.gradle
app/build.gradle
+6
-7
ChatRoomFragmentTest.kt
...a/chat/rocket/android/chatroom/ui/ChatRoomFragmentTest.kt
+6
-6
AppLifecycleObserver.kt
...main/java/chat/rocket/android/app/AppLifecycleObserver.kt
+3
-3
DrawableHelper.kt
app/src/main/java/chat/rocket/android/app/DrawableHelper.kt
+2
-2
RocketChatApplication.kt
...ain/java/chat/rocket/android/app/RocketChatApplication.kt
+3
-3
RocketChatDatabase.kt
...c/main/java/chat/rocket/android/app/RocketChatDatabase.kt
+0
-12
LoginFragmentModule.kt
...et/android/authentication/login/di/LoginFragmentModule.kt
+1
-1
LoginFragment.kt
...t/rocket/android/authentication/login/ui/LoginFragment.kt
+1
-1
RegisterUsernameFragmentModule.kt
...ion/registerusername/di/RegisterUsernameFragmentModule.kt
+1
-1
RegisterUsernameFragment.kt
...ntication/registerusername/ui/RegisterUsernameFragment.kt
+1
-1
ResetPasswordFragmentModule.kt
...ntication/resetpassword/di/ResetPasswordFragmentModule.kt
+1
-1
ResetPasswordFragment.kt
.../authentication/resetpassword/ui/ResetPasswordFragment.kt
+1
-1
ServerFragmentModule.kt
.../android/authentication/server/di/ServerFragmentModule.kt
+1
-1
ServerFragment.kt
...rocket/android/authentication/server/ui/ServerFragment.kt
+1
-1
SignupFragmentModule.kt
.../android/authentication/signup/di/SignupFragmentModule.kt
+1
-1
SignupFragment.kt
...rocket/android/authentication/signup/ui/SignupFragment.kt
+1
-2
TwoFAFragmentModule.kt
...ndroid/authentication/twofactor/di/TwoFAFragmentModule.kt
+1
-1
TwoFAFragment.kt
...cket/android/authentication/twofactor/ui/TwoFAFragment.kt
+1
-1
AuthenticationActivity.kt
...ocket/android/authentication/ui/AuthenticationActivity.kt
+2
-2
AutoCompleteType.kt
.../chat/rocket/android/chatroom/adapter/AutoCompleteType.kt
+1
-1
BaseViewHolder.kt
...va/chat/rocket/android/chatroom/adapter/BaseViewHolder.kt
+1
-1
ChatRoomAdapter.kt
...a/chat/rocket/android/chatroom/adapter/ChatRoomAdapter.kt
+1
-1
ColorAttachmentViewHolder.kt
...ket/android/chatroom/adapter/ColorAttachmentViewHolder.kt
+1
-1
ImageAttachmentViewHolder.kt
...ket/android/chatroom/adapter/ImageAttachmentViewHolder.kt
+2
-3
MessageReactionsAdapter.kt
...ocket/android/chatroom/adapter/MessageReactionsAdapter.kt
+1
-1
ChatRoomFragmentModule.kt
...chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt
+1
-1
ActionSnackbar.kt
...in/java/chat/rocket/android/chatroom/ui/ActionSnackbar.kt
+2
-2
ChatRoomActivity.kt
.../java/chat/rocket/android/chatroom/ui/ChatRoomActivity.kt
+2
-2
ChatRoomFragment.kt
.../java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+7
-7
BottomSheetMenu.kt
...rocket/android/chatroom/ui/bottomsheet/BottomSheetMenu.kt
+3
-3
ListBottomSheetAdapter.kt
...chatroom/ui/bottomsheet/adapter/ListBottomSheetAdapter.kt
+2
-2
ViewModelMapper.kt
...chat/rocket/android/chatroom/viewmodel/ViewModelMapper.kt
+1
-1
ChatRoomsFragmentModule.kt
...at/rocket/android/chatrooms/di/ChatRoomsFragmentModule.kt
+1
-1
ChatRoomsAdapter.kt
...java/chat/rocket/android/chatrooms/ui/ChatRoomsAdapter.kt
+2
-2
ChatRoomsFragment.kt
...ava/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
+6
-6
SimpleSectionedRecyclerViewAdapter.kt
...ndroid/chatrooms/ui/SimpleSectionedRecyclerViewAdapter.kt
+1
-1
MessageView.kt
...n/java/chat/rocket/android/core/behaviours/MessageView.kt
+1
-1
CancelStrategy.kt
...java/chat/rocket/android/core/lifecycle/CancelStrategy.kt
+4
-4
AppModule.kt
.../main/java/chat/rocket/android/dagger/module/AppModule.kt
+0
-14
AndroidPermissionsHelper.kt
...va/chat/rocket/android/helper/AndroidPermissionsHelper.kt
+2
-2
EndlessRecyclerViewScrollListener.kt
...ocket/android/helper/EndlessRecyclerViewScrollListener.kt
+6
-6
MessageParser.kt
...src/main/java/chat/rocket/android/helper/MessageParser.kt
+1
-1
AccountViewHolder.kt
...ava/chat/rocket/android/main/adapter/AccountViewHolder.kt
+1
-1
AccountsAdapter.kt
.../java/chat/rocket/android/main/adapter/AccountsAdapter.kt
+1
-1
AddAccountViewHolder.kt
.../chat/rocket/android/main/adapter/AddAccountViewHolder.kt
+1
-1
StatusViewHolder.kt
...java/chat/rocket/android/main/adapter/StatusViewHolder.kt
+1
-1
MainModule.kt
app/src/main/java/chat/rocket/android/main/di/MainModule.kt
+1
-1
MainActivity.kt
...src/main/java/chat/rocket/android/main/ui/MainActivity.kt
+3
-3
MembersAdapter.kt
...ava/chat/rocket/android/members/adapter/MembersAdapter.kt
+1
-1
MembersFragmentModule.kt
...a/chat/rocket/android/members/di/MembersFragmentModule.kt
+1
-1
MemberBottomSheetFragment.kt
...at/rocket/android/members/ui/MemberBottomSheetFragment.kt
+6
-2
MembersFragment.kt
...in/java/chat/rocket/android/members/ui/MembersFragment.kt
+4
-4
PinnedMessagesFragmentModule.kt
...android/pinnedmessages/di/PinnedMessagesFragmentModule.kt
+1
-1
PinnedMessagesFragment.kt
...ocket/android/pinnedmessages/ui/PinnedMessagesFragment.kt
+6
-7
ProfileFragmentModule.kt
...a/chat/rocket/android/profile/di/ProfileFragmentModule.kt
+1
-1
ProfileFragment.kt
...in/java/chat/rocket/android/profile/ui/ProfileFragment.kt
+2
-2
DirectReplyReceiver.kt
...main/java/chat/rocket/android/push/DirectReplyReceiver.kt
+2
-2
PushManager.kt
app/src/main/java/chat/rocket/android/push/PushManager.kt
+4
-4
ChangeServerModule.kt
.../java/chat/rocket/android/server/di/ChangeServerModule.kt
+1
-1
ServerDao.kt
...a/chat/rocket/android/server/infraestructure/ServerDao.kt
+0
-23
ServerEntity.kt
...hat/rocket/android/server/infraestructure/ServerEntity.kt
+0
-14
ServerEntityMapper.kt
...cket/android/server/infraestructure/ServerEntityMapper.kt
+0
-10
ChangeServerActivity.kt
...ava/chat/rocket/android/server/ui/ChangeServerActivity.kt
+1
-1
AboutActivity.kt
...va/chat/rocket/android/settings/about/ui/AboutActivity.kt
+1
-1
SettingsFragmentModule.kt
...chat/rocket/android/settings/di/SettingsFragmentModule.kt
+1
-1
PasswordFragmentModule.kt
...et/android/settings/password/di/PasswordFragmentModule.kt
+1
-1
PasswordActivity.kt
...t/rocket/android/settings/password/ui/PasswordActivity.kt
+2
-2
PasswordFragment.kt
...t/rocket/android/settings/password/ui/PasswordFragment.kt
+3
-3
SettingsFragment.kt
.../java/chat/rocket/android/settings/ui/SettingsFragment.kt
+2
-2
Animation.kt
...ain/java/chat/rocket/android/util/extensions/Animation.kt
+1
-1
Fragment.kt
...main/java/chat/rocket/android/util/extensions/Fragment.kt
+2
-2
Ui.kt
app/src/main/java/chat/rocket/android/util/extensions/Ui.kt
+6
-6
View.kt
...src/main/java/chat/rocket/android/util/extensions/View.kt
+2
-2
CasWebViewActivity.kt
.../chat/rocket/android/webview/cas/ui/CasWebViewActivity.kt
+1
-1
OauthWebViewActivity.kt
...t/rocket/android/webview/oauth/ui/OauthWebViewActivity.kt
+1
-1
WebViewActivity.kt
...in/java/chat/rocket/android/webview/ui/WebViewActivity.kt
+1
-1
DividerItemDecoration.kt
.../java/chat/rocket/android/widget/DividerItemDecoration.kt
+3
-3
BaseSuggestionViewHolder.kt
...roid/widget/autocompletion/ui/BaseSuggestionViewHolder.kt
+1
-1
PopupRecyclerView.kt
...ket/android/widget/autocompletion/ui/PopupRecyclerView.kt
+4
-4
SuggestionsAdapter.kt
...et/android/widget/autocompletion/ui/SuggestionsAdapter.kt
+1
-1
SuggestionsView.kt
...ocket/android/widget/autocompletion/ui/SuggestionsView.kt
+7
-7
CategoryPagerAdapter.kt
.../chat/rocket/android/widget/emoji/CategoryPagerAdapter.kt
+4
-4
ComposerEditText.kt
...java/chat/rocket/android/widget/emoji/ComposerEditText.kt
+2
-2
EmojiCategory.kt
...in/java/chat/rocket/android/widget/emoji/EmojiCategory.kt
+1
-1
EmojiKeyboardPopup.kt
...va/chat/rocket/android/widget/emoji/EmojiKeyboardPopup.kt
+3
-3
EmojiPickerPopup.kt
...java/chat/rocket/android/widget/emoji/EmojiPickerPopup.kt
+2
-2
about_view.xml
app/src/main/res/layout/about_view.xml
+2
-2
activity_main.xml
app/src/main/res/layout/activity_main.xml
+4
-4
app_bar.xml
app/src/main/res/layout/app_bar.xml
+3
-3
app_bar_chat_room.xml
app/src/main/res/layout/app_bar_chat_room.xml
+6
-6
app_bar_password.xml
app/src/main/res/layout/app_bar_password.xml
+4
-4
avatar_profile.xml
app/src/main/res/layout/avatar_profile.xml
+2
-2
emoji_category_layout.xml
app/src/main/res/layout/emoji_category_layout.xml
+3
-3
emoji_keyboard.xml
app/src/main/res/layout/emoji_keyboard.xml
+2
-2
emoji_picker.xml
app/src/main/res/layout/emoji_picker.xml
+2
-2
fragment_authentication_log_in.xml
app/src/main/res/layout/fragment_authentication_log_in.xml
+3
-3
fragment_chat_room.xml
app/src/main/res/layout/fragment_chat_room.xml
+2
-2
fragment_chat_rooms.xml
app/src/main/res/layout/fragment_chat_rooms.xml
+1
-1
fragment_member_bottom_sheet.xml
app/src/main/res/layout/fragment_member_bottom_sheet.xml
+2
-2
fragment_members.xml
app/src/main/res/layout/fragment_members.xml
+3
-3
fragment_password.xml
app/src/main/res/layout/fragment_password.xml
+6
-6
fragment_pinned_messages.xml
app/src/main/res/layout/fragment_pinned_messages.xml
+4
-4
item_account.xml
app/src/main/res/layout/item_account.xml
+2
-2
item_add_account.xml
app/src/main/res/layout/item_add_account.xml
+2
-2
item_author_attachment.xml
app/src/main/res/layout/item_author_attachment.xml
+2
-2
item_chat.xml
app/src/main/res/layout/item_chat.xml
+2
-2
item_color_attachment.xml
app/src/main/res/layout/item_color_attachment.xml
+2
-2
item_file_attachment.xml
app/src/main/res/layout/item_file_attachment.xml
+2
-2
item_member.xml
app/src/main/res/layout/item_member.xml
+2
-2
item_message.xml
app/src/main/res/layout/item_message.xml
+2
-2
item_message_attachment.xml
app/src/main/res/layout/item_message_attachment.xml
+2
-2
layout_reactions.xml
app/src/main/res/layout/layout_reactions.xml
+1
-1
message_action_bar.xml
app/src/main/res/layout/message_action_bar.xml
+2
-2
message_composer.xml
app/src/main/res/layout/message_composer.xml
+2
-2
message_list.xml
app/src/main/res/layout/message_list.xml
+4
-4
message_url_preview.xml
app/src/main/res/layout/message_url_preview.xml
+2
-2
nav_header.xml
app/src/main/res/layout/nav_header.xml
+4
-4
suggestion_member_item.xml
app/src/main/res/layout/suggestion_member_item.xml
+2
-2
chatrooms.xml
app/src/main/res/menu/chatrooms.xml
+2
-2
build.gradle
build.gradle
+3
-3
dependencies.gradle
dependencies.gradle
+30
-26
gradle.properties
gradle.properties
+2
-0
build.gradle
player/build.gradle
+1
-1
PlayerActivity.kt
...rc/main/java/chat/rocket/android/player/PlayerActivity.kt
+1
-1
No files found.
app/build.gradle
View file @
0cf32df9
...
@@ -15,7 +15,7 @@ android {
...
@@ -15,7 +15,7 @@ android {
targetSdkVersion
versions
.
targetSdk
targetSdkVersion
versions
.
targetSdk
versionCode
2020
versionCode
2020
versionName
"2.2.0"
versionName
"2.2.0"
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
multiDexEnabled
true
multiDexEnabled
true
}
}
...
@@ -60,11 +60,11 @@ dependencies {
...
@@ -60,11 +60,11 @@ dependencies {
implementation
libraries
.
appCompat
implementation
libraries
.
appCompat
implementation
libraries
.
recyclerview
implementation
libraries
.
recyclerview
implementation
libraries
.
design
implementation
libraries
.
material
implementation
libraries
.
constraint
L
ayout
implementation
libraries
.
constraint
l
ayout
implementation
libraries
.
card
V
iew
implementation
libraries
.
card
v
iew
implementation
libraries
.
flexbox
implementation
libraries
.
flexbox
implementation
libraries
.
customTabs
implementation
libraries
.
browser
implementation
libraries
.
androidKtx
implementation
libraries
.
androidKtx
...
@@ -77,7 +77,6 @@ dependencies {
...
@@ -77,7 +77,6 @@ dependencies {
implementation
libraries
.
room
implementation
libraries
.
room
kapt
libraries
.
roomProcessor
kapt
libraries
.
roomProcessor
implementation
libraries
.
roomRxjava
implementation
libraries
.
lifecycleExtensions
implementation
libraries
.
lifecycleExtensions
kapt
libraries
.
lifecycleCompiler
kapt
libraries
.
lifecycleCompiler
...
@@ -109,7 +108,7 @@ dependencies {
...
@@ -109,7 +108,7 @@ dependencies {
implementation
libraries
.
aVLoadingIndicatorView
implementation
libraries
.
aVLoadingIndicatorView
implementation
(
'com.crashlytics.sdk.android:crashlytics:2.
6.8
@aar'
)
{
implementation
(
'com.crashlytics.sdk.android:crashlytics:2.
9.2
@aar'
)
{
transitive
=
true
transitive
=
true
}
}
...
...
app/src/androidTest/java/chat/rocket/android/chatroom/ui/ChatRoomFragmentTest.kt
View file @
0cf32df9
package
chat.rocket.android.chatroom.ui
package
chat.rocket.android.chatroom.ui
import
android.content.Intent
import
android.content.Intent
import
android
.support
.test.espresso.intent.rule.IntentsTestRule
import
android
x
.test.espresso.intent.rule.IntentsTestRule
import
android
.support
.test.filters.LargeTest
import
android
x
.test.filters.LargeTest
import
org.junit.Rule
import
org.junit.Rule
import
org.junit.Test
import
org.junit.Test
import
android.app.Activity
import
android.app.Activity
import
android.app.Instrumentation.ActivityResult
import
android.app.Instrumentation.ActivityResult
import
android
.support
.test.InstrumentationRegistry
import
android
x
.test.InstrumentationRegistry
import
android
.support
.test.espresso.intent.Intents.intended
import
android
x
.test.espresso.intent.Intents.intended
import
android
.support
.test.espresso.intent.Intents.intending
import
android
x
.test.espresso.intent.Intents.intending
import
android
.support
.test.espresso.intent.matcher.IntentMatchers.*
import
android
x
.test.espresso.intent.matcher.IntentMatchers.*
import
org.hamcrest.Matchers.allOf
import
org.hamcrest.Matchers.allOf
import
org.hamcrest.Matchers.not
import
org.hamcrest.Matchers.not
import
org.junit.Before
import
org.junit.Before
...
...
app/src/main/java/chat/rocket/android/app/AppLifecycleObserver.kt
View file @
0cf32df9
package
chat.rocket.android.app
package
chat.rocket.android.app
import
android
.arch
.lifecycle.Lifecycle
import
android
x
.lifecycle.Lifecycle
import
android
.arch
.lifecycle.LifecycleObserver
import
android
x
.lifecycle.LifecycleObserver
import
android
.arch
.lifecycle.OnLifecycleEvent
import
android
x
.lifecycle.OnLifecycleEvent
import
chat.rocket.android.server.domain.GetAccountInteractor
import
chat.rocket.android.server.domain.GetAccountInteractor
import
chat.rocket.android.server.domain.GetCurrentServerInteractor
import
chat.rocket.android.server.domain.GetCurrentServerInteractor
import
chat.rocket.android.server.infraestructure.RocketChatClientFactory
import
chat.rocket.android.server.infraestructure.RocketChatClientFactory
...
...
app/src/main/java/chat/rocket/android/app/DrawableHelper.kt
View file @
0cf32df9
import
android.content.Context
import
android.content.Context
import
android.graphics.drawable.Drawable
import
android.graphics.drawable.Drawable
import
android
.support.v4
.content.ContextCompat
import
android
x.core
.content.ContextCompat
import
android
.support.v4
.graphics.drawable.DrawableCompat
import
android
x.core
.graphics.drawable.DrawableCompat
import
android.widget.TextView
import
android.widget.TextView
import
chat.rocket.android.R
import
chat.rocket.android.R
import
chat.rocket.common.model.UserStatus
import
chat.rocket.common.model.UserStatus
...
...
app/src/main/java/chat/rocket/android/app/RocketChatApplication.kt
View file @
0cf32df9
...
@@ -3,19 +3,19 @@ package chat.rocket.android.app
...
@@ -3,19 +3,19 @@ package chat.rocket.android.app
import
android.app.Activity
import
android.app.Activity
import
android.app.Application
import
android.app.Application
import
android.app.Service
import
android.app.Service
import
android
.arch
.lifecycle.ProcessLifecycleOwner
import
android
x
.lifecycle.ProcessLifecycleOwner
import
android.content.BroadcastReceiver
import
android.content.BroadcastReceiver
import
android.content.Context
import
android.content.Context
import
android.content.SharedPreferences
import
android.content.SharedPreferences
import
androidx.core.content.edit
import
androidx.core.content.edit
import
chat.rocket.android.BuildConfig
import
chat.rocket.android.BuildConfig
import
chat.rocket.android.app.migration.RealmMigration
/*
import chat.rocket.android.app.migration.RealmMigration
import chat.rocket.android.app.migration.RocketChatLibraryModule
import chat.rocket.android.app.migration.RocketChatLibraryModule
import chat.rocket.android.app.migration.RocketChatServerModule
import chat.rocket.android.app.migration.RocketChatServerModule
import chat.rocket.android.app.migration.model.RealmBasedServerInfo
import chat.rocket.android.app.migration.model.RealmBasedServerInfo
import chat.rocket.android.app.migration.model.RealmPublicSetting
import chat.rocket.android.app.migration.model.RealmPublicSetting
import chat.rocket.android.app.migration.model.RealmSession
import chat.rocket.android.app.migration.model.RealmSession
import
chat.rocket.android.app.migration.model.RealmUser
import chat.rocket.android.app.migration.model.RealmUser
*/
import
chat.rocket.android.authentication.domain.model.toToken
import
chat.rocket.android.authentication.domain.model.toToken
import
chat.rocket.android.dagger.DaggerAppComponent
import
chat.rocket.android.dagger.DaggerAppComponent
import
chat.rocket.android.dagger.qualifier.ForMessages
import
chat.rocket.android.dagger.qualifier.ForMessages
...
...
app/src/main/java/chat/rocket/android/app/RocketChatDatabase.kt
deleted
100644 → 0
View file @
9e70822c
package
chat.rocket.android.app
import
android.arch.persistence.room.Database
import
android.arch.persistence.room.RoomDatabase
import
chat.rocket.android.server.infraestructure.ServerDao
import
chat.rocket.android.server.infraestructure.ServerEntity
@Database
(
entities
=
arrayOf
(
ServerEntity
::
class
),
version
=
1
,
exportSchema
=
false
)
abstract
class
RocketChatDatabase
:
RoomDatabase
()
{
abstract
fun
serverDao
():
ServerDao
}
app/src/main/java/chat/rocket/android/authentication/login/di/LoginFragmentModule.kt
View file @
0cf32df9
package
chat.rocket.android.authentication.login.di
package
chat.rocket.android.authentication.login.di
import
android
.arch
.lifecycle.LifecycleOwner
import
android
x
.lifecycle.LifecycleOwner
import
chat.rocket.android.authentication.login.presentation.LoginView
import
chat.rocket.android.authentication.login.presentation.LoginView
import
chat.rocket.android.authentication.login.ui.LoginFragment
import
chat.rocket.android.authentication.login.ui.LoginFragment
import
chat.rocket.android.core.lifecycle.CancelStrategy
import
chat.rocket.android.core.lifecycle.CancelStrategy
...
...
app/src/main/java/chat/rocket/android/authentication/login/ui/LoginFragment.kt
View file @
0cf32df9
...
@@ -6,7 +6,7 @@ import android.content.Intent
...
@@ -6,7 +6,7 @@ import android.content.Intent
import
android.graphics.PorterDuff
import
android.graphics.PorterDuff
import
android.os.Build
import
android.os.Build
import
android.os.Bundle
import
android.os.Bundle
import
android
.support.v4
.app.Fragment
import
android
x.fragment
.app.Fragment
import
android.text.style.ClickableSpan
import
android.text.style.ClickableSpan
import
android.view.LayoutInflater
import
android.view.LayoutInflater
import
android.view.View
import
android.view.View
...
...
app/src/main/java/chat/rocket/android/authentication/registerusername/di/RegisterUsernameFragmentModule.kt
View file @
0cf32df9
package
chat.rocket.android.authentication.registerusername.di
package
chat.rocket.android.authentication.registerusername.di
import
android
.arch
.lifecycle.LifecycleOwner
import
android
x
.lifecycle.LifecycleOwner
import
chat.rocket.android.authentication.registerusername.presentation.RegisterUsernameView
import
chat.rocket.android.authentication.registerusername.presentation.RegisterUsernameView
import
chat.rocket.android.authentication.registerusername.ui.RegisterUsernameFragment
import
chat.rocket.android.authentication.registerusername.ui.RegisterUsernameFragment
import
chat.rocket.android.core.lifecycle.CancelStrategy
import
chat.rocket.android.core.lifecycle.CancelStrategy
...
...
app/src/main/java/chat/rocket/android/authentication/registerusername/ui/RegisterUsernameFragment.kt
View file @
0cf32df9
...
@@ -3,7 +3,7 @@ package chat.rocket.android.authentication.registerusername.ui
...
@@ -3,7 +3,7 @@ package chat.rocket.android.authentication.registerusername.ui
import
DrawableHelper
import
DrawableHelper
import
android.os.Build
import
android.os.Build
import
android.os.Bundle
import
android.os.Bundle
import
android
.support.v4
.app.Fragment
import
android
x.fragment
.app.Fragment
import
android.view.LayoutInflater
import
android.view.LayoutInflater
import
android.view.View
import
android.view.View
import
android.view.ViewGroup
import
android.view.ViewGroup
...
...
app/src/main/java/chat/rocket/android/authentication/resetpassword/di/ResetPasswordFragmentModule.kt
View file @
0cf32df9
package
chat.rocket.android.authentication.resetpassword.di
package
chat.rocket.android.authentication.resetpassword.di
import
android
.arch
.lifecycle.LifecycleOwner
import
android
x
.lifecycle.LifecycleOwner
import
chat.rocket.android.authentication.resetpassword.presentation.ResetPasswordView
import
chat.rocket.android.authentication.resetpassword.presentation.ResetPasswordView
import
chat.rocket.android.authentication.resetpassword.ui.ResetPasswordFragment
import
chat.rocket.android.authentication.resetpassword.ui.ResetPasswordFragment
import
chat.rocket.android.core.lifecycle.CancelStrategy
import
chat.rocket.android.core.lifecycle.CancelStrategy
...
...
app/src/main/java/chat/rocket/android/authentication/resetpassword/ui/ResetPasswordFragment.kt
View file @
0cf32df9
...
@@ -3,7 +3,7 @@ package chat.rocket.android.authentication.resetpassword.ui
...
@@ -3,7 +3,7 @@ package chat.rocket.android.authentication.resetpassword.ui
import
DrawableHelper
import
DrawableHelper
import
android.os.Build
import
android.os.Build
import
android.os.Bundle
import
android.os.Bundle
import
android
.support.v4
.app.Fragment
import
android
x.fragment
.app.Fragment
import
android.view.LayoutInflater
import
android.view.LayoutInflater
import
android.view.View
import
android.view.View
import
android.view.ViewGroup
import
android.view.ViewGroup
...
...
app/src/main/java/chat/rocket/android/authentication/server/di/ServerFragmentModule.kt
View file @
0cf32df9
package
chat.rocket.android.authentication.server.di
package
chat.rocket.android.authentication.server.di
import
android
.arch
.lifecycle.LifecycleOwner
import
android
x
.lifecycle.LifecycleOwner
import
chat.rocket.android.authentication.server.presentation.ServerView
import
chat.rocket.android.authentication.server.presentation.ServerView
import
chat.rocket.android.authentication.server.ui.ServerFragment
import
chat.rocket.android.authentication.server.ui.ServerFragment
import
chat.rocket.android.core.lifecycle.CancelStrategy
import
chat.rocket.android.core.lifecycle.CancelStrategy
...
...
app/src/main/java/chat/rocket/android/authentication/server/ui/ServerFragment.kt
View file @
0cf32df9
...
@@ -3,7 +3,7 @@ package chat.rocket.android.authentication.server.ui
...
@@ -3,7 +3,7 @@ package chat.rocket.android.authentication.server.ui
import
android.app.AlertDialog
import
android.app.AlertDialog
import
android.net.Uri
import
android.net.Uri
import
android.os.Bundle
import
android.os.Bundle
import
android
.support.v4
.app.Fragment
import
android
x.fragment
.app.Fragment
import
android.view.LayoutInflater
import
android.view.LayoutInflater
import
android.view.View
import
android.view.View
import
android.view.ViewGroup
import
android.view.ViewGroup
...
...
app/src/main/java/chat/rocket/android/authentication/signup/di/SignupFragmentModule.kt
View file @
0cf32df9
package
chat.rocket.android.authentication.signup.di
package
chat.rocket.android.authentication.signup.di
import
android
.arch
.lifecycle.LifecycleOwner
import
android
x
.lifecycle.LifecycleOwner
import
chat.rocket.android.authentication.signup.presentation.SignupView
import
chat.rocket.android.authentication.signup.presentation.SignupView
import
chat.rocket.android.authentication.signup.ui.SignupFragment
import
chat.rocket.android.authentication.signup.ui.SignupFragment
import
chat.rocket.android.core.lifecycle.CancelStrategy
import
chat.rocket.android.core.lifecycle.CancelStrategy
...
...
app/src/main/java/chat/rocket/android/authentication/signup/ui/SignupFragment.kt
View file @
0cf32df9
...
@@ -3,10 +3,9 @@ package chat.rocket.android.authentication.signup.ui
...
@@ -3,10 +3,9 @@ package chat.rocket.android.authentication.signup.ui
import
DrawableHelper
import
DrawableHelper
import
android.os.Build
import
android.os.Build
import
android.os.Bundle
import
android.os.Bundle
import
android
.support.v4
.app.Fragment
import
android
x.fragment
.app.Fragment
import
android.text.style.ClickableSpan
import
android.text.style.ClickableSpan
import
android.view.*
import
android.view.*
import
android.widget.Toast
import
chat.rocket.android.R
import
chat.rocket.android.R
import
chat.rocket.android.authentication.signup.presentation.SignupPresenter
import
chat.rocket.android.authentication.signup.presentation.SignupPresenter
import
chat.rocket.android.authentication.signup.presentation.SignupView
import
chat.rocket.android.authentication.signup.presentation.SignupView
...
...
app/src/main/java/chat/rocket/android/authentication/twofactor/di/TwoFAFragmentModule.kt
View file @
0cf32df9
package
chat.rocket.android.authentication.twofactor.di
package
chat.rocket.android.authentication.twofactor.di
import
android
.arch
.lifecycle.LifecycleOwner
import
android
x
.lifecycle.LifecycleOwner
import
chat.rocket.android.authentication.twofactor.presentation.TwoFAView
import
chat.rocket.android.authentication.twofactor.presentation.TwoFAView
import
chat.rocket.android.authentication.twofactor.ui.TwoFAFragment
import
chat.rocket.android.authentication.twofactor.ui.TwoFAFragment
import
chat.rocket.android.core.lifecycle.CancelStrategy
import
chat.rocket.android.core.lifecycle.CancelStrategy
...
...
app/src/main/java/chat/rocket/android/authentication/twofactor/ui/TwoFAFragment.kt
View file @
0cf32df9
...
@@ -4,7 +4,7 @@ import DrawableHelper
...
@@ -4,7 +4,7 @@ import DrawableHelper
import
android.content.Context
import
android.content.Context
import
android.os.Build
import
android.os.Build
import
android.os.Bundle
import
android.os.Bundle
import
android
.support.v4
.app.Fragment
import
android
x.fragment
.app.Fragment
import
android.view.LayoutInflater
import
android.view.LayoutInflater
import
android.view.View
import
android.view.View
import
android.view.ViewGroup
import
android.view.ViewGroup
...
...
app/src/main/java/chat/rocket/android/authentication/ui/AuthenticationActivity.kt
View file @
0cf32df9
...
@@ -3,8 +3,8 @@ package chat.rocket.android.authentication.ui
...
@@ -3,8 +3,8 @@ package chat.rocket.android.authentication.ui
import
android.content.Context
import
android.content.Context
import
android.content.Intent
import
android.content.Intent
import
android.os.Bundle
import
android.os.Bundle
import
android
.support.v4
.app.Fragment
import
android
x.fragment
.app.Fragment
import
android
.support.v7
.app.AppCompatActivity
import
android
x.appcompat
.app.AppCompatActivity
import
chat.rocket.android.R
import
chat.rocket.android.R
import
chat.rocket.android.authentication.domain.model.LoginDeepLinkInfo
import
chat.rocket.android.authentication.domain.model.LoginDeepLinkInfo
import
chat.rocket.android.authentication.domain.model.getLoginDeepLinkInfo
import
chat.rocket.android.authentication.domain.model.getLoginDeepLinkInfo
...
...
app/src/main/java/chat/rocket/android/chatroom/adapter/AutoCompleteType.kt
View file @
0cf32df9
package
chat.rocket.android.chatroom.adapter
package
chat.rocket.android.chatroom.adapter
import
android
.support
.annotation.IntDef
import
android
x
.annotation.IntDef
const
val
PEOPLE
=
0
const
val
PEOPLE
=
0
const
val
ROOMS
=
1
const
val
ROOMS
=
1
...
...
app/src/main/java/chat/rocket/android/chatroom/adapter/BaseViewHolder.kt
View file @
0cf32df9
package
chat.rocket.android.chatroom.adapter
package
chat.rocket.android.chatroom.adapter
import
android
.support.v7
.widget.RecyclerView
import
android
x.recyclerview
.widget.RecyclerView
import
android.view.MenuItem
import
android.view.MenuItem
import
android.view.View
import
android.view.View
import
android.view.ViewGroup
import
android.view.ViewGroup
...
...
app/src/main/java/chat/rocket/android/chatroom/adapter/ChatRoomAdapter.kt
View file @
0cf32df9
package
chat.rocket.android.chatroom.adapter
package
chat.rocket.android.chatroom.adapter
import
android
.support.v7
.widget.RecyclerView
import
android
x.recyclerview
.widget.RecyclerView
import
android.view.MenuItem
import
android.view.MenuItem
import
android.view.ViewGroup
import
android.view.ViewGroup
import
chat.rocket.android.R
import
chat.rocket.android.R
...
...
app/src/main/java/chat/rocket/android/chatroom/adapter/ColorAttachmentViewHolder.kt
View file @
0cf32df9
package
chat.rocket.android.chatroom.adapter
package
chat.rocket.android.chatroom.adapter
import
android.graphics.drawable.Drawable
import
android.graphics.drawable.Drawable
import
android
.support.v4
.content.ContextCompat
import
android
x.core
.content.ContextCompat
import
android.text.method.LinkMovementMethod
import
android.text.method.LinkMovementMethod
import
android.view.View
import
android.view.View
import
chat.rocket.android.R
import
chat.rocket.android.R
...
...
app/src/main/java/chat/rocket/android/chatroom/adapter/ImageAttachmentViewHolder.kt
View file @
0cf32df9
...
@@ -7,12 +7,11 @@ import android.graphics.Typeface
...
@@ -7,12 +7,11 @@ import android.graphics.Typeface
import
android.media.MediaScannerConnection
import
android.media.MediaScannerConnection
import
android.net.Uri
import
android.net.Uri
import
android.os.Environment
import
android.os.Environment
import
android.support.design.widget
.AppBarLayout
import
com.google.android.material.appbar
.AppBarLayout
import
android
.support.v7
.widget.Toolbar
import
android
x.appcompat
.widget.Toolbar
import
android.text.TextUtils
import
android.text.TextUtils
import
android.util.TypedValue
import
android.util.TypedValue
import
android.view.ContextThemeWrapper
import
android.view.ContextThemeWrapper
import
android.view.Gravity
import
android.view.View
import
android.view.View
import
android.view.ViewGroup
import
android.view.ViewGroup
import
android.widget.ImageView
import
android.widget.ImageView
...
...
app/src/main/java/chat/rocket/android/chatroom/adapter/MessageReactionsAdapter.kt
View file @
0cf32df9
package
chat.rocket.android.chatroom.adapter
package
chat.rocket.android.chatroom.adapter
import
android
.support.v7
.widget.RecyclerView
import
android
x.recyclerview
.widget.RecyclerView
import
android.view.LayoutInflater
import
android.view.LayoutInflater
import
android.view.View
import
android.view.View
import
android.view.ViewGroup
import
android.view.ViewGroup
...
...
app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt
View file @
0cf32df9
package
chat.rocket.android.chatroom.di
package
chat.rocket.android.chatroom.di
import
android
.arch
.lifecycle.LifecycleOwner
import
android
x
.lifecycle.LifecycleOwner
import
chat.rocket.android.chatroom.presentation.ChatRoomNavigator
import
chat.rocket.android.chatroom.presentation.ChatRoomNavigator
import
chat.rocket.android.chatroom.presentation.ChatRoomView
import
chat.rocket.android.chatroom.presentation.ChatRoomView
import
chat.rocket.android.chatroom.ui.ChatRoomActivity
import
chat.rocket.android.chatroom.ui.ChatRoomActivity
...
...
app/src/main/java/chat/rocket/android/chatroom/ui/ActionSnackbar.kt
View file @
0cf32df9
package
chat.rocket.android.chatroom.ui
package
chat.rocket.android.chatroom.ui
import
android.support.design.widget
.BaseTransientBottomBar
import
com.google.android.material.snackbar
.BaseTransientBottomBar
import
android
.support.v4
.view.ViewCompat
import
android
x.core
.view.ViewCompat
import
android.text.Spannable
import
android.text.Spannable
import
android.text.SpannableStringBuilder
import
android.text.SpannableStringBuilder
import
android.view.LayoutInflater
import
android.view.LayoutInflater
...
...
app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomActivity.kt
View file @
0cf32df9
...
@@ -4,8 +4,8 @@ import DrawableHelper
...
@@ -4,8 +4,8 @@ import DrawableHelper
import
android.content.Context
import
android.content.Context
import
android.content.Intent
import
android.content.Intent
import
android.os.Bundle
import
android.os.Bundle
import
android
.support.v4
.app.Fragment
import
android
x.fragment
.app.Fragment
import
android
.support.v7
.app.AppCompatActivity
import
android
x.appcompat
.app.AppCompatActivity
import
chat.rocket.android.R
import
chat.rocket.android.R
import
chat.rocket.android.chatroom.presentation.ChatRoomNavigator
import
chat.rocket.android.chatroom.presentation.ChatRoomNavigator
import
chat.rocket.android.server.domain.GetCurrentServerInteractor
import
chat.rocket.android.server.domain.GetCurrentServerInteractor
...
...
app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
View file @
0cf32df9
...
@@ -8,11 +8,11 @@ import android.content.Intent
...
@@ -8,11 +8,11 @@ import android.content.Intent
import
android.net.Uri
import
android.net.Uri
import
android.os.Bundle
import
android.os.Bundle
import
android.os.Handler
import
android.os.Handler
import
android
.support
.annotation.DrawableRes
import
android
x
.annotation.DrawableRes
import
android
.support.v4
.app.Fragment
import
android
x.fragment
.app.Fragment
import
android
.support.v7
.widget.DefaultItemAnimator
import
android
x.recyclerview
.widget.DefaultItemAnimator
import
android
.support.v7
.widget.LinearLayoutManager
import
android
x.recyclerview
.widget.LinearLayoutManager
import
android
.support.v7
.widget.RecyclerView
import
android
x.recyclerview
.widget.RecyclerView
import
android.text.SpannableStringBuilder
import
android.text.SpannableStringBuilder
import
android.view.*
import
android.view.*
import
androidx.core.text.bold
import
androidx.core.text.bold
...
@@ -497,7 +497,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
...
@@ -497,7 +497,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
override
fun
onEmojiAdded
(
emoji
:
Emoji
)
{
override
fun
onEmojiAdded
(
emoji
:
Emoji
)
{
val
cursorPosition
=
text_message
.
selectionStart
val
cursorPosition
=
text_message
.
selectionStart
if
(
cursorPosition
>
-
1
)
{
if
(
cursorPosition
>
-
1
)
{
text_message
.
text
.
insert
(
cursorPosition
,
EmojiParser
.
parse
(
emoji
.
shortname
))
text_message
.
text
?
.
insert
(
cursorPosition
,
EmojiParser
.
parse
(
emoji
.
shortname
))
text_message
.
setSelection
(
cursorPosition
+
emoji
.
unicode
.
length
)
text_message
.
setSelection
(
cursorPosition
+
emoji
.
unicode
.
length
)
}
}
}
}
...
@@ -505,7 +505,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
...
@@ -505,7 +505,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
override
fun
onNonEmojiKeyPressed
(
keyCode
:
Int
)
{
override
fun
onNonEmojiKeyPressed
(
keyCode
:
Int
)
{
when
(
keyCode
)
{
when
(
keyCode
)
{
KeyEvent
.
KEYCODE_BACK
->
with
(
text_message
)
{
KeyEvent
.
KEYCODE_BACK
->
with
(
text_message
)
{
if
(
selectionStart
>
0
)
text
.
delete
(
selectionStart
-
1
,
selectionStart
)
if
(
selectionStart
>
0
)
text
?
.
delete
(
selectionStart
-
1
,
selectionStart
)
}
}
else
->
throw
IllegalArgumentException
(
"pressed key not expected"
)
else
->
throw
IllegalArgumentException
(
"pressed key not expected"
)
}
}
...
...
app/src/main/java/chat/rocket/android/chatroom/ui/bottomsheet/BottomSheetMenu.kt
View file @
0cf32df9
package
chat.rocket.android.chatroom.ui.bottomsheet
package
chat.rocket.android.chatroom.ui.bottomsheet
import
android.support.design.widg
et.BottomSheetDialog
import
com.google.android.material.bottomshe
et.BottomSheetDialog
import
android
.support.v7
.widget.LinearLayoutManager
import
android
x.recyclerview
.widget.LinearLayoutManager
import
android
.support.v7
.widget.RecyclerView
import
android
x.recyclerview
.widget.RecyclerView
import
android.view.MenuItem
import
android.view.MenuItem
import
ru.whalemare.sheetmenu.SheetMenu
import
ru.whalemare.sheetmenu.SheetMenu
import
ru.whalemare.sheetmenu.adapter.MenuAdapter
import
ru.whalemare.sheetmenu.adapter.MenuAdapter
...
...
app/src/main/java/chat/rocket/android/chatroom/ui/bottomsheet/adapter/ListBottomSheetAdapter.kt
View file @
0cf32df9
package
chat.rocket.android.chatroom.ui.bottomsheet.adapter
package
chat.rocket.android.chatroom.ui.bottomsheet.adapter
import
android.graphics.Color
import
android.graphics.Color
import
android
.support
.annotation.ColorInt
import
android
x
.annotation.ColorInt
import
android
.support
.annotation.IdRes
import
android
x
.annotation.IdRes
import
android.util.SparseIntArray
import
android.util.SparseIntArray
import
android.view.MenuItem
import
android.view.MenuItem
import
chat.rocket.android.R
import
chat.rocket.android.R
...
...
app/src/main/java/chat/rocket/android/chatroom/viewmodel/ViewModelMapper.kt
View file @
0cf32df9
...
@@ -4,7 +4,7 @@ import DateTimeHelper
...
@@ -4,7 +4,7 @@ import DateTimeHelper
import
android.content.Context
import
android.content.Context
import
android.graphics.Color
import
android.graphics.Color
import
android.graphics.Typeface
import
android.graphics.Typeface
import
android
.support.v4
.content.ContextCompat
import
android
x.core
.content.ContextCompat
import
android.text.SpannableStringBuilder
import
android.text.SpannableStringBuilder
import
android.text.style.ForegroundColorSpan
import
android.text.style.ForegroundColorSpan
import
android.text.style.StyleSpan
import
android.text.style.StyleSpan
...
...
app/src/main/java/chat/rocket/android/chatrooms/di/ChatRoomsFragmentModule.kt
View file @
0cf32df9
package
chat.rocket.android.chatrooms.di
package
chat.rocket.android.chatrooms.di
import
android
.arch
.lifecycle.LifecycleOwner
import
android
x
.lifecycle.LifecycleOwner
import
chat.rocket.android.chatrooms.presentation.ChatRoomsView
import
chat.rocket.android.chatrooms.presentation.ChatRoomsView
import
chat.rocket.android.chatrooms.ui.ChatRoomsFragment
import
chat.rocket.android.chatrooms.ui.ChatRoomsFragment
import
chat.rocket.android.dagger.scope.PerFragment
import
chat.rocket.android.dagger.scope.PerFragment
...
...
app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsAdapter.kt
View file @
0cf32df9
...
@@ -4,8 +4,8 @@ import DateTimeHelper
...
@@ -4,8 +4,8 @@ import DateTimeHelper
import
DrawableHelper
import
DrawableHelper
import
android.content.Context
import
android.content.Context
import
android.graphics.Color
import
android.graphics.Color
import
android
.support.v4
.content.ContextCompat
import
android
x.core
.content.ContextCompat
import
android
.support.v7
.widget.RecyclerView
import
android
x.recyclerview
.widget.RecyclerView
import
android.text.SpannableStringBuilder
import
android.text.SpannableStringBuilder
import
android.text.style.ForegroundColorSpan
import
android.text.style.ForegroundColorSpan
import
android.view.View
import
android.view.View
...
...
app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
View file @
0cf32df9
...
@@ -5,12 +5,12 @@ import android.content.Context
...
@@ -5,12 +5,12 @@ import android.content.Context
import
android.content.SharedPreferences
import
android.content.SharedPreferences
import
android.os.Bundle
import
android.os.Bundle
import
android.os.Handler
import
android.os.Handler
import
android
.support.v4
.app.Fragment
import
android
x.fragment
.app.Fragment
import
android
.support.v7
.app.AppCompatActivity
import
android
x.appcompat
.app.AppCompatActivity
import
android
.support.v7.util
.DiffUtil
import
android
x.recyclerview.widget
.DiffUtil
import
android
.support.v7
.widget.DefaultItemAnimator
import
android
x.recyclerview
.widget.DefaultItemAnimator
import
android
.support.v7
.widget.LinearLayoutManager
import
android
x.recyclerview
.widget.LinearLayoutManager
import
android
.support.v7
.widget.SearchView
import
android
x.appcompat
.widget.SearchView
import
android.view.*
import
android.view.*
import
android.widget.CheckBox
import
android.widget.CheckBox
import
android.widget.RadioGroup
import
android.widget.RadioGroup
...
...
app/src/main/java/chat/rocket/android/chatrooms/ui/SimpleSectionedRecyclerViewAdapter.kt
View file @
0cf32df9
package
chat.rocket.android.chatrooms.ui
package
chat.rocket.android.chatrooms.ui
import
android.content.Context
import
android.content.Context
import
android
.support.v7
.widget.RecyclerView
import
android
x.recyclerview
.widget.RecyclerView
import
android.util.SparseArray
import
android.util.SparseArray
import
android.view.LayoutInflater
import
android.view.LayoutInflater
import
android.view.View
import
android.view.View
...
...
app/src/main/java/chat/rocket/android/core/behaviours/MessageView.kt
View file @
0cf32df9
package
chat.rocket.android.core.behaviours
package
chat.rocket.android.core.behaviours
import
android
.support
.annotation.StringRes
import
android
x
.annotation.StringRes
import
chat.rocket.common.util.ifNull
import
chat.rocket.common.util.ifNull
interface
MessageView
{
interface
MessageView
{
...
...
app/src/main/java/chat/rocket/android/core/lifecycle/CancelStrategy.kt
View file @
0cf32df9
package
chat.rocket.android.core.lifecycle
package
chat.rocket.android.core.lifecycle
import
android
.arch
.lifecycle.Lifecycle
import
android
x
.lifecycle.Lifecycle
import
android
.arch
.lifecycle.LifecycleObserver
import
android
x
.lifecycle.LifecycleObserver
import
android
.arch
.lifecycle.LifecycleOwner
import
android
x
.lifecycle.LifecycleOwner
import
android
.arch
.lifecycle.OnLifecycleEvent
import
android
x
.lifecycle.OnLifecycleEvent
import
kotlinx.coroutines.experimental.Job
import
kotlinx.coroutines.experimental.Job
import
javax.inject.Inject
import
javax.inject.Inject
...
...
app/src/main/java/chat/rocket/android/dagger/module/AppModule.kt
View file @
0cf32df9
...
@@ -4,13 +4,11 @@ import android.app.Application
...
@@ -4,13 +4,11 @@ import android.app.Application
import
android.app.NotificationManager
import
android.app.NotificationManager
import
android.app.job.JobInfo
import
android.app.job.JobInfo
import
android.app.job.JobScheduler
import
android.app.job.JobScheduler
import
android.arch.persistence.room.Room
import
android.content.ComponentName
import
android.content.ComponentName
import
android.content.Context
import
android.content.Context
import
android.content.SharedPreferences
import
android.content.SharedPreferences
import
chat.rocket.android.BuildConfig
import
chat.rocket.android.BuildConfig
import
chat.rocket.android.R
import
chat.rocket.android.R
import
chat.rocket.android.app.RocketChatDatabase
import
chat.rocket.android.authentication.infraestructure.SharedPreferencesMultiServerTokenRepository
import
chat.rocket.android.authentication.infraestructure.SharedPreferencesMultiServerTokenRepository
import
chat.rocket.android.authentication.infraestructure.SharedPreferencesTokenRepository
import
chat.rocket.android.authentication.infraestructure.SharedPreferencesTokenRepository
import
chat.rocket.android.chatroom.service.MessageService
import
chat.rocket.android.chatroom.service.MessageService
...
@@ -65,12 +63,6 @@ class AppModule {
...
@@ -65,12 +63,6 @@ class AppModule {
}
}
}
}
@Provides
@Singleton
fun
provideRocketChatDatabase
(
context
:
Application
):
RocketChatDatabase
{
return
Room
.
databaseBuilder
(
context
.
applicationContext
,
RocketChatDatabase
::
class
.
java
,
"rocketchat-db"
).
build
()
}
@Provides
@Provides
fun
provideJob
():
Job
{
fun
provideJob
():
Job
{
return
Job
()
return
Job
()
...
@@ -82,12 +74,6 @@ class AppModule {
...
@@ -82,12 +74,6 @@ class AppModule {
return
application
return
application
}
}
@Provides
@Singleton
fun
provideServerDao
(
database
:
RocketChatDatabase
):
ServerDao
{
return
database
.
serverDao
()
}
@Provides
@Provides
@Singleton
@Singleton
fun
provideHttpLoggingInterceptor
():
HttpLoggingInterceptor
{
fun
provideHttpLoggingInterceptor
():
HttpLoggingInterceptor
{
...
...
app/src/main/java/chat/rocket/android/helper/AndroidPermissionsHelper.kt
View file @
0cf32df9
...
@@ -3,8 +3,8 @@ package chat.rocket.android.helper
...
@@ -3,8 +3,8 @@ package chat.rocket.android.helper
import
android.app.Activity
import
android.app.Activity
import
android.content.Context
import
android.content.Context
import
android.content.pm.PackageManager
import
android.content.pm.PackageManager
import
android
.support.v4
.app.ActivityCompat
import
android
x.core
.app.ActivityCompat
import
android
.support.v4
.content.ContextCompat
import
android
x.core
.content.ContextCompat
object
AndroidPermissionsHelper
{
object
AndroidPermissionsHelper
{
...
...
app/src/main/java/chat/rocket/android/helper/EndlessRecyclerViewScrollListener.kt
View file @
0cf32df9
package
chat.rocket.android.helper
package
chat.rocket.android.helper
import
android
.support.v7
.widget.GridLayoutManager
import
android
x.recyclerview
.widget.GridLayoutManager
import
android
.support.v7
.widget.LinearLayoutManager
import
android
x.recyclerview
.widget.LinearLayoutManager
import
android
.support.v7
.widget.RecyclerView
import
android
x.recyclerview
.widget.RecyclerView
import
android
.support.v7
.widget.StaggeredGridLayoutManager
import
android
x.recyclerview
.widget.StaggeredGridLayoutManager
/**
/**
* Info: https://github.com/codepath/android_guides/wiki/Endless-Scrolling-with-AdapterViews-and-RecyclerView
* Info: https://github.com/codepath/android_guides/wiki/Endless-Scrolling-with-AdapterViews-and-RecyclerView
...
@@ -45,7 +45,7 @@ abstract class EndlessRecyclerViewScrollListener : RecyclerView.OnScrollListener
...
@@ -45,7 +45,7 @@ abstract class EndlessRecyclerViewScrollListener : RecyclerView.OnScrollListener
// This happens many times a second during a scroll, so be wary of the code you place here.
// This happens many times a second during a scroll, so be wary of the code you place here.
// We are given a few useful parameters to help us work out if we need to load some more data,
// We are given a few useful parameters to help us work out if we need to load some more data,
// but first we check if we are waiting for the previous load to finish.
// but first we check if we are waiting for the previous load to finish.
override
fun
onScrolled
(
view
:
RecyclerView
?
,
dx
:
Int
,
dy
:
Int
)
{
override
fun
onScrolled
(
view
:
RecyclerView
,
dx
:
Int
,
dy
:
Int
)
{
var
lastVisibleItemPosition
=
0
var
lastVisibleItemPosition
=
0
val
totalItemCount
=
layoutManager
.
itemCount
val
totalItemCount
=
layoutManager
.
itemCount
...
@@ -106,5 +106,5 @@ abstract class EndlessRecyclerViewScrollListener : RecyclerView.OnScrollListener
...
@@ -106,5 +106,5 @@ abstract class EndlessRecyclerViewScrollListener : RecyclerView.OnScrollListener
}
}
// Defines the process for actually loading more data based on page
// Defines the process for actually loading more data based on page
abstract
fun
onLoadMore
(
page
:
Int
,
totalItemsCount
:
Int
,
recyclerView
:
RecyclerView
?
)
abstract
fun
onLoadMore
(
page
:
Int
,
totalItemsCount
:
Int
,
recyclerView
:
RecyclerView
)
}
}
\ No newline at end of file
app/src/main/java/chat/rocket/android/helper/MessageParser.kt
View file @
0cf32df9
...
@@ -6,7 +6,7 @@ import android.graphics.Canvas
...
@@ -6,7 +6,7 @@ import android.graphics.Canvas
import
android.graphics.Paint
import
android.graphics.Paint
import
android.graphics.RectF
import
android.graphics.RectF
import
android.net.Uri
import
android.net.Uri
import
android
.support.v4
.content.res.ResourcesCompat
import
android
x.core
.content.res.ResourcesCompat
import
android.text.Spanned
import
android.text.Spanned
import
android.text.style.ClickableSpan
import
android.text.style.ClickableSpan
import
android.text.style.ReplacementSpan
import
android.text.style.ReplacementSpan
...
...
app/src/main/java/chat/rocket/android/main/adapter/AccountViewHolder.kt
View file @
0cf32df9
package
chat.rocket.android.main.adapter
package
chat.rocket.android.main.adapter
import
android
.support.v7
.widget.RecyclerView
import
android
x.recyclerview
.widget.RecyclerView
import
android.view.View
import
android.view.View
import
chat.rocket.android.server.domain.model.Account
import
chat.rocket.android.server.domain.model.Account
import
kotlinx.android.synthetic.main.item_account.view.*
import
kotlinx.android.synthetic.main.item_account.view.*
...
...
app/src/main/java/chat/rocket/android/main/adapter/AccountsAdapter.kt
View file @
0cf32df9
package
chat.rocket.android.main.adapter
package
chat.rocket.android.main.adapter
import
android
.support.v7
.widget.RecyclerView
import
android
x.recyclerview
.widget.RecyclerView
import
android.view.ViewGroup
import
android.view.ViewGroup
import
chat.rocket.android.R
import
chat.rocket.android.R
import
chat.rocket.android.server.domain.model.Account
import
chat.rocket.android.server.domain.model.Account
...
...
app/src/main/java/chat/rocket/android/main/adapter/AddAccountViewHolder.kt
View file @
0cf32df9
package
chat.rocket.android.main.adapter
package
chat.rocket.android.main.adapter
import
android
.support.v7
.widget.RecyclerView
import
android
x.recyclerview
.widget.RecyclerView
import
android.view.View
import
android.view.View
class
AddAccountViewHolder
(
itemView
:
View
)
:
RecyclerView
.
ViewHolder
(
itemView
)
class
AddAccountViewHolder
(
itemView
:
View
)
:
RecyclerView
.
ViewHolder
(
itemView
)
\ No newline at end of file
app/src/main/java/chat/rocket/android/main/adapter/StatusViewHolder.kt
View file @
0cf32df9
package
chat.rocket.android.main.adapter
package
chat.rocket.android.main.adapter
import
android
.support.v7
.widget.RecyclerView
import
android
x.recyclerview
.widget.RecyclerView
import
android.view.View
import
android.view.View
import
chat.rocket.common.model.UserStatus
import
chat.rocket.common.model.UserStatus
import
kotlinx.android.synthetic.main.item_change_status.view.*
import
kotlinx.android.synthetic.main.item_change_status.view.*
...
...
app/src/main/java/chat/rocket/android/main/di/MainModule.kt
View file @
0cf32df9
package
chat.rocket.android.main.di
package
chat.rocket.android.main.di
import
android
.arch
.lifecycle.LifecycleOwner
import
android
x
.lifecycle.LifecycleOwner
import
android.content.Context
import
android.content.Context
import
chat.rocket.android.core.lifecycle.CancelStrategy
import
chat.rocket.android.core.lifecycle.CancelStrategy
import
chat.rocket.android.dagger.scope.PerActivity
import
chat.rocket.android.dagger.scope.PerActivity
...
...
app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
View file @
0cf32df9
...
@@ -3,9 +3,9 @@ package chat.rocket.android.main.ui
...
@@ -3,9 +3,9 @@ package chat.rocket.android.main.ui
import
android.app.Activity
import
android.app.Activity
import
android.app.AlertDialog
import
android.app.AlertDialog
import
android.os.Bundle
import
android.os.Bundle
import
android
.support.v4
.app.Fragment
import
android
x.fragment
.app.Fragment
import
android
.support.v7
.app.AppCompatActivity
import
android
x.appcompat
.app.AppCompatActivity
import
android
.support.v7
.widget.LinearLayoutManager
import
android
x.recyclerview
.widget.LinearLayoutManager
import
android.view.Gravity
import
android.view.Gravity
import
android.view.MenuItem
import
android.view.MenuItem
import
android.view.View
import
android.view.View
...
...
app/src/main/java/chat/rocket/android/members/adapter/MembersAdapter.kt
View file @
0cf32df9
package
chat.rocket.android.members.adapter
package
chat.rocket.android.members.adapter
import
android
.support.v7
.widget.RecyclerView
import
android
x.recyclerview
.widget.RecyclerView
import
android.view.View
import
android.view.View
import
android.view.ViewGroup
import
android.view.ViewGroup
import
chat.rocket.android.R
import
chat.rocket.android.R
...
...
app/src/main/java/chat/rocket/android/members/di/MembersFragmentModule.kt
View file @
0cf32df9
package
chat.rocket.android.members.di
package
chat.rocket.android.members.di
import
android
.arch
.lifecycle.LifecycleOwner
import
android
x
.lifecycle.LifecycleOwner
import
chat.rocket.android.chatroom.ui.ChatRoomActivity
import
chat.rocket.android.chatroom.ui.ChatRoomActivity
import
chat.rocket.android.core.lifecycle.CancelStrategy
import
chat.rocket.android.core.lifecycle.CancelStrategy
import
chat.rocket.android.dagger.scope.PerFragment
import
chat.rocket.android.dagger.scope.PerFragment
...
...
app/src/main/java/chat/rocket/android/members/ui/MemberBottomSheetFragment.kt
View file @
0cf32df9
package
chat.rocket.android.members.ui
package
chat.rocket.android.members.ui
import
android.os.Bundle
import
android.os.Bundle
import
android.support.design.widg
et.BottomSheetDialogFragment
import
com.google.android.material.bottomshe
et.BottomSheetDialogFragment
import
android.view.LayoutInflater
import
android.view.LayoutInflater
import
android.view.View
import
android.view.View
import
android.view.ViewGroup
import
android.view.ViewGroup
...
@@ -11,7 +11,11 @@ import chat.rocket.android.util.extensions.setVisible
...
@@ -11,7 +11,11 @@ import chat.rocket.android.util.extensions.setVisible
import
chat.rocket.android.util.extensions.textContent
import
chat.rocket.android.util.extensions.textContent
import
kotlinx.android.synthetic.main.fragment_member_bottom_sheet.*
import
kotlinx.android.synthetic.main.fragment_member_bottom_sheet.*
fun
newInstance
(
avatarUri
:
String
,
realName
:
String
,
username
:
String
,
email
:
String
,
utcOffset
:
String
):
BottomSheetDialogFragment
{
fun
newInstance
(
avatarUri
:
String
,
realName
:
String
,
username
:
String
,
email
:
String
,
utcOffset
:
String
):
BottomSheetDialogFragment
{
return
MemberBottomSheetFragment
().
apply
{
return
MemberBottomSheetFragment
().
apply
{
arguments
=
Bundle
(
1
).
apply
{
arguments
=
Bundle
(
1
).
apply
{
putString
(
BUNDLE_AVATAR_URI
,
avatarUri
)
putString
(
BUNDLE_AVATAR_URI
,
avatarUri
)
...
...
app/src/main/java/chat/rocket/android/members/ui/MembersFragment.kt
View file @
0cf32df9
package
chat.rocket.android.members.ui
package
chat.rocket.android.members.ui
import
android.os.Bundle
import
android.os.Bundle
import
android
.support.v4
.app.Fragment
import
android
x.fragment
.app.Fragment
import
android
.support.v7
.app.AppCompatActivity
import
android
x.appcompat
.app.AppCompatActivity
import
android
.support.v7
.widget.LinearLayoutManager
import
android
x.recyclerview
.widget.LinearLayoutManager
import
android
.support.v7
.widget.RecyclerView
import
android
x.recyclerview
.widget.RecyclerView
import
android.view.LayoutInflater
import
android.view.LayoutInflater
import
android.view.MenuItem
import
android.view.MenuItem
import
android.view.View
import
android.view.View
...
...
app/src/main/java/chat/rocket/android/pinnedmessages/di/PinnedMessagesFragmentModule.kt
View file @
0cf32df9
package
chat.rocket.android.chatroom.di
package
chat.rocket.android.chatroom.di
import
android
.arch
.lifecycle.LifecycleOwner
import
android
x
.lifecycle.LifecycleOwner
import
chat.rocket.android.core.lifecycle.CancelStrategy
import
chat.rocket.android.core.lifecycle.CancelStrategy
import
chat.rocket.android.dagger.scope.PerFragment
import
chat.rocket.android.dagger.scope.PerFragment
import
chat.rocket.android.pinnedmessages.presentation.PinnedMessagesView
import
chat.rocket.android.pinnedmessages.presentation.PinnedMessagesView
...
...
app/src/main/java/chat/rocket/android/pinnedmessages/ui/PinnedMessagesFragment.kt
View file @
0cf32df9
package
chat.rocket.android.pinnedmessages.ui
package
chat.rocket.android.pinnedmessages.ui
import
android.os.Bundle
import
android.os.Bundle
import
android.support.v4.app.Fragment
import
androidx.fragment.app.Fragment
import
android.support.v7.app.AppCompatActivity
import
androidx.recyclerview.widget.DefaultItemAnimator
import
android.support.v7.widget.DefaultItemAnimator
import
androidx.recyclerview.widget.LinearLayoutManager
import
android.support.v7.widget.LinearLayoutManager
import
androidx.recyclerview.widget.RecyclerView
import
android.support.v7.widget.RecyclerView
import
android.view.LayoutInflater
import
android.view.LayoutInflater
import
android.view.View
import
android.view.View
import
android.view.ViewGroup
import
android.view.ViewGroup
...
@@ -72,12 +71,12 @@ class PinnedMessagesFragment : Fragment(), PinnedMessagesView {
...
@@ -72,12 +71,12 @@ class PinnedMessagesFragment : Fragment(), PinnedMessagesView {
if
(
recycler_view_pinned
.
adapter
==
null
){
if
(
recycler_view_pinned
.
adapter
==
null
){
adapter
=
ChatRoomAdapter
(
chatRoomType
,
""
,
null
,
false
)
adapter
=
ChatRoomAdapter
(
chatRoomType
,
""
,
null
,
false
)
recycler_view_pinned
.
adapter
=
adapter
recycler_view_pinned
.
adapter
=
adapter
val
linearLayoutManager
=
LinearLayoutManager
(
context
,
LinearLayoutManager
.
VERTICAL
,
false
)
val
linearLayoutManager
=
LinearLayoutManager
(
context
,
LinearLayoutManager
.
VERTICAL
,
false
)
recycler_view_pinned
.
layoutManager
=
linearLayoutManager
recycler_view_pinned
.
layoutManager
=
linearLayoutManager
recycler_view_pinned
.
itemAnimator
=
DefaultItemAnimator
()
recycler_view_pinned
.
itemAnimator
=
DefaultItemAnimator
()
if
(
pinnedMessages
.
size
>
10
){
if
(
pinnedMessages
.
size
>
10
){
recycler_view_pinned
.
addOnScrollListener
(
object
:
EndlessRecyclerViewScrollListener
(
linearLayoutManager
){
recycler_view_pinned
.
addOnScrollListener
(
object
:
EndlessRecyclerViewScrollListener
(
linearLayoutManager
){
override
fun
onLoadMore
(
page
:
Int
,
totalItemsCount
:
Int
,
recyclerView
:
RecyclerView
?
)
{
override
fun
onLoadMore
(
page
:
Int
,
totalItemsCount
:
Int
,
recyclerView
:
RecyclerView
)
{
presenter
.
loadPinnedMessages
(
chatRoomId
)
presenter
.
loadPinnedMessages
(
chatRoomId
)
}
}
...
...
app/src/main/java/chat/rocket/android/profile/di/ProfileFragmentModule.kt
View file @
0cf32df9
package
chat.rocket.android.profile.di
package
chat.rocket.android.profile.di
import
android
.arch
.lifecycle.LifecycleOwner
import
android
x
.lifecycle.LifecycleOwner
import
chat.rocket.android.dagger.scope.PerFragment
import
chat.rocket.android.dagger.scope.PerFragment
import
chat.rocket.android.profile.presentation.ProfileView
import
chat.rocket.android.profile.presentation.ProfileView
import
chat.rocket.android.profile.ui.ProfileFragment
import
chat.rocket.android.profile.ui.ProfileFragment
...
...
app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt
View file @
0cf32df9
...
@@ -3,8 +3,8 @@ package chat.rocket.android.profile.ui
...
@@ -3,8 +3,8 @@ package chat.rocket.android.profile.ui
import
DrawableHelper
import
DrawableHelper
import
android.os.Build
import
android.os.Build
import
android.os.Bundle
import
android.os.Bundle
import
android
.support.v4
.app.Fragment
import
android
x.fragment
.app.Fragment
import
android
.support.v7
.view.ActionMode
import
android
x.appcompat
.view.ActionMode
import
android.view.*
import
android.view.*
import
chat.rocket.android.R
import
chat.rocket.android.R
import
chat.rocket.android.main.ui.MainActivity
import
chat.rocket.android.main.ui.MainActivity
...
...
app/src/main/java/chat/rocket/android/push/DirectReplyReceiver.kt
View file @
0cf32df9
...
@@ -4,8 +4,8 @@ import android.app.NotificationManager
...
@@ -4,8 +4,8 @@ import android.app.NotificationManager
import
android.content.BroadcastReceiver
import
android.content.BroadcastReceiver
import
android.content.Context
import
android.content.Context
import
android.content.Intent
import
android.content.Intent
import
android
.support.v4
.app.NotificationManagerCompat
import
android
x.core
.app.NotificationManagerCompat
import
android
.support.v4
.app.RemoteInput
import
android
x.core
.app.RemoteInput
import
android.widget.Toast
import
android.widget.Toast
import
chat.rocket.android.R
import
chat.rocket.android.R
import
chat.rocket.android.server.infraestructure.ConnectionManagerFactory
import
chat.rocket.android.server.infraestructure.ConnectionManagerFactory
...
...
app/src/main/java/chat/rocket/android/push/PushManager.kt
View file @
0cf32df9
...
@@ -12,10 +12,10 @@ import android.os.Build
...
@@ -12,10 +12,10 @@ import android.os.Build
import
android.os.Bundle
import
android.os.Bundle
import
android.os.Parcel
import
android.os.Parcel
import
android.os.Parcelable
import
android.os.Parcelable
import
android
.support
.annotation.RequiresApi
import
android
x
.annotation.RequiresApi
import
android
.support.v4
.app.NotificationCompat
import
android
x.core
.app.NotificationCompat
import
android
.support.v4
.app.NotificationManagerCompat
import
android
x.core
.app.NotificationManagerCompat
import
android
.support.v4
.app.RemoteInput
import
android
x.core
.app.RemoteInput
import
android.text.Html
import
android.text.Html
import
android.text.Spanned
import
android.text.Spanned
import
chat.rocket.android.R
import
chat.rocket.android.R
...
...
app/src/main/java/chat/rocket/android/server/di/ChangeServerModule.kt
View file @
0cf32df9
package
chat.rocket.android.server.di
package
chat.rocket.android.server.di
import
android
.arch
.lifecycle.LifecycleOwner
import
android
x
.lifecycle.LifecycleOwner
import
chat.rocket.android.core.lifecycle.CancelStrategy
import
chat.rocket.android.core.lifecycle.CancelStrategy
import
chat.rocket.android.dagger.scope.PerActivity
import
chat.rocket.android.dagger.scope.PerActivity
import
chat.rocket.android.server.presentation.ChangeServerNavigator
import
chat.rocket.android.server.presentation.ChangeServerNavigator
...
...
app/src/main/java/chat/rocket/android/server/infraestructure/ServerDao.kt
deleted
100644 → 0
View file @
9e70822c
package
chat.rocket.android.server.infraestructure
import
android.arch.persistence.room.*
import
io.reactivex.Single
@Dao
interface
ServerDao
{
@Query
(
"SELECT * FROM server"
)
fun
getServers
():
Single
<
List
<
ServerEntity
>>
@Insert
(
onConflict
=
OnConflictStrategy
.
FAIL
)
fun
insertServer
(
serverEntity
:
ServerEntity
)
@Update
fun
updateServer
(
serverEntity
:
ServerEntity
)
@Delete
fun
deleteServer
(
serverEntity
:
ServerEntity
)
@Query
(
"SELECT * FROM server WHERE id = :serverId"
)
fun
getServer
(
serverId
:
Long
?):
Single
<
ServerEntity
>
}
app/src/main/java/chat/rocket/android/server/infraestructure/ServerEntity.kt
deleted
100644 → 0
View file @
9e70822c
package
chat.rocket.android.server.infraestructure
import
android.arch.persistence.room.Entity
import
android.arch.persistence.room.Index
import
android.arch.persistence.room.PrimaryKey
@Entity
(
tableName
=
"server"
,
indices
=
[(
Index
(
value
=
[
"host"
],
unique
=
true
))])
data class
ServerEntity
(
@PrimaryKey
(
autoGenerate
=
true
)
val
id
:
Long
,
val
name
:
String
,
val
host
:
String
,
val
avatar
:
String
)
\ No newline at end of file
app/src/main/java/chat/rocket/android/server/infraestructure/ServerEntityMapper.kt
deleted
100644 → 0
View file @
9e70822c
package
chat.rocket.android.server.infraestructure
import
chat.rocket.android.server.domain.model.Server
import
chat.rocket.android.util.DataToDomain
class
ServerEntityMapper
:
DataToDomain
<
ServerEntity
,
Server
>
{
override
fun
translate
(
data
:
ServerEntity
):
Server
{
return
Server
(
data
.
id
,
data
.
name
,
data
.
host
,
data
.
avatar
)
}
}
app/src/main/java/chat/rocket/android/server/ui/ChangeServerActivity.kt
View file @
0cf32df9
...
@@ -4,7 +4,7 @@ import android.app.ProgressDialog
...
@@ -4,7 +4,7 @@ import android.app.ProgressDialog
import
android.content.Context
import
android.content.Context
import
android.content.Intent
import
android.content.Intent
import
android.os.Bundle
import
android.os.Bundle
import
android
.support.v7
.app.AppCompatActivity
import
android
x.appcompat
.app.AppCompatActivity
import
chat.rocket.android.server.presentation.ChangeServerPresenter
import
chat.rocket.android.server.presentation.ChangeServerPresenter
import
chat.rocket.android.server.presentation.ChangeServerView
import
chat.rocket.android.server.presentation.ChangeServerView
import
chat.rocket.android.util.extensions.showToast
import
chat.rocket.android.util.extensions.showToast
...
...
app/src/main/java/chat/rocket/android/settings/about/ui/AboutActivity.kt
View file @
0cf32df9
package
chat.rocket.android.settings.about.ui
package
chat.rocket.android.settings.about.ui
import
android.os.Bundle
import
android.os.Bundle
import
android
.support.v7
.app.AppCompatActivity
import
android
x.appcompat
.app.AppCompatActivity
import
chat.rocket.android.BuildConfig
import
chat.rocket.android.BuildConfig
import
chat.rocket.android.R
import
chat.rocket.android.R
import
chat.rocket.android.util.extensions.textContent
import
chat.rocket.android.util.extensions.textContent
...
...
app/src/main/java/chat/rocket/android/settings/di/SettingsFragmentModule.kt
View file @
0cf32df9
package
chat.rocket.android.settings.di
package
chat.rocket.android.settings.di
import
android
.arch
.lifecycle.LifecycleOwner
import
android
x
.lifecycle.LifecycleOwner
import
chat.rocket.android.core.lifecycle.CancelStrategy
import
chat.rocket.android.core.lifecycle.CancelStrategy
import
chat.rocket.android.dagger.scope.PerFragment
import
chat.rocket.android.dagger.scope.PerFragment
import
chat.rocket.android.settings.presentation.SettingsView
import
chat.rocket.android.settings.presentation.SettingsView
...
...
app/src/main/java/chat/rocket/android/settings/password/di/PasswordFragmentModule.kt
View file @
0cf32df9
package
chat.rocket.android.settings.password.di
package
chat.rocket.android.settings.password.di
import
android
.arch
.lifecycle.LifecycleOwner
import
android
x
.lifecycle.LifecycleOwner
import
chat.rocket.android.core.lifecycle.CancelStrategy
import
chat.rocket.android.core.lifecycle.CancelStrategy
import
chat.rocket.android.dagger.scope.PerFragment
import
chat.rocket.android.dagger.scope.PerFragment
import
chat.rocket.android.settings.password.presentation.PasswordView
import
chat.rocket.android.settings.password.presentation.PasswordView
...
...
app/src/main/java/chat/rocket/android/settings/password/ui/PasswordActivity.kt
View file @
0cf32df9
package
chat.rocket.android.settings.password.ui
package
chat.rocket.android.settings.password.ui
import
android.os.Bundle
import
android.os.Bundle
import
android
.support.v4
.app.Fragment
import
android
x.fragment
.app.Fragment
import
android
.support.v7
.app.AppCompatActivity
import
android
x.appcompat
.app.AppCompatActivity
import
chat.rocket.android.R
import
chat.rocket.android.R
import
chat.rocket.android.chatrooms.ui.ChatRoomsFragment
import
chat.rocket.android.chatrooms.ui.ChatRoomsFragment
import
chat.rocket.android.util.extensions.addFragment
import
chat.rocket.android.util.extensions.addFragment
...
...
app/src/main/java/chat/rocket/android/settings/password/ui/PasswordFragment.kt
View file @
0cf32df9
package
chat.rocket.android.settings.password.ui
package
chat.rocket.android.settings.password.ui
import
android.os.Bundle
import
android.os.Bundle
import
android
.support.v4
.app.Fragment
import
android
x.fragment
.app.Fragment
import
android.view.*
import
android.view.*
import
android.widget.Toast
import
android.widget.Toast
import
chat.rocket.android.R
import
chat.rocket.android.R
...
@@ -10,7 +10,7 @@ import chat.rocket.android.settings.password.presentation.PasswordView
...
@@ -10,7 +10,7 @@ import chat.rocket.android.settings.password.presentation.PasswordView
import
chat.rocket.android.util.extensions.asObservable
import
chat.rocket.android.util.extensions.asObservable
import
chat.rocket.android.util.extensions.inflate
import
chat.rocket.android.util.extensions.inflate
import
chat.rocket.android.util.extensions.textContent
import
chat.rocket.android.util.extensions.textContent
import
android
.support.v7
.view.ActionMode
import
android
x.appcompat
.view.ActionMode
import
chat.rocket.android.util.extensions.ui
import
chat.rocket.android.util.extensions.ui
import
dagger.android.support.AndroidSupportInjection
import
dagger.android.support.AndroidSupportInjection
import
io.reactivex.disposables.CompositeDisposable
import
io.reactivex.disposables.CompositeDisposable
...
@@ -19,7 +19,7 @@ import io.reactivex.rxkotlin.Observables
...
@@ -19,7 +19,7 @@ import io.reactivex.rxkotlin.Observables
import
kotlinx.android.synthetic.main.fragment_password.*
import
kotlinx.android.synthetic.main.fragment_password.*
import
javax.inject.Inject
import
javax.inject.Inject
class
PasswordFragment
:
Fragment
(),
PasswordView
,
android
.
support
.
v7
.
view
.
ActionMode
.
Callback
{
class
PasswordFragment
:
Fragment
(),
PasswordView
,
ActionMode
.
Callback
{
@Inject
lateinit
var
presenter
:
PasswordPresenter
@Inject
lateinit
var
presenter
:
PasswordPresenter
private
var
actionMode
:
ActionMode
?
=
null
private
var
actionMode
:
ActionMode
?
=
null
private
val
disposables
=
CompositeDisposable
()
private
val
disposables
=
CompositeDisposable
()
...
...
app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
View file @
0cf32df9
...
@@ -2,8 +2,8 @@ package chat.rocket.android.settings.ui
...
@@ -2,8 +2,8 @@ package chat.rocket.android.settings.ui
import
android.content.Intent
import
android.content.Intent
import
android.os.Bundle
import
android.os.Bundle
import
android
.support.v4
.app.Fragment
import
android
x.fragment
.app.Fragment
import
android
.support.v7
.app.AppCompatActivity
import
android
x.appcompat
.app.AppCompatActivity
import
android.view.LayoutInflater
import
android.view.LayoutInflater
import
android.view.View
import
android.view.View
import
android.view.ViewGroup
import
android.view.ViewGroup
...
...
app/src/main/java/chat/rocket/android/util/extensions/Animation.kt
View file @
0cf32df9
...
@@ -8,7 +8,7 @@ import android.content.Context
...
@@ -8,7 +8,7 @@ import android.content.Context
import
android.os.Build
import
android.os.Build
import
android.os.VibrationEffect
import
android.os.VibrationEffect
import
android.os.Vibrator
import
android.os.Vibrator
import
android
.support.v4
.app.Fragment
import
android
x.fragment
.app.Fragment
import
android.view.View
import
android.view.View
import
android.view.ViewAnimationUtils
import
android.view.ViewAnimationUtils
import
android.view.animation.AccelerateInterpolator
import
android.view.animation.AccelerateInterpolator
...
...
app/src/main/java/chat/rocket/android/util/extensions/Fragment.kt
View file @
0cf32df9
package
chat.rocket.android.util.extensions
package
chat.rocket.android.util.extensions
import
android.os.Looper
import
android.os.Looper
import
android
.support.v4
.app.Fragment
import
android
x.fragment
.app.Fragment
import
android
.support.v4
.app.FragmentActivity
import
android
x.fragment
.app.FragmentActivity
import
kotlinx.coroutines.experimental.Job
import
kotlinx.coroutines.experimental.Job
import
kotlinx.coroutines.experimental.android.UI
import
kotlinx.coroutines.experimental.android.UI
import
kotlinx.coroutines.experimental.launch
import
kotlinx.coroutines.experimental.launch
...
...
app/src/main/java/chat/rocket/android/util/extensions/Ui.kt
View file @
0cf32df9
...
@@ -2,12 +2,12 @@ package chat.rocket.android.util.extensions
...
@@ -2,12 +2,12 @@ package chat.rocket.android.util.extensions
import
android.app.Activity
import
android.app.Activity
import
android.content.Context
import
android.content.Context
import
android
.support
.annotation.LayoutRes
import
android
x
.annotation.LayoutRes
import
android
.support
.annotation.StringRes
import
android
x
.annotation.StringRes
import
android
.support.v4
.app.Fragment
import
android
x.fragment
.app.Fragment
import
android
.support.v7
.app.AppCompatActivity
import
android
x.appcompat
.app.AppCompatActivity
import
android
.support.v7
.widget.LinearLayoutManager
import
android
x.recyclerview
.widget.LinearLayoutManager
import
android
.support.v7
.widget.RecyclerView
import
android
x.recyclerview
.widget.RecyclerView
import
android.view.LayoutInflater
import
android.view.LayoutInflater
import
android.view.View
import
android.view.View
import
android.view.ViewGroup
import
android.view.ViewGroup
...
...
app/src/main/java/chat/rocket/android/util/extensions/View.kt
View file @
0cf32df9
package
chat.rocket.android.util.extensions
package
chat.rocket.android.util.extensions
import
android.net.Uri
import
android.net.Uri
import
android
.support
.customtabs.CustomTabsIntent
import
android
x.browser
.customtabs.CustomTabsIntent
import
android
.support.v4
.content.res.ResourcesCompat
import
android
x.core
.content.res.ResourcesCompat
import
android.view.View
import
android.view.View
import
chat.rocket.android.R
import
chat.rocket.android.R
...
...
app/src/main/java/chat/rocket/android/webview/cas/ui/CasWebViewActivity.kt
View file @
0cf32df9
...
@@ -6,7 +6,7 @@ import android.content.Context
...
@@ -6,7 +6,7 @@ import android.content.Context
import
android.content.Intent
import
android.content.Intent
import
android.graphics.Bitmap
import
android.graphics.Bitmap
import
android.os.Bundle
import
android.os.Bundle
import
android
.support.v7
.app.AppCompatActivity
import
android
x.appcompat
.app.AppCompatActivity
import
android.webkit.WebView
import
android.webkit.WebView
import
android.webkit.WebViewClient
import
android.webkit.WebViewClient
import
chat.rocket.android.R
import
chat.rocket.android.R
...
...
app/src/main/java/chat/rocket/android/webview/oauth/ui/OauthWebViewActivity.kt
View file @
0cf32df9
...
@@ -5,7 +5,7 @@ import android.app.Activity
...
@@ -5,7 +5,7 @@ import android.app.Activity
import
android.content.Context
import
android.content.Context
import
android.content.Intent
import
android.content.Intent
import
android.os.Bundle
import
android.os.Bundle
import
android
.support.v7
.app.AppCompatActivity
import
android
x.appcompat
.app.AppCompatActivity
import
android.webkit.WebView
import
android.webkit.WebView
import
android.webkit.WebViewClient
import
android.webkit.WebViewClient
import
androidx.core.net.toUri
import
androidx.core.net.toUri
...
...
app/src/main/java/chat/rocket/android/webview/ui/WebViewActivity.kt
View file @
0cf32df9
...
@@ -4,7 +4,7 @@ import android.annotation.SuppressLint
...
@@ -4,7 +4,7 @@ import android.annotation.SuppressLint
import
android.content.Context
import
android.content.Context
import
android.content.Intent
import
android.content.Intent
import
android.os.Bundle
import
android.os.Bundle
import
android
.support.v7
.app.AppCompatActivity
import
android
x.appcompat
.app.AppCompatActivity
import
android.webkit.WebView
import
android.webkit.WebView
import
android.webkit.WebViewClient
import
android.webkit.WebViewClient
import
chat.rocket.android.R
import
chat.rocket.android.R
...
...
app/src/main/java/chat/rocket/android/widget/DividerItemDecoration.kt
View file @
0cf32df9
...
@@ -3,9 +3,9 @@ package chat.rocket.android.widget
...
@@ -3,9 +3,9 @@ package chat.rocket.android.widget
import
android.content.Context
import
android.content.Context
import
android.graphics.Canvas
import
android.graphics.Canvas
import
android.graphics.drawable.Drawable
import
android.graphics.drawable.Drawable
import
android
.support
.annotation.DrawableRes
import
android
x
.annotation.DrawableRes
import
android
.support.v4
.content.ContextCompat
import
android
x.core
.content.ContextCompat
import
android
.support.v7
.widget.RecyclerView
import
android
x.recyclerview
.widget.RecyclerView
/**
/**
* Adds a default or custom divider to specific item views from the adapter's data set.
* Adds a default or custom divider to specific item views from the adapter's data set.
...
...
app/src/main/java/chat/rocket/android/widget/autocompletion/ui/BaseSuggestionViewHolder.kt
View file @
0cf32df9
package
chat.rocket.android.widget.autocompletion.ui
package
chat.rocket.android.widget.autocompletion.ui
import
android
.support.v7
.widget.RecyclerView
import
android
x.recyclerview
.widget.RecyclerView
import
android.view.View
import
android.view.View
import
chat.rocket.android.widget.autocompletion.model.SuggestionModel
import
chat.rocket.android.widget.autocompletion.model.SuggestionModel
...
...
app/src/main/java/chat/rocket/android/widget/autocompletion/ui/PopupRecyclerView.kt
View file @
0cf32df9
package
chat.rocket.android.widget.autocompletion.ui
package
chat.rocket.android.widget.autocompletion.ui
import
android.content.Context
import
android.content.Context
import
android
.support.v7
.widget.RecyclerView
import
android
x.recyclerview
.widget.RecyclerView
import
android.util.AttributeSet
import
android.util.AttributeSet
import
android.util.DisplayMetrics
import
android.util.DisplayMetrics
import
android.view.WindowManager
import
android.view.WindowManager
...
@@ -11,9 +11,9 @@ import chat.rocket.android.R
...
@@ -11,9 +11,9 @@ import chat.rocket.android.R
internal
class
PopupRecyclerView
:
RecyclerView
{
internal
class
PopupRecyclerView
:
RecyclerView
{
private
var
displayWidth
:
Int
=
0
private
var
displayWidth
:
Int
=
0
constructor
(
context
:
Context
?
)
:
this
(
context
,
null
)
constructor
(
context
:
Context
)
:
this
(
context
,
null
)
constructor
(
context
:
Context
?
,
attrs
:
AttributeSet
?)
:
this
(
context
,
attrs
,
0
)
constructor
(
context
:
Context
,
attrs
:
AttributeSet
?)
:
this
(
context
,
attrs
,
0
)
constructor
(
context
:
Context
?
,
attrs
:
AttributeSet
?,
defStyle
:
Int
)
:
super
(
context
,
attrs
,
defStyle
)
{
constructor
(
context
:
Context
,
attrs
:
AttributeSet
?,
defStyle
:
Int
)
:
super
(
context
,
attrs
,
defStyle
)
{
val
wm
=
context
!!
.
getSystemService
(
Context
.
WINDOW_SERVICE
)
as
WindowManager
val
wm
=
context
!!
.
getSystemService
(
Context
.
WINDOW_SERVICE
)
as
WindowManager
val
display
=
wm
.
defaultDisplay
val
display
=
wm
.
defaultDisplay
val
size
=
DisplayMetrics
()
val
size
=
DisplayMetrics
()
...
...
app/src/main/java/chat/rocket/android/widget/autocompletion/ui/SuggestionsAdapter.kt
View file @
0cf32df9
package
chat.rocket.android.widget.autocompletion.ui
package
chat.rocket.android.widget.autocompletion.ui
import
android
.support.v7
.widget.RecyclerView
import
android
x.recyclerview
.widget.RecyclerView
import
chat.rocket.android.widget.autocompletion.model.SuggestionModel
import
chat.rocket.android.widget.autocompletion.model.SuggestionModel
import
chat.rocket.android.widget.autocompletion.strategy.CompletionStrategy
import
chat.rocket.android.widget.autocompletion.strategy.CompletionStrategy
import
chat.rocket.android.widget.autocompletion.strategy.regex.StringMatchingCompletionStrategy
import
chat.rocket.android.widget.autocompletion.strategy.regex.StringMatchingCompletionStrategy
...
...
app/src/main/java/chat/rocket/android/widget/autocompletion/ui/SuggestionsView.kt
View file @
0cf32df9
...
@@ -4,13 +4,13 @@ import android.content.Context
...
@@ -4,13 +4,13 @@ import android.content.Context
import
android.graphics.Canvas
import
android.graphics.Canvas
import
android.graphics.Rect
import
android.graphics.Rect
import
android.graphics.drawable.Drawable
import
android.graphics.drawable.Drawable
import
android
.support
.annotation.DrawableRes
import
android
x
.annotation.DrawableRes
import
android
.support
.transition.Slide
import
android
x
.transition.Slide
import
android
.support
.transition.TransitionManager
import
android
x
.transition.TransitionManager
import
android
.support.v4
.content.ContextCompat
import
android
x.core
.content.ContextCompat
import
android
.support.v7
.widget.DefaultItemAnimator
import
android
x.recyclerview
.widget.DefaultItemAnimator
import
android
.support.v7
.widget.LinearLayoutManager
import
android
x.recyclerview
.widget.LinearLayoutManager
import
android
.support.v7
.widget.RecyclerView
import
android
x.recyclerview
.widget.RecyclerView
import
android.text.Editable
import
android.text.Editable
import
android.text.InputType
import
android.text.InputType
import
android.text.TextWatcher
import
android.text.TextWatcher
...
...
app/src/main/java/chat/rocket/android/widget/emoji/CategoryPagerAdapter.kt
View file @
0cf32df9
package
chat.rocket.android.widget.emoji
package
chat.rocket.android.widget.emoji
import
android
.support.v4.view
.PagerAdapter
import
android
x.viewpager.widget
.PagerAdapter
import
android
.support.v7
.widget.DefaultItemAnimator
import
android
x.recyclerview
.widget.DefaultItemAnimator
import
android
.support.v7
.widget.GridLayoutManager
import
android
x.recyclerview
.widget.GridLayoutManager
import
android
.support.v7
.widget.RecyclerView
import
android
x.recyclerview
.widget.RecyclerView
import
android.view.LayoutInflater
import
android.view.LayoutInflater
import
android.view.View
import
android.view.View
import
android.view.ViewGroup
import
android.view.ViewGroup
...
...
app/src/main/java/chat/rocket/android/widget/emoji/ComposerEditText.kt
View file @
0cf32df9
package
chat.rocket.android.widget.emoji
package
chat.rocket.android.widget.emoji
import
android.content.Context
import
android.content.Context
import
android
.support.v7
.widget.AppCompatEditText
import
android
x.appcompat
.widget.AppCompatEditText
import
android.util.AttributeSet
import
android.util.AttributeSet
import
android.view.KeyEvent
import
android.view.KeyEvent
...
@@ -16,7 +16,7 @@ class ComposerEditText : AppCompatEditText {
...
@@ -16,7 +16,7 @@ class ComposerEditText : AppCompatEditText {
isLongClickable
=
true
isLongClickable
=
true
}
}
constructor
(
context
:
Context
,
attrs
:
AttributeSet
?)
:
this
(
context
,
attrs
,
android
.
support
.
v7
.
appcompat
.
R
.
attr
.
editTextStyle
)
constructor
(
context
:
Context
,
attrs
:
AttributeSet
?)
:
this
(
context
,
attrs
,
android
x
.
appcompat
.
R
.
attr
.
editTextStyle
)
constructor
(
context
:
Context
)
:
this
(
context
,
null
)
constructor
(
context
:
Context
)
:
this
(
context
,
null
)
...
...
app/src/main/java/chat/rocket/android/widget/emoji/EmojiCategory.kt
View file @
0cf32df9
package
chat.rocket.android.widget.emoji
package
chat.rocket.android.widget.emoji
import
android
.support
.annotation.DrawableRes
import
android
x
.annotation.DrawableRes
import
android.text.SpannableString
import
android.text.SpannableString
import
android.text.Spanned
import
android.text.Spanned
import
chat.rocket.android.R
import
chat.rocket.android.R
...
...
app/src/main/java/chat/rocket/android/widget/emoji/EmojiKeyboardPopup.kt
View file @
0cf32df9
package
chat.rocket.android.widget.emoji
package
chat.rocket.android.widget.emoji
import
android.content.Context
import
android.content.Context
import
android.support.design.widget
.TabLayout
import
com.google.android.material.tabs
.TabLayout
import
android
.support.v4.view
.ViewPager
import
android
x.viewpager.widget
.ViewPager
import
android
.support.v7
.app.AppCompatActivity
import
android
x.appcompat
.app.AppCompatActivity
import
android.text.Editable
import
android.text.Editable
import
android.text.TextWatcher
import
android.text.TextWatcher
import
android.view.KeyEvent
import
android.view.KeyEvent
...
...
app/src/main/java/chat/rocket/android/widget/emoji/EmojiPickerPopup.kt
View file @
0cf32df9
...
@@ -3,8 +3,8 @@ package chat.rocket.android.widget.emoji
...
@@ -3,8 +3,8 @@ package chat.rocket.android.widget.emoji
import
android.app.Dialog
import
android.app.Dialog
import
android.content.Context
import
android.content.Context
import
android.os.Bundle
import
android.os.Bundle
import
android.support.design.widget
.TabLayout
import
com.google.android.material.tabs
.TabLayout
import
android
.support.v4.view
.ViewPager
import
android
x.viewpager.widget
.ViewPager
import
android.view.LayoutInflater
import
android.view.LayoutInflater
import
android.view.Window
import
android.view.Window
import
android.view.WindowManager
import
android.view.WindowManager
...
...
app/src/main/res/layout/about_view.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android
.support.constrain
t.ConstraintLayout
<android
x.constraintlayout.widge
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
...
@@ -50,4 +50,4 @@
...
@@ -50,4 +50,4 @@
android:layout_marginTop=
"8dp"
android:layout_marginTop=
"8dp"
android:textColor=
"@color/colorSecondaryText"
/>
android:textColor=
"@color/colorSecondaryText"
/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/activity_main.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android
.support.v4
.widget.DrawerLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android
x.drawerlayout
.widget.DrawerLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:id=
"@+id/drawer_layout"
android:id=
"@+id/drawer_layout"
...
@@ -29,14 +29,14 @@
...
@@ -29,14 +29,14 @@
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:layout_gravity=
"start"
>
android:layout_gravity=
"start"
>
<
android.support.design.widget
.NavigationView
<
com.google.android.material.navigation
.NavigationView
android:id=
"@+id/view_navigation"
android:id=
"@+id/view_navigation"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
app:headerLayout=
"@layout/nav_header"
app:headerLayout=
"@layout/nav_header"
app:menu=
"@menu/navigation"
/>
app:menu=
"@menu/navigation"
/>
<android
.support.v7
.widget.RecyclerView
<android
x.recyclerview
.widget.RecyclerView
android:id=
"@+id/accounts_list"
android:id=
"@+id/accounts_list"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
...
@@ -47,4 +47,4 @@
...
@@ -47,4 +47,4 @@
android:visibility=
"gone"
/>
android:visibility=
"gone"
/>
</FrameLayout>
</FrameLayout>
</android.support.v4.widget.DrawerLayout>
</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/app_bar.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<
android.support.design.widget
.AppBarLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<
com.google.android.material.appbar
.AppBarLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:background=
"@color/colorPrimary"
android:background=
"@color/colorPrimary"
android:theme=
"@style/Theme.AppCompat.Light.NoActionBar"
>
android:theme=
"@style/Theme.AppCompat.Light.NoActionBar"
>
<android
.support.v7
.widget.Toolbar
<android
x.appcompat
.widget.Toolbar
android:id=
"@+id/toolbar"
android:id=
"@+id/toolbar"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"?attr/actionBarSize"
android:layout_height=
"?attr/actionBarSize"
...
@@ -14,4 +14,4 @@
...
@@ -14,4 +14,4 @@
app:popupTheme=
"@style/ThemeOverlay.AppCompat.Light"
app:popupTheme=
"@style/ThemeOverlay.AppCompat.Light"
app:theme=
"@style/ThemeOverlay.AppCompat.Dark.ActionBar"
/>
app:theme=
"@style/ThemeOverlay.AppCompat.Dark.ActionBar"
/>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/app_bar_chat_room.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<
android.support.design.widget
.AppBarLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<
com.google.android.material.appbar
.AppBarLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
android:background=
"@color/colorPrimary"
android:background=
"@color/colorPrimary"
android:theme=
"@style/Theme.AppCompat.Light.NoActionBar"
>
android:theme=
"@style/Theme.AppCompat.Light.NoActionBar"
>
<android
.support.v7
.widget.Toolbar
<android
x.appcompat
.widget.Toolbar
android:id=
"@+id/toolbar"
android:id=
"@+id/toolbar"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"?attr/actionBarSize"
android:layout_height=
"?attr/actionBarSize"
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
app:popupTheme=
"@style/ThemeOverlay.AppCompat.Light"
app:popupTheme=
"@style/ThemeOverlay.AppCompat.Light"
app:theme=
"@style/ThemeOverlay.AppCompat.Dark.ActionBar"
>
app:theme=
"@style/ThemeOverlay.AppCompat.Dark.ActionBar"
>
<android
.support.constrain
t.ConstraintLayout
<android
x.constraintlayout.widge
t.ConstraintLayout
android:id=
"@+id/toolbar_content_container"
android:id=
"@+id/toolbar_content_container"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
android:textSize=
"18sp"
android:textSize=
"18sp"
android:textStyle=
"bold"
android:textStyle=
"bold"
tools:text=
"Developers"
/>
tools:text=
"Developers"
/>
</android
.support.constrain
t.ConstraintLayout>
</android
x.constraintlayout.widge
t.ConstraintLayout>
</android
.support.v7
.widget.Toolbar>
</android
x.appcompat
.widget.Toolbar>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/app_bar_password.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<
android.support.design.widget
.AppBarLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<
com.google.android.material.appbar
.AppBarLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
android:background=
"@color/colorPrimary"
android:background=
"@color/colorPrimary"
android:theme=
"@style/Theme.AppCompat.Light.NoActionBar"
>
android:theme=
"@style/Theme.AppCompat.Light.NoActionBar"
>
<android
.support.v7
.widget.Toolbar
<android
x.appcompat
.widget.Toolbar
android:id=
"@+id/toolbar"
android:id=
"@+id/toolbar"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"?attr/actionBarSize"
android:layout_height=
"?attr/actionBarSize"
...
@@ -30,6 +30,6 @@
...
@@ -30,6 +30,6 @@
android:textStyle=
"bold"
android:textStyle=
"bold"
tools:text=
"@string/title_password"
/>
tools:text=
"@string/title_password"
/>
</RelativeLayout>
</RelativeLayout>
</android
.support.v7
.widget.Toolbar>
</android
x.appcompat
.widget.Toolbar>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/avatar_profile.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android
.support.constrain
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android
x.constraintlayout.widge
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
...
@@ -14,4 +14,4 @@
...
@@ -14,4 +14,4 @@
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:roundedCornerRadius=
"2dp"
/>
app:roundedCornerRadius=
"2dp"
/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/emoji_category_layout.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android
.support.design
.widget.CoordinatorLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android
x.coordinatorlayout
.widget.CoordinatorLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
android:layout_height=
"wrap_content"
>
<android
.support.v7
.widget.RecyclerView
<android
x.recyclerview
.widget.RecyclerView
android:id=
"@+id/emojiRecyclerView"
android:id=
"@+id/emojiRecyclerView"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
...
@@ -25,4 +25,4 @@
...
@@ -25,4 +25,4 @@
android:textSize=
"16sp"
android:textSize=
"16sp"
android:visibility=
"gone"
/>
android:visibility=
"gone"
/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/emoji_keyboard.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android
.support.constrain
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android
x.constraintlayout.widge
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:id=
"@+id/emoji_keyboard_container"
android:id=
"@+id/emoji_keyboard_container"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -59,4 +59,4 @@
...
@@ -59,4 +59,4 @@
android:src=
"@drawable/ic_backspace_gray_24dp"
/>
android:src=
"@drawable/ic_backspace_gray_24dp"
/>
</RelativeLayout>
</RelativeLayout>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/emoji_picker.xml
View file @
0cf32df9
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
android:background=
"@color/white"
android:background=
"@color/white"
android:orientation=
"vertical"
>
android:orientation=
"vertical"
>
<
android.support.design.widget
.TabLayout
<
com.google.android.material.tabs
.TabLayout
android:id=
"@+id/tabs"
android:id=
"@+id/tabs"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
app:tabMaxWidth=
"48dp"
app:tabMaxWidth=
"48dp"
app:tabMode=
"scrollable"
/>
app:tabMode=
"scrollable"
/>
<android
.support.v4.view
.ViewPager
<android
x.viewpager.widget
.ViewPager
android:id=
"@+id/pager_categories"
android:id=
"@+id/pager_categories"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
...
...
app/src/main/res/layout/fragment_authentication_log_in.xml
View file @
0cf32df9
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
android:fillViewport=
"true"
android:fillViewport=
"true"
tools:context=
".authentication.login.ui.LoginFragment"
>
tools:context=
".authentication.login.ui.LoginFragment"
>
<android
.support.constrain
t.ConstraintLayout
<android
x.constraintlayout.widge
t.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
android:layout_height=
"wrap_content"
>
...
@@ -208,7 +208,7 @@
...
@@ -208,7 +208,7 @@
tools:visibility=
"gone"
/>
tools:visibility=
"gone"
/>
</LinearLayout>
</LinearLayout>
<
android.support.design.widget
.FloatingActionButton
<
com.google.android.material.floatingactionbutton
.FloatingActionButton
android:id=
"@+id/button_fab"
android:id=
"@+id/button_fab"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
...
@@ -231,6 +231,6 @@
...
@@ -231,6 +231,6 @@
android:text=
"@string/title_log_in"
android:text=
"@string/title_log_in"
android:visibility=
"gone"
android:visibility=
"gone"
app:layout_constraintBottom_toBottomOf=
"parent"
/>
app:layout_constraintBottom_toBottomOf=
"parent"
/>
</android
.support.constrain
t.ConstraintLayout>
</android
x.constraintlayout.widge
t.ConstraintLayout>
</ScrollView>
</ScrollView>
\ No newline at end of file
app/src/main/res/layout/fragment_chat_room.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android
.support.constrain
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android
x.constraintlayout.widge
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:id=
"@+id/root_layout"
android:id=
"@+id/root_layout"
...
@@ -142,4 +142,4 @@
...
@@ -142,4 +142,4 @@
tools:text=
"connected"
tools:text=
"connected"
tools:visibility=
"visible"
/>
tools:visibility=
"visible"
/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/fragment_chat_rooms.xml
View file @
0cf32df9
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
tools:context=
".chatrooms.ui.ChatRoomsFragment"
>
tools:context=
".chatrooms.ui.ChatRoomsFragment"
>
<android
.support.v7
.widget.RecyclerView
<android
x.recyclerview
.widget.RecyclerView
android:id=
"@+id/recycler_view"
android:id=
"@+id/recycler_view"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
/>
android:layout_height=
"match_parent"
/>
...
...
app/src/main/res/layout/fragment_member_bottom_sheet.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android
.support.constrain
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android
x.constraintlayout.widge
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:id=
"@+id/member_bottom_sheet"
android:id=
"@+id/member_bottom_sheet"
...
@@ -85,4 +85,4 @@
...
@@ -85,4 +85,4 @@
app:layout_constraintTop_toBottomOf=
"@+id/text_utc"
app:layout_constraintTop_toBottomOf=
"@+id/text_utc"
tools:text=
"+01:00"
/>
tools:text=
"+01:00"
/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/fragment_members.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android
.support.design
.widget.CoordinatorLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android
x.coordinatorlayout
.widget.CoordinatorLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
tools:context=
".members.ui.MembersFragment"
>
tools:context=
".members.ui.MembersFragment"
>
<android
.support.v7
.widget.RecyclerView
<android
x.recyclerview
.widget.RecyclerView
android:id=
"@+id/recycler_view"
android:id=
"@+id/recycler_view"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
...
@@ -21,4 +21,4 @@
...
@@ -21,4 +21,4 @@
app:indicatorColor=
"@color/black"
app:indicatorColor=
"@color/black"
app:indicatorName=
"BallPulseIndicator"
/>
app:indicatorName=
"BallPulseIndicator"
/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/fragment_password.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android
.support.constrain
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android
x.constraintlayout.widge
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
>
xmlns:tools=
"http://schemas.android.com/tools"
>
<
android.support.design.widget
.TextInputLayout
<
com.google.android.material.textfield
.TextInputLayout
android:id=
"@+id/layout_new_password"
android:id=
"@+id/layout_new_password"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
...
@@ -22,9 +22,9 @@
...
@@ -22,9 +22,9 @@
android:hint=
"@string/msg_new_password"
android:hint=
"@string/msg_new_password"
android:inputType=
"textPassword"
android:inputType=
"textPassword"
/>
/>
</
android.support.design.widget
.TextInputLayout>
</
com.google.android.material.textfield
.TextInputLayout>
<
android.support.design.widget
.TextInputLayout
<
com.google.android.material.textfield
.TextInputLayout
android:id=
"@+id/layout_confirm_password"
android:id=
"@+id/layout_confirm_password"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:hint=
"@string/msg_confirm_password"
android:hint=
"@string/msg_confirm_password"
android:inputType=
"textPassword"
/>
android:inputType=
"textPassword"
/>
</
android.support.design.widget
.TextInputLayout>
</
com.google.android.material.textfield
.TextInputLayout>
<com.wang.avi.AVLoadingIndicatorView
<com.wang.avi.AVLoadingIndicatorView
android:id=
"@+id/view_loading"
android:id=
"@+id/view_loading"
...
@@ -54,4 +54,4 @@
...
@@ -54,4 +54,4 @@
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintBottom_toBottomOf=
"parent"
/>
app:layout_constraintBottom_toBottomOf=
"parent"
/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/fragment_pinned_messages.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android
.support.constrain
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android
x.constraintlayout.widge
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
android:layout_height=
"match_parent"
>
<android
.support.v7
.widget.RecyclerView
<android
x.recyclerview
.widget.RecyclerView
android:id=
"@+id/recycler_view_pinned"
android:id=
"@+id/recycler_view_pinned"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
...
@@ -72,7 +72,7 @@
...
@@ -72,7 +72,7 @@
android:textSize=
"16sp"
android:textSize=
"16sp"
android:textColor=
"@color/colorSecondaryTextLight"
/>
android:textColor=
"@color/colorSecondaryTextLight"
/>
<android
.support.constrain
t.Group
<android
x.constraintlayout.widge
t.Group
android:id=
"@+id/pin_view"
android:id=
"@+id/pin_view"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
...
@@ -80,4 +80,4 @@
...
@@ -80,4 +80,4 @@
android:visibility=
"gone"
android:visibility=
"gone"
tools:visibility=
"visible"
/>
tools:visibility=
"visible"
/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/item_account.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android
.support.constrain
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android
x.constraintlayout.widge
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -43,4 +43,4 @@
...
@@ -43,4 +43,4 @@
app:layout_constraintStart_toEndOf=
"@id/server_logo"
app:layout_constraintStart_toEndOf=
"@id/server_logo"
tools:text=
"Lucio Maciel"
/>
tools:text=
"Lucio Maciel"
/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/item_add_account.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android
.support.constrain
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android
x.constraintlayout.widge
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
...
@@ -26,4 +26,4 @@
...
@@ -26,4 +26,4 @@
app:layout_constraintStart_toEndOf=
"@id/server_logo"
app:layout_constraintStart_toEndOf=
"@id/server_logo"
app:layout_constraintEnd_toEndOf=
"parent"
/>
app:layout_constraintEnd_toEndOf=
"parent"
/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/item_author_attachment.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android
.support.constrain
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android
x.constraintlayout.widge
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:id=
"@+id/author_attachment_container"
android:id=
"@+id/author_attachment_container"
...
@@ -62,4 +62,4 @@
...
@@ -62,4 +62,4 @@
app:layout_constraintStart_toStartOf=
"@id/quote_bar"
app:layout_constraintStart_toStartOf=
"@id/quote_bar"
app:layout_constraintTop_toBottomOf=
"@id/text_fields"
/>
app:layout_constraintTop_toBottomOf=
"@id/text_fields"
/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/item_chat.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android
.support.constrain
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android
x.constraintlayout.widge
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -89,4 +89,4 @@
...
@@ -89,4 +89,4 @@
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintTop_toTopOf=
"@+id/text_chat_name"
/>
app:layout_constraintTop_toTopOf=
"@+id/text_chat_name"
/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/item_color_attachment.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android
.support.constrain
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android
x.constraintlayout.widge
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:id=
"@+id/color_attachment_container"
android:id=
"@+id/color_attachment_container"
...
@@ -41,4 +41,4 @@
...
@@ -41,4 +41,4 @@
app:layout_constraintStart_toStartOf=
"@id/quote_bar"
app:layout_constraintStart_toStartOf=
"@id/quote_bar"
app:layout_constraintTop_toBottomOf=
"@id/attachment_text"
/>
app:layout_constraintTop_toBottomOf=
"@id/attachment_text"
/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/item_file_attachment.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android
.support.constrain
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android
x.constraintlayout.widge
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:id=
"@+id/file_attachment_container"
android:id=
"@+id/file_attachment_container"
...
@@ -34,4 +34,4 @@
...
@@ -34,4 +34,4 @@
app:layout_constraintStart_toStartOf=
"@id/text_file_name"
app:layout_constraintStart_toStartOf=
"@id/text_file_name"
app:layout_constraintTop_toBottomOf=
"@id/text_file_name"
/>
app:layout_constraintTop_toBottomOf=
"@id/text_file_name"
/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/item_member.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android
.support.constrain
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android
x.constraintlayout.widge
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -29,4 +29,4 @@
...
@@ -29,4 +29,4 @@
app:layout_constraintTop_toTopOf=
"@+id/layout_avatar"
app:layout_constraintTop_toTopOf=
"@+id/layout_avatar"
tools:text=
"Ronald Perkins"
/>
tools:text=
"Ronald Perkins"
/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/item_message.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android
.support.constrain
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android
x.constraintlayout.widge
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:id=
"@+id/message_container"
android:id=
"@+id/message_container"
...
@@ -121,4 +121,4 @@
...
@@ -121,4 +121,4 @@
app:layout_constraintStart_toStartOf=
"@+id/text_content"
app:layout_constraintStart_toStartOf=
"@+id/text_content"
app:layout_constraintTop_toBottomOf=
"@+id/text_content"
/>
app:layout_constraintTop_toBottomOf=
"@+id/text_content"
/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/item_message_attachment.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android
.support.constrain
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android
x.constraintlayout.widge
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:id=
"@+id/attachment_container"
android:id=
"@+id/attachment_container"
...
@@ -68,4 +68,4 @@
...
@@ -68,4 +68,4 @@
app:layout_constraintStart_toStartOf=
"@+id/quote_bar"
app:layout_constraintStart_toStartOf=
"@+id/quote_bar"
app:layout_constraintTop_toBottomOf=
"@+id/text_content"
/>
app:layout_constraintTop_toBottomOf=
"@+id/text_content"
/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/layout_reactions.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android
.support.v7
.widget.RecyclerView
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android
x.recyclerview
.widget.RecyclerView
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:id=
"@+id/recycler_view_reactions"
android:id=
"@+id/recycler_view_reactions"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
/>
android:layout_height=
"wrap_content"
/>
\ No newline at end of file
app/src/main/res/layout/message_action_bar.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android
.support.constrain
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android
x.constraintlayout.widge
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -61,4 +61,4 @@
...
@@ -61,4 +61,4 @@
app:layout_constraintStart_toEndOf=
"@+id/image_view_action_cancel_quote"
app:layout_constraintStart_toEndOf=
"@+id/image_view_action_cancel_quote"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
tools:text=
"Edit message"
/>
tools:text=
"Edit message"
/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/message_composer.xml
View file @
0cf32df9
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
android:orientation=
"vertical"
android:orientation=
"vertical"
android:background=
"@color/default_background"
>
android:background=
"@color/default_background"
>
<android
.support.constrain
t.ConstraintLayout
<android
x.constraintlayout.widge
t.ConstraintLayout
android:id=
"@+id/composer"
android:id=
"@+id/composer"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
android:layout_height=
"wrap_content"
>
...
@@ -96,7 +96,7 @@
...
@@ -96,7 +96,7 @@
android:visibility=
"gone"
/>
android:visibility=
"gone"
/>
</LinearLayout>
</LinearLayout>
</android
.support.constrain
t.ConstraintLayout>
</android
x.constraintlayout.widge
t.ConstraintLayout>
<FrameLayout
<FrameLayout
android:id=
"@+id/emoji_fragment_placeholder"
android:id=
"@+id/emoji_fragment_placeholder"
...
...
app/src/main/res/layout/message_list.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android
.support.design
.widget.CoordinatorLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android
x.coordinatorlayout
.widget.CoordinatorLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
android:layout_height=
"match_parent"
>
<android
.support.v7
.widget.RecyclerView
<android
x.recyclerview
.widget.RecyclerView
android:id=
"@+id/recycler_view"
android:id=
"@+id/recycler_view"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:scrollbars=
"vertical"
/>
android:scrollbars=
"vertical"
/>
<
android.support.design.widget
.FloatingActionButton
<
com.google.android.material.floatingactionbutton
.FloatingActionButton
android:id=
"@+id/button_fab"
android:id=
"@+id/button_fab"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
...
@@ -24,4 +24,4 @@
...
@@ -24,4 +24,4 @@
app:layout_anchor=
"@id/recycler_view"
app:layout_anchor=
"@id/recycler_view"
app:layout_anchorGravity=
"bottom|end"
/>
app:layout_anchorGravity=
"bottom|end"
/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/message_url_preview.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android
.support.constrain
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android
x.constraintlayout.widge
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:id=
"@+id/url_preview_layout"
android:id=
"@+id/url_preview_layout"
...
@@ -50,4 +50,4 @@
...
@@ -50,4 +50,4 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
app:layout_constraintStart_toStartOf=
"@+id/image_preview"
app:layout_constraintStart_toStartOf=
"@+id/image_preview"
app:layout_constraintTop_toBottomOf=
"@+id/text_description"
/>
app:layout_constraintTop_toBottomOf=
"@+id/text_description"
/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/nav_header.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android
.support.constrain
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android
x.constraintlayout.widge
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
app:roundedCornerRadius=
"3dp"
app:roundedCornerRadius=
"3dp"
tools:src=
"@tools:sample/avatars"
/>
tools:src=
"@tools:sample/avatars"
/>
<android
.support.constrain
t.ConstraintLayout
<android
x.constraintlayout.widge
t.ConstraintLayout
android:id=
"@+id/account_container"
android:id=
"@+id/account_container"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
...
@@ -83,6 +83,6 @@
...
@@ -83,6 +83,6 @@
android:tint=
"@color/white"
android:tint=
"@color/white"
app:layout_constraintBottom_toBottomOf=
"@+id/text_server_url"
app:layout_constraintBottom_toBottomOf=
"@+id/text_server_url"
app:layout_constraintEnd_toEndOf=
"parent"
/>
app:layout_constraintEnd_toEndOf=
"parent"
/>
</android
.support.constrain
t.ConstraintLayout>
</android
x.constraintlayout.widge
t.ConstraintLayout>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/layout/suggestion_member_item.xml
View file @
0cf32df9
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<android
.support.constrain
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<android
x.constraintlayout.widge
t.ConstraintLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -53,4 +53,4 @@
...
@@ -53,4 +53,4 @@
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
tools:text=
"@tools:sample/full_names"
/>
tools:text=
"@tools:sample/full_names"
/>
</android.support.constraint.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
\ No newline at end of file
app/src/main/res/menu/chatrooms.xml
View file @
0cf32df9
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
android:id=
"@+id/action_search"
android:id=
"@+id/action_search"
android:icon=
"@drawable/ic_search_white_24px"
android:icon=
"@drawable/ic_search_white_24px"
android:title=
"@string/action_search"
android:title=
"@string/action_search"
app:actionViewClass=
"android
.support.v7
.widget.SearchView"
app:actionViewClass=
"android
x.appcompat
.widget.SearchView"
app:showAsAction=
"ifRoom|collapseActionView"
/>
app:showAsAction=
"ifRoom|collapseActionView"
/>
<item
<item
...
@@ -15,4 +15,4 @@
...
@@ -15,4 +15,4 @@
android:title=
"@string/menu_chatroom_sort"
android:title=
"@string/menu_chatroom_sort"
app:showAsAction=
"always"
/>
app:showAsAction=
"always"
/>
</menu>
</menu>
\ No newline at end of file
build.gradle
View file @
0cf32df9
...
@@ -10,12 +10,12 @@ buildscript {
...
@@ -10,12 +10,12 @@ buildscript {
}
}
dependencies
{
dependencies
{
classpath
'com.android.tools.build:gradle:3.
1.2
'
classpath
'com.android.tools.build:gradle:3.
2.0-alpha15
'
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
classpath
"org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
classpath
"org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
classpath
'com.google.gms:google-services:3.2.0'
classpath
'com.google.gms:google-services:3.2.0'
classpath
'io.fabric.tools:gradle:1.25.
1
'
classpath
'io.fabric.tools:gradle:1.25.
4
'
classpath
"io.realm:realm-gradle-plugin:5.0
.0"
//classpath "io.realm:realm-gradle-plugin:5.1
.0"
// NOTE: Do not place your application dependencies here; they belong
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
// in the individual module build.gradle files
...
...
dependencies.gradle
View file @
0cf32df9
ext
{
ext
{
versions
=
[
versions
=
[
java
:
JavaVersion
.
VERSION_1_8
,
java
:
JavaVersion
.
VERSION_1_8
,
compileSdk
:
2
7
,
compileSdk
:
2
8
,
targetSdk
:
27
,
targetSdk
:
27
,
buildTools
:
'2
7.0.3
'
,
buildTools
:
'2
8.0.0-rc2
'
,
kotlin
:
'1.2.41'
,
kotlin
:
'1.2.41'
,
coroutine
:
'0.22.5'
,
coroutine
:
'0.22.5'
,
dokka
:
'0.9.16'
,
dokka
:
'0.9.16'
,
// Main dependencies
// Main dependencies
support
:
'27.1.1'
,
appCompat
:
'1.0.0-alpha1'
,
recyclerview
:
'1.0.0-alpha1'
,
material
:
'1.0.0-alpha1'
,
cardview
:
'1.0.0-alpha1'
,
browser
:
'1.0.0-alpha1'
,
constraintLayout
:
'1.1.0'
,
constraintLayout
:
'1.1.0'
,
androidKtx
:
'
0.3
'
,
androidKtx
:
'
1.0.0-alpha1
'
,
dagger
:
'2.1
4.1
'
,
dagger
:
'2.1
6
'
,
exoPlayer
:
'2.6.0'
,
exoPlayer
:
'2.6.0'
,
playServices
:
'11.8.0'
,
playServices
:
'11.8.0'
,
room
:
'
1.0.0
'
,
room
:
'
2.0.0-alpha1
'
,
lifecycle
:
'
1.1.
1'
,
lifecycle
:
'
2.0.0-alpha
1'
,
rxKotlin
:
'2.2.0'
,
rxKotlin
:
'2.2.0'
,
rxAndroid
:
'2.0.2'
,
rxAndroid
:
'2.0.2'
,
moshi
:
'1.6.0
-SNAPSHOT
'
,
moshi
:
'1.6.0'
,
okhttp
:
'3.10.0'
,
okhttp
:
'3.10.0'
,
timber
:
'4.7.0'
,
timber
:
'4.7.0'
,
threeTenABP
:
'1.0.5'
,
threeTenABP
:
'1.0.5'
,
rxBinding
:
'2.0.0'
,
rxBinding
:
'2.0.0'
,
fresco
:
'1.
8.1
'
,
fresco
:
'1.
9.0
'
,
kotshi
:
'1.0.2'
,
kotshi
:
'1.0.2'
,
frescoImageViewer
:
'0.5.1'
,
frescoImageViewer
:
'0.5.1'
,
markwon
:
'1.0.3'
,
markwon
:
'1.0.3'
,
sheetMenu
:
'1.3.3'
,
//sheetMenu : '1.3.3',
sheetMenu
:
'5ff79ccf14'
,
aVLoadingIndicatorView:
'2.1.3'
,
aVLoadingIndicatorView:
'2.1.3'
,
flexbox
:
'0.3.2'
,
flexbox
:
'0.3.2'
,
// For testing
// For testing
junit
:
'4.12'
,
junit
:
'4.12'
,
truth
:
'0.36'
,
truth
:
'0.36'
,
espresso
:
'3.
0.
2'
,
espresso
:
'3.
1.0-alpha
2'
,
mockito
:
'2.10.0'
mockito
:
'2.10.0'
]
]
libraries
=
[
libraries
=
[
...
@@ -43,14 +48,13 @@ ext {
...
@@ -43,14 +48,13 @@ ext {
coroutines
:
"org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.coroutine}"
,
coroutines
:
"org.jetbrains.kotlinx:kotlinx-coroutines-core:${versions.coroutine}"
,
coroutinesAndroid
:
"org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.coroutine}"
,
coroutinesAndroid
:
"org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.coroutine}"
,
appCompat
:
"com.android.support:appcompat-v7:${versions.support}"
,
appCompat
:
"androidx.appcompat:appcompat:${versions.appCompat}"
,
annotations
:
"com.android.support:support-annotations:${versions.support}"
,
recyclerview
:
"androidx.recyclerview:recyclerview:${versions.recyclerview}"
,
recyclerview
:
"com.android.support:recyclerview-v7:${versions.support}"
,
material
:
"com.google.android.material:material:${versions.material}"
,
design
:
"com.android.support:design:${versions.support}"
,
constraintlayout
:
"androidx.constraintlayout:constraintlayout:${versions.constraintLayout}"
,
constraintLayout
:
"com.android.support.constraint:constraint-layout:${versions.constraintLayout}"
,
cardview
:
"androidx.cardview:cardview:${versions.cardview}"
,
cardView
:
"com.android.support:cardview-v7:${versions.support}"
,
flexbox
:
"com.google.android:flexbox:${versions.flexbox}"
,
flexbox
:
"com.google.android:flexbox:${versions.flexbox}"
,
customTabs
:
"com.android.support:customtabs:${versions.support
}"
,
browser
:
"androidx.browser:browser:${versions.browser
}"
,
androidKtx
:
"androidx.core:core-ktx:${versions.androidKtx}"
,
androidKtx
:
"androidx.core:core-ktx:${versions.androidKtx}"
,
...
@@ -61,11 +65,10 @@ ext {
...
@@ -61,11 +65,10 @@ ext {
playServicesGcm
:
"com.google.android.gms:play-services-gcm:${versions.playServices}"
,
playServicesGcm
:
"com.google.android.gms:play-services-gcm:${versions.playServices}"
,
exoPlayer
:
"com.google.android.exoplayer:exoplayer:${versions.exoPlayer}"
,
exoPlayer
:
"com.google.android.exoplayer:exoplayer:${versions.exoPlayer}"
,
room
:
"android.arch.persistence.room:runtime:${versions.room}"
,
room
:
"androidx.room:room-runtime:${versions.room}"
,
roomProcessor
:
"android.arch.persistence.room:compiler:${versions.room}"
,
roomProcessor
:
"androidx.room:room-compiler:${versions.room}"
,
roomRxjava
:
"android.arch.persistence.room:rxjava2:${versions.room}"
,
lifecycleExtensions
:
"androidx.lifecycle:lifecycle-extensions:${versions.lifecycle}"
,
lifecycleExtensions
:
"android.arch.lifecycle:extensions:${versions.lifecycle}"
,
lifecycleCompiler
:
"androidx.lifecycle:lifecycle-compiler:${versions.lifecycle}"
,
lifecycleCompiler
:
"android.arch.lifecycle:compiler:${versions.lifecycle}"
,
rxKotlin
:
"io.reactivex.rxjava2:rxkotlin:${versions.rxKotlin}"
,
rxKotlin
:
"io.reactivex.rxjava2:rxkotlin:${versions.rxKotlin}"
,
rxAndroid
:
"io.reactivex.rxjava2:rxandroid:${versions.rxAndroid}"
,
rxAndroid
:
"io.reactivex.rxjava2:rxandroid:${versions.rxAndroid}"
,
...
@@ -92,14 +95,15 @@ ext {
...
@@ -92,14 +95,15 @@ ext {
markwon
:
"ru.noties:markwon:${versions.markwon}"
,
markwon
:
"ru.noties:markwon:${versions.markwon}"
,
sheetMenu
:
"com.github.whalemare:sheetmenu:${versions.sheetMenu}"
,
//sheetMenu : "com.github.whalemare:sheetmenu:${versions.sheetMenu}",
sheetMenu
:
"com.github.luciofm:sheetmenu:${versions.sheetMenu}"
,
aVLoadingIndicatorView:
"com.wang.avi:library:${versions.aVLoadingIndicatorView}"
,
aVLoadingIndicatorView:
"com.wang.avi:library:${versions.aVLoadingIndicatorView}"
,
// For testing
// For testing
junit
:
"junit:junit:$versions.junit"
,
junit
:
"junit:junit:$versions.junit"
,
espressoCore
:
"
com.android.support
.test.espresso:espresso-core:${versions.espresso}"
,
espressoCore
:
"
androidx
.test.espresso:espresso-core:${versions.espresso}"
,
espressoIntents
:
"
com.android.support
.test.espresso:espresso-intents:${versions.espresso}"
,
espressoIntents
:
"
androidx
.test.espresso:espresso-intents:${versions.espresso}"
,
roomTest
:
"android.arch.persistence.room:testing:${versions.room}"
,
roomTest
:
"android.arch.persistence.room:testing:${versions.room}"
,
truth
:
"com.google.truth:truth:$versions.truth"
,
truth
:
"com.google.truth:truth:$versions.truth"
,
]
]
...
...
gradle.properties
View file @
0cf32df9
...
@@ -9,6 +9,8 @@
...
@@ -9,6 +9,8 @@
# Specifies the JVM arguments used for the daemon process.
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# The setting is particularly useful for tweaking memory settings.
android.enableJetifier
=
true
android.useAndroidX
=
true
org.gradle.jvmargs
=
-Xmx1536m
org.gradle.jvmargs
=
-Xmx1536m
# When configured, Gradle will run in incubating parallel mode.
# When configured, Gradle will run in incubating parallel mode.
...
...
player/build.gradle
View file @
0cf32df9
...
@@ -11,7 +11,7 @@ android {
...
@@ -11,7 +11,7 @@ android {
targetSdkVersion
versions
.
targetSdk
targetSdkVersion
versions
.
targetSdk
versionCode
1
versionCode
1
versionName
"1.0.0"
versionName
"1.0.0"
testInstrumentationRunner
"android
.support
.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android
x
.test.runner.AndroidJUnitRunner"
}
}
buildTypes
{
buildTypes
{
release
{
release
{
...
...
player/src/main/java/chat/rocket/android/player/PlayerActivity.kt
View file @
0cf32df9
...
@@ -4,7 +4,7 @@ import android.content.Context
...
@@ -4,7 +4,7 @@ import android.content.Context
import
android.content.Intent
import
android.content.Intent
import
android.net.Uri
import
android.net.Uri
import
android.os.Bundle
import
android.os.Bundle
import
android
.support.v7
.app.AppCompatActivity
import
android
x.appcompat
.app.AppCompatActivity
import
android.util.Log
import
android.util.Log
import
android.view.View
import
android.view.View
import
com.google.android.exoplayer2.DefaultLoadControl
import
com.google.android.exoplayer2.DefaultLoadControl
...
...
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