diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt index d8d658ffe..e9431cacf 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt @@ -49,8 +49,6 @@ import butterknife.OnClick import coil.api.load import coil.target.Target import coil.transform.CircleCropTransformation -import com.bluelinelabs.conductor.ControllerChangeHandler -import com.bluelinelabs.conductor.ControllerChangeType import com.bluelinelabs.conductor.RouterTransaction import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler import com.bluelinelabs.conductor.changehandler.VerticalChangeHandler diff --git a/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt b/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt index 71d7bb7e0..f30eacaf8 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.kt @@ -77,16 +77,16 @@ abstract class BaseController : ButterKnifeController(), ComponentCallbacks { } protected val floatingActionButton: FloatingActionButton? - get() { - var floatingActionButton: FloatingActionButton? = null - activity?.let { - if (it is MainActivity) { - floatingActionButton = it.floatingActionButton + get() { + var floatingActionButton: FloatingActionButton? = null + activity?.let { + if (it is MainActivity) { + floatingActionButton = it.floatingActionButton + } } - } - return floatingActionButton - } + return floatingActionButton + } override fun onOptionsItemSelected(item: MenuItem): Boolean { return when (item.itemId) { diff --git a/app/src/main/java/com/nextcloud/talk/newarch/data/repository/offline/ConversationsRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/newarch/data/repository/offline/ConversationsRepositoryImpl.kt index f48b06e5a..b5e2c4492 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/data/repository/offline/ConversationsRepositoryImpl.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/data/repository/offline/ConversationsRepositoryImpl.kt @@ -60,7 +60,7 @@ class ConversationsRepositoryImpl(val conversationsDao: ConversationsDao) : override fun getConversationsForUser(userId: Long, filter: CharSequence?): LiveData> { filter?.let { return conversationsDao.getConversationsForUserWithFilter(userId, it.toString()).distinctUntilChanged().map { data -> - data.map {conversationEntity -> + data.map { conversationEntity -> conversationEntity.toConversation() } } 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 4975cc633..11db3e57d 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 @@ -147,7 +147,7 @@ open class ConversationsPresenter(context: Context, onElementClick: ((Page, Hold conversationDrawable?.let { holder.itemView.dialogAvatar.load(conversationDrawable) - }?: run { + } ?: run { holder.itemView.dialogAvatar.load(ApiUtils.getUrlForAvatarWithName( user.baseUrl, conversation.name, R.dimen.avatar_size)) 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 cb81efd7b..c7ab06bca 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 @@ -29,7 +29,7 @@ import com.otaliastudios.elements.Page import com.otaliastudios.elements.Source import com.otaliastudios.elements.extensions.MainSource -class ConversationsListSource(private val data: LiveData>, private val elementType: Int = 0, loadingIndicatorsEnabled: Boolean = true, errorIndicatorEnabled: Boolean = true, emptyIndicatorEnabled: Boolean = true) : MainSource(loadingIndicatorsEnabled, errorIndicatorEnabled, emptyIndicatorEnabled) { +class ConversationsListSource(private val data: LiveData>, private val elementType: Int = 0, loadingIndicatorsEnabled: Boolean = true, errorIndicatorEnabled: Boolean = true, emptyIndicatorEnabled: Boolean = true) : MainSource(loadingIndicatorsEnabled, errorIndicatorEnabled, emptyIndicatorEnabled) { override fun onPageOpened(page: Page, dependencies: List>) { super.onPageOpened(page, dependencies) 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 3a72e9ace..4198cf2d2 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 @@ -22,10 +22,11 @@ package com.nextcloud.talk.newarch.features.conversationsList import android.content.Context import android.os.Bundle -import android.view.* +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup import androidx.core.view.isVisible import androidx.lifecycle.observe -import butterknife.OnClick import com.afollestad.materialdialogs.LayoutMode import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.bottomsheets.BottomSheet @@ -51,7 +52,10 @@ 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.* +import com.otaliastudios.elements.Adapter +import com.otaliastudios.elements.Element +import com.otaliastudios.elements.Page +import com.otaliastudios.elements.Presenter import com.uber.autodispose.lifecycle.LifecycleScopeProvider import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager import kotlinx.android.synthetic.main.controller_conversations_rv.view.* @@ -124,7 +128,7 @@ class ConversationsListView : BaseView() { activity?.settingsButton?.setImageDrawable(avatar) } - viewModel.filterLiveData.observe(this@ConversationsListView) {query -> + viewModel.filterLiveData.observe(this@ConversationsListView) { query -> activity?.settingsButton?.isVisible = query.isNullOrEmpty() activity?.clearButton?.isVisible = !query.isNullOrEmpty() } 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 4b227f5f4..9987646e4 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 @@ -22,11 +22,8 @@ package com.nextcloud.talk.newarch.features.conversationsList import android.app.Application import android.graphics.drawable.Drawable -import android.os.Handler -import android.util.Log import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Transformations -import androidx.lifecycle.distinctUntilChanged import androidx.lifecycle.viewModelScope import coil.Coil import coil.api.get diff --git a/app/src/main/java/com/nextcloud/talk/newarch/services/shortcuts/ShortcutService.kt b/app/src/main/java/com/nextcloud/talk/newarch/services/shortcuts/ShortcutService.kt index a452602bd..580950503 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/services/shortcuts/ShortcutService.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/services/shortcuts/ShortcutService.kt @@ -49,7 +49,6 @@ import com.nextcloud.talk.utils.ApiUtils import com.nextcloud.talk.utils.bundle.BundleKeys import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch -import java.lang.Exception import kotlin.math.abs diff --git a/app/src/main/java/com/nextcloud/talk/newarch/utils/ChangeHandlerCoordinatorLayout.kt b/app/src/main/java/com/nextcloud/talk/newarch/utils/ChangeHandlerCoordinatorLayout.kt index 1e1b68ac2..ad2f95a83 100644 --- a/app/src/main/java/com/nextcloud/talk/newarch/utils/ChangeHandlerCoordinatorLayout.kt +++ b/app/src/main/java/com/nextcloud/talk/newarch/utils/ChangeHandlerCoordinatorLayout.kt @@ -34,15 +34,13 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout import com.bluelinelabs.conductor.Controller import com.bluelinelabs.conductor.ControllerChangeHandler import com.bluelinelabs.conductor.ControllerChangeHandler.ControllerChangeListener -import com.nextcloud.talk.activities.MainActivity -import com.nextcloud.talk.newarch.features.conversationsList.ConversationsListView class ChangeHandlerCoordinatorLayout : CoordinatorLayout, ControllerChangeListener { private var inProgressTransactionCount = 0 - constructor(context: Context) : super(context) {} - constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {} - constructor(context: Context, attrs: AttributeSet?, @AttrRes defStyleAttr: Int) : super(context, attrs, defStyleAttr) {} + constructor(context: Context) : super(context) + constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) + constructor(context: Context, attrs: AttributeSet?, @AttrRes defStyleAttr: Int) : super(context, attrs, defStyleAttr) override fun onInterceptTouchEvent(ev: MotionEvent): Boolean { return inProgressTransactionCount > 0 || super.onInterceptTouchEvent(ev)