gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-06 14:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

link swipe-to-reply to messages replyable-flag

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2021-06-09 10:50:26 +02:00
parent 6c0160f197
commit f3dd482476
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
6 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt
View File

@ -45,6 +45,7 @@ import com.nextcloud.talk.R
import com.nextcloud.talk.application.NextcloudTalkApplication
import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
import com.nextcloud.talk.models.json.chat.ChatMessage
import com.nextcloud.talk.ui.recyclerview.MessageSwipeCallback
import com.nextcloud.talk.utils.ApiUtils
import com.nextcloud.talk.utils.DisplayUtils
import com.nextcloud.talk.utils.TextMatchers
@ -53,8 +54,8 @@ import com.stfalcon.chatkit.messages.MessageHolders
import javax.inject.Inject
@AutoInjector(NextcloudTalkApplication::class)
class MagicIncomingTextMessageViewHolder(incomingView: View) : MessageHolders
.IncomingTextMessageViewHolder<ChatMessage>(incomingView) {
class MagicIncomingTextMessageViewHolder(itemView: View) : MessageHolders
.IncomingTextMessageViewHolder<ChatMessage>(itemView) {
@JvmField
@BindView(R.id.messageAuthor)
@ -101,10 +102,7 @@ class MagicIncomingTextMessageViewHolder(incomingView: View) : MessageHolders
var appPreferences: AppPreferences? = null
init {
ButterKnife.bind(
this,
itemView
)
ButterKnife.bind(this, itemView)
}
override fun onBind(message: ChatMessage) {
@ -257,5 +255,7 @@ class MagicIncomingTextMessageViewHolder(incomingView: View) : MessageHolders
} else {
quotedChatMessageView?.visibility = View.GONE
}
itemView.setTag(MessageSwipeCallback.REPLYABLE_VIEW_TAG, message.isReplyable)
}
}

12
app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt
View File

@ -42,6 +42,7 @@ import com.nextcloud.talk.application.NextcloudTalkApplication
import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
import com.nextcloud.talk.models.json.chat.ChatMessage
import com.nextcloud.talk.models.json.chat.ReadStatus
import com.nextcloud.talk.ui.recyclerview.MessageSwipeCallback
import com.nextcloud.talk.utils.ApiUtils
import com.nextcloud.talk.utils.DisplayUtils.getMessageSelector
import com.nextcloud.talk.utils.DisplayUtils.searchAndReplaceWithMentionSpan
@ -89,6 +90,12 @@ class MagicOutcomingTextMessageViewHolder(itemView: View) : OutcomingTextMessage
var context: Context? = null
private val realView: View
init {
ButterKnife.bind(this, itemView)
this.realView = itemView
}
override fun onBind(message: ChatMessage) {
super.onBind(message)
sharedApplication!!.componentApplication.inject(this)
@ -208,10 +215,7 @@ class MagicOutcomingTextMessageViewHolder(itemView: View) : OutcomingTextMessage
}
checkMark?.setContentDescription(readStatusContentDescriptionString)
}
init {
ButterKnife.bind(this, itemView)
this.realView = itemView
itemView.setTag(MessageSwipeCallback.REPLYABLE_VIEW_TAG, message.isReplyable)
}
}

4
app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java
View File

@ -79,6 +79,8 @@ import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
import okhttp3.OkHttpClient;
import static com.nextcloud.talk.ui.recyclerview.MessageSwipeCallback.REPLYABLE_VIEW_TAG;
@AutoInjector(NextcloudTalkApplication.class)
public class MagicPreviewMessageViewHolder extends MessageHolders.IncomingImageMessageViewHolder<ChatMessage> {
@ -194,6 +196,8 @@ public class MagicPreviewMessageViewHolder extends MessageHolders.IncomingImageM
}
messageText.setText("");
}
itemView.setTag(REPLYABLE_VIEW_TAG, message.isReplyable());
}
private void openOrDownloadFile(ChatMessage message) {

4
app/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java
View File

@ -41,6 +41,8 @@ import javax.inject.Inject;
import androidx.core.view.ViewCompat;
import autodagger.AutoInjector;
import static com.nextcloud.talk.ui.recyclerview.MessageSwipeCallback.REPLYABLE_VIEW_TAG;
@AutoInjector(NextcloudTalkApplication.class)
public class MagicSystemMessageViewHolder extends MessageHolders.IncomingTextMessageViewHolder<ChatMessage> {
@ -85,5 +87,7 @@ public class MagicSystemMessageViewHolder extends MessageHolders.IncomingTextMes
}
text.setText(messageString);
itemView.setTag(REPLYABLE_VIEW_TAG, message.isReplyable());
}
}

11
app/src/main/java/com/nextcloud/talk/ui/recyclerview/MessageSwipeCallback.kt
View File

@ -43,9 +43,6 @@ import androidx.recyclerview.widget.ItemTouchHelper.ACTION_STATE_SWIPE
import androidx.recyclerview.widget.ItemTouchHelper.RIGHT
import androidx.recyclerview.widget.RecyclerView
import com.nextcloud.talk.R
import com.nextcloud.talk.adapters.messages.MagicIncomingTextMessageViewHolder
import com.nextcloud.talk.adapters.messages.MagicOutcomingTextMessageViewHolder
import com.nextcloud.talk.adapters.messages.MagicPreviewMessageViewHolder
import kotlin.math.abs
import kotlin.math.ceil
import kotlin.math.min
@ -76,11 +73,10 @@ class MessageSwipeCallback(private val context: Context, private val messageSwip
private var startTracking = false
override fun getMovementFlags(recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder): Int {
if (viewHolder is MagicPreviewMessageViewHolder ||
viewHolder is MagicIncomingTextMessageViewHolder ||
viewHolder is MagicOutcomingTextMessageViewHolder
view = viewHolder.itemView
if (viewHolder.itemView.getTag(REPLYABLE_VIEW_TAG) != null &&
viewHolder.itemView.getTag(REPLYABLE_VIEW_TAG) as Boolean
) {
view = viewHolder.itemView
imageDrawable = AppCompatResources.getDrawable(context, R.drawable.ic_reply)!!
shareRound = AppCompatResources.getDrawable(context, R.drawable.round_bgnd)!!
return makeMovementFlags(ACTION_STATE_IDLE, RIGHT)
@ -296,5 +292,6 @@ class MessageSwipeCallback(private val context: Context, private val messageSwip
const val ICON_BOUNDS_PIXEL_TOP: Int = 13
const val ICON_BOUNDS_PIXEL_RIGHT: Int = 12
const val ICON_BOUNDS_PIXEL_BOTTOM: Int = 11
const val REPLYABLE_VIEW_TAG: Int = R.string.replyable_message_view_tag
}
}

1
app/src/main/res/values/strings.xml
View File

@ -422,6 +422,7 @@
<!-- Non-translatable strings -->
<string name="tooManyUnreadMessages" translatable="false">999+</string>
<string name="replyable_message_view_tag" translatable="false">REPLYABLE_TAG</string>
<string name="nc_action_open_main_menu">Open main menu</string>
<string name="failed_to_save">Failed to save %1$s</string>