From 93fb37a3404b980cbb7dd0e80e0fc17a6659e1ab Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Sun, 5 Jan 2020 13:19:24 +0100 Subject: [PATCH] Clean ups --- .../ConversationPresenter.kt | 30 +++++-------------- .../ConversationsListView.kt | 15 ++++++---- 2 files changed, 17 insertions(+), 28 deletions(-) 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 6d0b0b297..4975cc633 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 @@ -28,10 +28,10 @@ import android.text.TextUtils import android.text.format.DateUtils import android.view.View import android.view.ViewGroup +import androidx.core.view.isVisible import coil.api.load import coil.transform.CircleCropTransformation import com.nextcloud.talk.R -import com.nextcloud.talk.application.NextcloudTalkApplication import com.nextcloud.talk.models.json.chat.ChatMessage import com.nextcloud.talk.models.json.conversations.Conversation import com.nextcloud.talk.newarch.local.models.getCredentials @@ -68,14 +68,7 @@ open class ConversationsPresenter(context: Context, onElementClick: ((Page, Hold user?.let { user -> conversation?.let { conversation -> - val appContext = NextcloudTalkApplication.sharedApplication!!.applicationContext - - if (conversation.changing) { - holder.itemView.actionProgressBar!!.visibility = View.VISIBLE - } else { - holder.itemView.actionProgressBar!!.visibility = View.GONE - } - + holder.itemView.actionProgressBar.isVisible = conversation.changing holder.itemView.dialogName!!.text = conversation.displayName if (conversation.unreadMessages > 0) { @@ -98,17 +91,8 @@ open class ConversationsPresenter(context: Context, onElementClick: ((Page, Hold holder.itemView.dialogUnreadBubble!!.visibility = View.GONE } - if (conversation.hasPassword) { - holder.itemView.passwordProtectedRoomImageView!!.visibility = View.VISIBLE - } else { - holder.itemView.passwordProtectedRoomImageView!!.visibility = View.GONE - } - - if (conversation.favorite) { - holder.itemView.favoriteConversationImageView!!.visibility = View.VISIBLE - } else { - holder.itemView.favoriteConversationImageView!!.visibility = View.GONE - } + holder.itemView.passwordProtectedRoomImageView.isVisible = conversation.hasPassword + holder.itemView.favoriteConversationImageView.isVisible = conversation.favorite if (conversation.lastMessage != null) { holder.itemView.dialogDate!!.visibility = View.VISIBLE @@ -132,18 +116,18 @@ open class ConversationsPresenter(context: Context, onElementClick: ((Page, Hold ) { if (conversation.lastMessage!!.actorId == user.userId) { text = String.format( - appContext.getString(R.string.nc_formatted_message_you), + context.getString(R.string.nc_formatted_message_you), conversation.lastMessage!!.lastMessageDisplayText ) } else { authorDisplayName = if (!TextUtils.isEmpty(conversation.lastMessage!!.actorDisplayName)) conversation.lastMessage!!.actorDisplayName else if ("guests" == conversation.lastMessage!!.actorType) - appContext.getString(R.string.nc_guest) + context.getString(R.string.nc_guest) else "" text = String.format( - appContext.getString(R.string.nc_formatted_message), + context.getString(R.string.nc_formatted_message), authorDisplayName, conversation.lastMessage!!.lastMessageDisplayText ) 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 91599ee0d..e441829c7 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,6 +20,8 @@ package com.nextcloud.talk.newarch.features.conversationsList +import android.content.Context +import android.content.res.Configuration import android.os.Bundle import android.view.* import androidx.appcompat.widget.SearchView @@ -28,6 +30,8 @@ import butterknife.OnClick import com.afollestad.materialdialogs.LayoutMode import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.bottomsheets.BottomSheet +import com.bluelinelabs.conductor.ControllerChangeHandler +import com.bluelinelabs.conductor.ControllerChangeType import com.bluelinelabs.conductor.RouterTransaction import com.bluelinelabs.conductor.autodispose.ControllerScopeProvider import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler @@ -35,6 +39,7 @@ import com.bluelinelabs.conductor.changehandler.TransitionChangeHandlerCompat import com.bluelinelabs.conductor.changehandler.VerticalChangeHandler import com.nextcloud.talk.R import com.nextcloud.talk.R.drawable +import com.nextcloud.talk.activities.MainActivity import com.nextcloud.talk.controllers.ContactsController import com.nextcloud.talk.controllers.SettingsController import com.nextcloud.talk.controllers.bottomsheet.items.BasicListItemWithImage @@ -147,12 +152,12 @@ class ConversationsListView : BaseView() { val adapter = Adapter.builder(this) .addSource(ConversationsListSource(viewModel.conversationsLiveData)) - .addPresenter(ConversationsPresenter(context, ::onElementClick, ::onElementLongClick)) - .addPresenter(Presenter.forLoadingIndicator(context, R.layout.loading_state)) - .addPresenter(AdvancedEmptyPresenter(context, R.layout.message_state, ::openNewConversationScreen)) - .addPresenter(Presenter.forErrorIndicator(context, R.layout.message_state) { view, throwable -> + .addPresenter(ConversationsPresenter(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)) + .addPresenter(Presenter.forErrorIndicator(activity as Context, R.layout.message_state) { view, throwable -> view.messageStateTextView.setText(R.string.nc_oops) - view.messageStateImageView.setImageDrawable(context.getDrawable(drawable.ic_announcement_white_24dp)) + view.messageStateImageView.setImageDrawable((activity as Context).getDrawable(drawable.ic_announcement_white_24dp)) }) .into(view.recyclerView)