From 80628e48e0084a9e9fef4e149e7dc930287477f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marijan=20=C5=A0iki=C4=87?= Date: Thu, 2 Apr 2020 19:52:47 +0200 Subject: [PATCH] minor code cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marijan Šikić --- .../nextcloud/talk/activities/MainActivity.kt | 2 +- .../application/NextcloudTalkApplication.kt | 2 +- .../offline/ConversationsRepository.kt | 1 + .../account/loginentry/LoginEntryView.kt | 2 +- .../contacts/ContactsViewModel.kt | 2 +- .../GroupConversationViewModel.kt | 2 +- .../ConversationListViewModelFactory.kt | 2 +- .../ConversationPresenter.kt | 2 +- .../ConversationsListSource.kt | 2 +- .../ConversationsListView.kt | 189 +++++++++--------- .../ConversationsListViewModel.kt | 4 +- .../ConversationsListViewNetworkState.kt | 2 +- .../di/module/ConversationsListModule.kt | 6 +- .../res/layout/conversations_list_view.xml | 5 +- 14 files changed, 112 insertions(+), 111 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt index f1467691f..077392cd1 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt @@ -44,7 +44,7 @@ import com.nextcloud.talk.controllers.base.providers.ActionBarProvider import com.nextcloud.talk.newarch.domain.repository.offline.UsersRepository import com.nextcloud.talk.newarch.features.account.serverentry.ServerEntryView import com.nextcloud.talk.newarch.features.contactsflow.contacts.ContactsView -import com.nextcloud.talk.newarch.features.conversationslist.ConversationsListView +import com.nextcloud.talk.newarch.features.conversationsList.ConversationsListView import com.nextcloud.talk.newarch.local.models.UserNgEntity import com.nextcloud.talk.utils.ConductorRemapping import com.nextcloud.talk.utils.SecurityUtils diff --git a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt index 6b1bf820e..41ef27f91 100644 --- a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt +++ b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt @@ -50,7 +50,7 @@ import com.nextcloud.talk.newarch.di.module.StorageModule import com.nextcloud.talk.newarch.domain.di.module.UseCasesModule import com.nextcloud.talk.newarch.features.account.di.module.AccountModule import com.nextcloud.talk.newarch.features.contactsflow.di.module.ContactsFlowModule -import com.nextcloud.talk.newarch.features.conversationslist.di.module.ConversationsListModule +import com.nextcloud.talk.newarch.features.conversationsList.di.module.ConversationsListModule import com.nextcloud.talk.newarch.local.dao.UsersDao import com.nextcloud.talk.newarch.local.models.User import com.nextcloud.talk.newarch.local.models.other.UserStatus.* diff --git a/app/src/main/java/com/nextcloud/talk/newarch/domain/repository/offline/ConversationsRepository.kt b/app/src/main/java/com/nextcloud/talk/newarch/domain/repository/offline/ConversationsRepository.kt index 8f58a55e8..c45cfb400 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/domain/repository/offline/ConversationsRepository.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/domain/repository/offline/ConversationsRepository.kt @@ -26,6 +26,7 @@ import androidx.lifecycle.LiveData import com.nextcloud.talk.models.json.conversations.Conversation interface ConversationsRepository { + fun getConversationsForUser(userId: Long, filter: CharSequence?): LiveData> fun getShortcutTargetConversations(userId: Long): LiveData> suspend fun getConversationForUserWithToken(internalUserId: Long, token: String): Conversation? diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/account/loginentry/LoginEntryView.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/account/loginentry/LoginEntryView.kt index 597030d38..18875f980 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/features/account/loginentry/LoginEntryView.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/features/account/loginentry/LoginEntryView.kt @@ -37,7 +37,7 @@ import com.bluelinelabs.conductor.archlifecycle.ControllerLifecycleOwner import com.bluelinelabs.conductor.autodispose.ControllerScopeProvider import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler import com.nextcloud.talk.R -import com.nextcloud.talk.newarch.features.conversationslist.ConversationsListView +import com.nextcloud.talk.newarch.features.conversationsList.ConversationsListView import com.nextcloud.talk.newarch.mvvm.BaseView import com.nextcloud.talk.utils.bundle.BundleKeys import com.uber.autodispose.lifecycle.LifecycleScopeProvider diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewModel.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewModel.kt index d4249cae3..b8f31e141 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/contacts/ContactsViewModel.kt @@ -41,7 +41,7 @@ import com.nextcloud.talk.newarch.domain.usecases.base.UseCaseResponse import com.nextcloud.talk.newarch.features.contactsflow.ContactsViewOperationState import com.nextcloud.talk.newarch.features.contactsflow.ContactsViewOperationStateWrapper import com.nextcloud.talk.newarch.features.contactsflow.ParticipantElement -import com.nextcloud.talk.newarch.features.conversationslist.ConversationsListView +import com.nextcloud.talk.newarch.features.conversationsList.ConversationsListView import com.nextcloud.talk.newarch.local.models.canUserCreateGroupConversations import com.nextcloud.talk.newarch.services.GlobalService import kotlinx.coroutines.runBlocking diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/groupconversation/GroupConversationViewModel.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/groupconversation/GroupConversationViewModel.kt index 3f9c8db7f..8506d3507 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/groupconversation/GroupConversationViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/features/contactsflow/groupconversation/GroupConversationViewModel.kt @@ -36,7 +36,7 @@ import com.nextcloud.talk.newarch.domain.usecases.SetConversationPasswordUseCase import com.nextcloud.talk.newarch.domain.usecases.base.UseCaseResponse import com.nextcloud.talk.newarch.features.contactsflow.ContactsViewOperationState import com.nextcloud.talk.newarch.features.contactsflow.ContactsViewOperationStateWrapper -import com.nextcloud.talk.newarch.features.conversationslist.ConversationsListView +import com.nextcloud.talk.newarch.features.conversationsList.ConversationsListView import com.nextcloud.talk.newarch.services.GlobalService import org.koin.core.parameter.parametersOf diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationListViewModelFactory.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationListViewModelFactory.kt index 376e12143..cbae1e8f3 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationListViewModelFactory.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationListViewModelFactory.kt @@ -20,7 +20,7 @@ * */ -package com.nextcloud.talk.newarch.features.conversationslist +package com.nextcloud.talk.newarch.features.conversationsList import android.app.Application import androidx.lifecycle.ViewModel diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationPresenter.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationPresenter.kt index bcdeb7807..8d99e80d1 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationPresenter.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationPresenter.kt @@ -20,7 +20,7 @@ * */ -package com.nextcloud.talk.newarch.features.conversationslist +package com.nextcloud.talk.newarch.features.conversationsList import android.content.Context import android.graphics.drawable.Drawable diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListSource.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListSource.kt index c2b049c3f..2bc19dee7 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListSource.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListSource.kt @@ -20,7 +20,7 @@ * */ -package com.nextcloud.talk.newarch.features.conversationslist +package com.nextcloud.talk.newarch.features.conversationsList import androidx.lifecycle.LiveData import com.nextcloud.talk.models.json.conversations.Conversation diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt index 7659d91d7..25fc32ab9 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt @@ -20,9 +20,8 @@ * */ -package com.nextcloud.talk.newarch.features.conversationslist +package com.nextcloud.talk.newarch.features.conversationsList -import android.content.Context import android.content.res.ColorStateList import android.os.Bundle import android.view.LayoutInflater @@ -30,7 +29,6 @@ import android.view.View import android.view.ViewGroup import androidx.core.view.isVisible import androidx.lifecycle.observe -import androidx.recyclerview.widget.LinearLayoutManager import com.afollestad.materialdialogs.LayoutMode import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.bottomsheets.BottomSheet @@ -51,12 +49,12 @@ import com.nextcloud.talk.newarch.features.contactsflow.contacts.ContactsView import com.nextcloud.talk.newarch.features.search.DebouncingTextWatcher import com.nextcloud.talk.newarch.local.models.toUser import com.nextcloud.talk.newarch.mvvm.BaseView -import com.nextcloud.talk.newarch.mvvm.ext.initRecyclerView import com.nextcloud.talk.utils.ConductorRemapping import com.nextcloud.talk.utils.DisplayUtils import com.nextcloud.talk.utils.animations.SharedElementTransition import com.nextcloud.talk.utils.bundle.BundleKeys import com.otaliastudios.elements.Adapter +import com.otaliastudios.elements.Adapter.Companion.AUTOSCROLL_POSITION_0 import com.otaliastudios.elements.Element import com.otaliastudios.elements.Page import com.otaliastudios.elements.Presenter @@ -76,67 +74,73 @@ class ConversationsListView : BaseView() { val factory: ConversationListViewModelFactory by inject() override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup + inflater: LayoutInflater, + container: ViewGroup ): View { viewModel = viewModelProvider(factory).get(ConversationsListViewModel::class.java) val view = super.onCreateView(inflater, container) val adapter = Adapter.builder(this) - .addSource(ConversationsListSource(viewModel.conversationsLiveData)) - .addPresenter(ConversationPresenter(activity as Context, ::onElementClick, ::onElementLongClick)) - .addPresenter(Presenter.forLoadingIndicator(activity as Context, R.layout.loading_state)) - .addPresenter(AdvancedEmptyPresenter(activity as Context, R.layout.message_state, ::openNewConversationScreen) { view -> - view.messageStateImageView.imageTintList = resources?.getColor(R.color.colorPrimary)?.let { ColorStateList.valueOf(it) } - }) - .addPresenter(Presenter.forErrorIndicator(activity as Context, R.layout.message_state) { view, throwable -> - view.messageStateTextView.setText(R.string.nc_oops) - view.messageStateImageView.setImageDrawable((activity as Context).getDrawable(drawable.ic_announcement_white_24dp)) - view.messageStateImageView.imageTintList = resources?.getColor(R.color.colorPrimary)?.let { ColorStateList.valueOf(it) } - }) - .setAutoScrollMode(Adapter.AUTOSCROLL_POSITION_0, true) - .into(view.recyclerView) - + .addSource(ConversationsListSource(viewModel.conversationsLiveData)) + .addPresenter(ConversationPresenter(context, ::onElementClick, ::onElementLongClick)) + .addPresenter(Presenter.forLoadingIndicator(context, R.layout.loading_state)) + .addPresenter(AdvancedEmptyPresenter(context, R.layout.message_state, ::openNewConversationScreen) { view -> + view.messageStateImageView.imageTintList = resources?.getColor(R.color.colorPrimary)?.let { ColorStateList.valueOf(it) } + }) + .addPresenter(Presenter.forErrorIndicator(context, R.layout.message_state) { view, _ -> + with(view) { + messageStateTextView.setText(R.string.nc_oops) + messageStateImageView.setImageDrawable(context.getDrawable(drawable.ic_announcement_white_24dp)) + messageStateImageView.imageTintList = resources?.getColor(R.color.colorPrimary)?.let { ColorStateList.valueOf(it) } + } + } + ) + .setAutoScrollMode(AUTOSCROLL_POSITION_0, true) + .into(view.recyclerView) view.apply { - recyclerView.initRecyclerView(LinearLayoutManager(activity), adapter, true) - swipeRefreshLayoutView.setOnRefreshListener { - view.swipeRefreshLayoutView.isRefreshing = false - viewModel.loadConversations() + recyclerView.adapter = adapter + with(swipeRefreshLayoutView) { + setColorSchemeResources(R.color.colorPrimary) + setOnRefreshListener { + view.swipeRefreshLayoutView.isRefreshing = false + viewModel.loadConversations() + } } - - swipeRefreshLayoutView.setColorSchemeResources(R.color.colorPrimary) } activity?.inputEditText?.addTextChangedListener(DebouncingTextWatcher(lifecycle, ::setSearchQuery)) activity?.settingsButton?.setOnClickListener { val settingsTransitionName = "userAvatar.transitionTag" router.pushController( - RouterTransaction.with(SettingsController()) - .pushChangeHandler( - TransitionChangeHandlerCompat( - SharedElementTransition(arrayListOf(settingsTransitionName)), VerticalChangeHandler() - ) - ) - .popChangeHandler( - TransitionChangeHandlerCompat( - SharedElementTransition(arrayListOf(settingsTransitionName)), VerticalChangeHandler() - ) - ) + RouterTransaction.with(SettingsController()) + .pushChangeHandler( + TransitionChangeHandlerCompat( + SharedElementTransition(arrayListOf(settingsTransitionName)), VerticalChangeHandler() + ) + ) + .popChangeHandler( + TransitionChangeHandlerCompat( + SharedElementTransition(arrayListOf(settingsTransitionName)), VerticalChangeHandler() + ) + ) ) - } viewModel.apply { - avatar.observe(this@ConversationsListView) { avatar -> - activity?.settingsButton?.imageTintList = null - activity?.settingsButton?.setImageDrawable(avatar) + avatar.observe(this@ConversationsListView) { + with(activity) { + this?.settingsButton?.imageTintList = null + this?.settingsButton?.setImageDrawable(it) + } } filterLiveData.observe(this@ConversationsListView) { query -> if (!transitionInProgress) { - activity?.settingsButton?.isVisible = query.isNullOrEmpty() - activity?.clearButton?.isVisible = !query.isNullOrEmpty() + with(activity) { + this?.settingsButton?.isVisible = query.isNullOrEmpty() + this?.clearButton?.isVisible = !query.isNullOrEmpty() + } } } } @@ -149,9 +153,7 @@ class ConversationsListView : BaseView() { appBar?.isVisible = true } - private fun setSearchQuery(query: CharSequence?) { - viewModel.filterLiveData.postValue(query) - } + private fun setSearchQuery(query: CharSequence?) = viewModel.filterLiveData.postValue(query) private fun onElementClick(page: Page, holder: Presenter.Holder, element: Element) { val conversation = element.data @@ -160,16 +162,18 @@ class ConversationsListView : BaseView() { user?.let { user -> conversation?.let { conversation -> val bundle = Bundle() - bundle.putParcelable(BundleKeys.KEY_USER_ENTITY, user) - bundle.putString(BundleKeys.KEY_CONVERSATION_TOKEN, conversation.token) - bundle.putString(BundleKeys.KEY_ROOM_ID, conversation.conversationId) - bundle.putParcelable(BundleKeys.KEY_ACTIVE_CONVERSATION, Parcels.wrap(conversation)) + with(bundle) { + putParcelable(BundleKeys.KEY_USER_ENTITY, user) + putString(BundleKeys.KEY_CONVERSATION_TOKEN, conversation.token) + putString(BundleKeys.KEY_ROOM_ID, conversation.conversationId) + putParcelable(BundleKeys.KEY_ACTIVE_CONVERSATION, Parcels.wrap(conversation)) + } + ConductorRemapping.remapChatController( - router, user.id, conversation.token!!, - bundle, false + router, user.id, conversation.token!!, + bundle, false ) } - } } @@ -182,7 +186,7 @@ class ConversationsListView : BaseView() { cornerRadius(res = R.dimen.corner_radius) title(text = conversation.displayName) - listItemsWithImage(getConversationMenuItemsForConversation(conversation)) { dialog, index, item -> + listItemsWithImage(getConversationMenuItemsForConversation(conversation)) { _, _, item -> when (item.iconRes) { drawable.ic_star_border_black_24dp -> { viewModel.changeFavoriteValueForConversation(conversation, false) @@ -211,10 +215,10 @@ class ConversationsListView : BaseView() { } negativeButton(R.string.nc_cancel) icon( - drawable = DisplayUtils.getTintedDrawable( - resources!!, drawable - .ic_delete_grey600_24dp, R.color.nc_darkRed - ) + drawable = DisplayUtils.getTintedDrawable( + resources!!, drawable + .ic_delete_grey600_24dp, R.color.nc_darkRed + ) ) } } @@ -227,78 +231,69 @@ class ConversationsListView : BaseView() { } } - override fun getLayoutId(): Int { - return R.layout.conversations_list_view - } + override fun getLayoutId(): Int = R.layout.conversations_list_view - private fun openNewConversationScreen() { + private fun openNewConversationScreen() = router.pushController( - RouterTransaction.with(ContactsView()) - .pushChangeHandler(HorizontalChangeHandler()) - .popChangeHandler(HorizontalChangeHandler())) - } + RouterTransaction.with(ContactsView()) + .pushChangeHandler(HorizontalChangeHandler()) + .popChangeHandler(HorizontalChangeHandler()) + ) private fun getConversationMenuItemsForConversation(conversation: Conversation): MutableList { val items = mutableListOf() - if (conversation.favorite) { items.add( - BasicListItemWithImage( - drawable.ic_star_border_black_24dp, - context.getString(R.string.nc_remove_from_favorites) - ) + BasicListItemWithImage( + drawable.ic_star_border_black_24dp, + context.getString(R.string.nc_remove_from_favorites) + ) ) } else { items.add( - BasicListItemWithImage( - drawable.ic_star_black_24dp, - context.getString(R.string.nc_add_to_favorites) - ) + BasicListItemWithImage( + drawable.ic_star_black_24dp, + context.getString(R.string.nc_add_to_favorites) + ) ) } if (conversation.isPublic) { items.add( - (BasicListItemWithImage( - drawable - .ic_share_black_24dp, context.getString(R.string.nc_share_link) - )) + (BasicListItemWithImage( + drawable + .ic_share_black_24dp, context.getString(R.string.nc_share_link) + )) ) } if (conversation.canLeave(viewModel.globalService.currentUserLiveData.value!!.toUser())) { items.add( - BasicListItemWithImage( - drawable.ic_exit_to_app_black_24dp, context.getString - (R.string.nc_leave) - ) + BasicListItemWithImage( + drawable.ic_exit_to_app_black_24dp, context.getString + (R.string.nc_leave) + ) ) } if (conversation.canModerate(viewModel.globalService.currentUserLiveData.value!!.toUser())) { items.add( - BasicListItemWithImage( - drawable.ic_delete_grey600_24dp, context.getString( - R.string.nc_delete_call - ) - ) + BasicListItemWithImage( + drawable.ic_delete_grey600_24dp, context.getString( + R.string.nc_delete_call + ) + ) ) } return items } - override fun onFloatingActionButtonClick() { - openNewConversationScreen() - } + override fun onFloatingActionButtonClick() = openNewConversationScreen() - override fun getAppBarLayoutType(): AppBarLayoutType { - return AppBarLayoutType.SEARCH_BAR - } + override fun getAppBarLayoutType(): AppBarLayoutType = AppBarLayoutType.SEARCH_BAR - override fun getTitle(): String? { - return resources?.getString(R.string.nc_search_conversations) - } + override fun getTitle(): String? = resources?.getString(R.string.nc_search_conversations) override fun onRestoreViewState(view: View, savedViewState: Bundle) { super.onRestoreViewState(view, savedViewState) diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListViewModel.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListViewModel.kt index 3ef96f4c4..afb020c9b 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListViewModel.kt @@ -20,7 +20,7 @@ * */ -package com.nextcloud.talk.newarch.features.conversationslist +package com.nextcloud.talk.newarch.features.conversationsList import android.app.Application import android.graphics.drawable.Drawable @@ -49,7 +49,7 @@ import org.koin.core.parameter.parametersOf import java.util.concurrent.locks.ReentrantLock -class ConversationsListViewModel constructor( +class ConversationsListViewModel ( application: Application, private val getConversationsUseCase: GetConversationsUseCase, private val setConversationFavoriteValueUseCase: SetConversationFavoriteValueUseCase, diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListViewNetworkState.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListViewNetworkState.kt index 64d6bdccd..0a69a5dc5 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListViewNetworkState.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListViewNetworkState.kt @@ -20,7 +20,7 @@ * */ -package com.nextcloud.talk.newarch.features.conversationslist +package com.nextcloud.talk.newarch.features.conversationsList enum class ConversationsListViewNetworkState { LOADING, diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/di/module/ConversationsListModule.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/di/module/ConversationsListModule.kt index 45264d4d3..f2e944b52 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/di/module/ConversationsListModule.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/di/module/ConversationsListModule.kt @@ -20,15 +20,17 @@ * */ -package com.nextcloud.talk.newarch.features.conversationslist.di.module +package com.nextcloud.talk.newarch.features.conversationsList.di.module import android.app.Application +import android.os.CountDownTimer +import android.util.Log import com.nextcloud.talk.newarch.domain.repository.offline.ConversationsRepository import com.nextcloud.talk.newarch.domain.usecases.DeleteConversationUseCase import com.nextcloud.talk.newarch.domain.usecases.GetConversationsUseCase import com.nextcloud.talk.newarch.domain.usecases.LeaveConversationUseCase import com.nextcloud.talk.newarch.domain.usecases.SetConversationFavoriteValueUseCase -import com.nextcloud.talk.newarch.features.conversationslist.ConversationListViewModelFactory +import com.nextcloud.talk.newarch.features.conversationsList.ConversationListViewModelFactory import com.nextcloud.talk.newarch.services.GlobalService import org.koin.android.ext.koin.androidApplication import org.koin.dsl.module diff --git a/app/src/main/res/layout/conversations_list_view.xml b/app/src/main/res/layout/conversations_list_view.xml index 220a96ca2..eceb3a332 100644 --- a/app/src/main/res/layout/conversations_list_view.xml +++ b/app/src/main/res/layout/conversations_list_view.xml @@ -18,8 +18,10 @@ ~ along with this program. If not, see . --> -