gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-16 17:25:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean ups

Browse Source
This commit is contained in:
Mario Danic 2020-01-05 13:19:24 +01:00
parent 5bb78ab935
commit 93fb37a340
No known key found for this signature in database
GPG Key ID: CDE0BBD2738C4CC0
2 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationPresenter.kt
View File

@ -28,10 +28,10 @@ import android.text.TextUtils
import android.text.format.DateUtils import android.text.format.DateUtils
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.core.view.isVisible
import coil.api.load import coil.api.load
import coil.transform.CircleCropTransformation import coil.transform.CircleCropTransformation
import com.nextcloud.talk.R 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.chat.ChatMessage
import com.nextcloud.talk.models.json.conversations.Conversation import com.nextcloud.talk.models.json.conversations.Conversation
import com.nextcloud.talk.newarch.local.models.getCredentials import com.nextcloud.talk.newarch.local.models.getCredentials
@ -68,14 +68,7 @@ open class ConversationsPresenter(context: Context, onElementClick: ((Page, Hold
user?.let { user -> user?.let { user ->
conversation?.let { conversation -> conversation?.let { conversation ->
val appContext = NextcloudTalkApplication.sharedApplication!!.applicationContext holder.itemView.actionProgressBar.isVisible = conversation.changing
if (conversation.changing) {
holder.itemView.actionProgressBar!!.visibility = View.VISIBLE
} else {
holder.itemView.actionProgressBar!!.visibility = View.GONE
}
holder.itemView.dialogName!!.text = conversation.displayName holder.itemView.dialogName!!.text = conversation.displayName
if (conversation.unreadMessages > 0) { if (conversation.unreadMessages > 0) {
@ -98,17 +91,8 @@ open class ConversationsPresenter(context: Context, onElementClick: ((Page, Hold
holder.itemView.dialogUnreadBubble!!.visibility = View.GONE holder.itemView.dialogUnreadBubble!!.visibility = View.GONE
} }
if (conversation.hasPassword) { holder.itemView.passwordProtectedRoomImageView.isVisible = conversation.hasPassword
holder.itemView.passwordProtectedRoomImageView!!.visibility = View.VISIBLE holder.itemView.favoriteConversationImageView.isVisible = conversation.favorite
} else {
holder.itemView.passwordProtectedRoomImageView!!.visibility = View.GONE
}
if (conversation.favorite) {
holder.itemView.favoriteConversationImageView!!.visibility = View.VISIBLE
} else {
holder.itemView.favoriteConversationImageView!!.visibility = View.GONE
}
if (conversation.lastMessage != null) { if (conversation.lastMessage != null) {
holder.itemView.dialogDate!!.visibility = View.VISIBLE holder.itemView.dialogDate!!.visibility = View.VISIBLE
@ -132,18 +116,18 @@ open class ConversationsPresenter(context: Context, onElementClick: ((Page, Hold
) { ) {
if (conversation.lastMessage!!.actorId == user.userId) { if (conversation.lastMessage!!.actorId == user.userId) {
text = String.format( text = String.format(
appContext.getString(R.string.nc_formatted_message_you), context.getString(R.string.nc_formatted_message_you),
conversation.lastMessage!!.lastMessageDisplayText conversation.lastMessage!!.lastMessageDisplayText
) )
} else { } else {
authorDisplayName = if (!TextUtils.isEmpty(conversation.lastMessage!!.actorDisplayName)) authorDisplayName = if (!TextUtils.isEmpty(conversation.lastMessage!!.actorDisplayName))
conversation.lastMessage!!.actorDisplayName conversation.lastMessage!!.actorDisplayName
else if ("guests" == conversation.lastMessage!!.actorType) else if ("guests" == conversation.lastMessage!!.actorType)
appContext.getString(R.string.nc_guest) context.getString(R.string.nc_guest)
else else
"" ""
text = String.format( text = String.format(
appContext.getString(R.string.nc_formatted_message), context.getString(R.string.nc_formatted_message),
authorDisplayName, authorDisplayName,
conversation.lastMessage!!.lastMessageDisplayText conversation.lastMessage!!.lastMessageDisplayText
) )

15
app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationsListView.kt
View File

@ -20,6 +20,8 @@
package com.nextcloud.talk.newarch.features.conversationsList package com.nextcloud.talk.newarch.features.conversationsList
import android.content.Context
import android.content.res.Configuration
import android.os.Bundle import android.os.Bundle
import android.view.* import android.view.*
import androidx.appcompat.widget.SearchView import androidx.appcompat.widget.SearchView
@ -28,6 +30,8 @@ import butterknife.OnClick
import com.afollestad.materialdialogs.LayoutMode import com.afollestad.materialdialogs.LayoutMode
import com.afollestad.materialdialogs.MaterialDialog import com.afollestad.materialdialogs.MaterialDialog
import com.afollestad.materialdialogs.bottomsheets.BottomSheet 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.RouterTransaction
import com.bluelinelabs.conductor.autodispose.ControllerScopeProvider import com.bluelinelabs.conductor.autodispose.ControllerScopeProvider
import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler
@ -35,6 +39,7 @@ import com.bluelinelabs.conductor.changehandler.TransitionChangeHandlerCompat
import com.bluelinelabs.conductor.changehandler.VerticalChangeHandler import com.bluelinelabs.conductor.changehandler.VerticalChangeHandler
import com.nextcloud.talk.R import com.nextcloud.talk.R
import com.nextcloud.talk.R.drawable import com.nextcloud.talk.R.drawable
import com.nextcloud.talk.activities.MainActivity
import com.nextcloud.talk.controllers.ContactsController import com.nextcloud.talk.controllers.ContactsController
import com.nextcloud.talk.controllers.SettingsController import com.nextcloud.talk.controllers.SettingsController
import com.nextcloud.talk.controllers.bottomsheet.items.BasicListItemWithImage import com.nextcloud.talk.controllers.bottomsheet.items.BasicListItemWithImage
@ -147,12 +152,12 @@ class ConversationsListView : BaseView() {
val adapter = Adapter.builder(this) val adapter = Adapter.builder(this)
.addSource(ConversationsListSource(viewModel.conversationsLiveData)) .addSource(ConversationsListSource(viewModel.conversationsLiveData))
.addPresenter(ConversationsPresenter(context, ::onElementClick, ::onElementLongClick)) .addPresenter(ConversationsPresenter(activity as Context, ::onElementClick, ::onElementLongClick))
.addPresenter(Presenter.forLoadingIndicator(context, R.layout.loading_state)) .addPresenter(Presenter.forLoadingIndicator(activity as Context, R.layout.loading_state))
.addPresenter(AdvancedEmptyPresenter(context, R.layout.message_state, ::openNewConversationScreen)) .addPresenter(AdvancedEmptyPresenter(activity as Context, R.layout.message_state, ::openNewConversationScreen))
.addPresenter(Presenter.forErrorIndicator(context, R.layout.message_state) { view, throwable -> .addPresenter(Presenter.forErrorIndicator(activity as Context, R.layout.message_state) { view, throwable ->
view.messageStateTextView.setText(R.string.nc_oops) 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) .into(view.recyclerView)