mirror/SmartTube
1
0
Fork 0
mirror of https://github.com/yuliskov/SmartTube.git synced 2026-05-01 02:21:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

comments: focus fix

Browse Source
This commit is contained in:
Yuriy Liskov
2023-01-02 15:09:19 +02:00
parent ab410a6ac2
commit ccadfa97b8
4 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chatkit/src/main/java/com/stfalcon/chatkit/messages/MessageHolders.java
+15
View File
@@ -9,6 +9,7 @@ import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.annotation.LayoutRes;
@@ -744,6 +745,8 @@ public class MessageHolders {
protected ViewGroup bubble;
protected TextView text;
// See: item_incoming_text_message.xml
protected RelativeLayout wrapper;
@Deprecated
public IncomingTextMessageViewHolder(View itemView) {
@@ -789,6 +792,10 @@ public class MessageHolders {
// Link configurator makes textView focusable.
if (style.isMessageFocusable()) {
configureLinksBehavior(text);
wrapper.setFocusable(true);
wrapper.setFocusableInTouchMode(true);
wrapper.setClickable(true);
wrapper.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
}
}
}
@@ -796,6 +803,7 @@ public class MessageHolders {
private void init(View itemView) {
bubble = itemView.findViewById(R.id.bubble);
text = itemView.findViewById(R.id.messageText);
wrapper = (RelativeLayout) itemView;
}
}
@@ -807,6 +815,8 @@ public class MessageHolders {
protected ViewGroup bubble;
protected TextView text;
// See: item_outcoming_text_message.xml
protected RelativeLayout wrapper;
@Deprecated
public OutcomingTextMessageViewHolder(View itemView) {
@@ -852,6 +862,10 @@ public class MessageHolders {
// Link configurator makes textView focusable.
if (style.isMessageFocusable()) {
configureLinksBehavior(text);
wrapper.setFocusable(true);
wrapper.setFocusableInTouchMode(true);
wrapper.setClickable(true);
wrapper.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
}
}
}
@@ -859,6 +873,7 @@ public class MessageHolders {
private void init(View itemView) {
bubble = itemView.findViewById(R.id.bubble);
text = itemView.findViewById(R.id.messageText);
wrapper = (RelativeLayout) itemView;
}
}
chatkit/src/main/java/com/stfalcon/chatkit/messages/RecyclerScrollMoreListener.java
+9
View File
@@ -27,6 +27,8 @@ class RecyclerScrollMoreListener
private OnLoadMoreListener loadMoreListener;
private int currentPage = 0;
private int previousTotalItemCount = 0;
private int currentScrollPos = 0;
private int maxScrollPos = 0;
private boolean loading = true;
private RecyclerView.LayoutManager mLayoutManager;
@@ -51,6 +53,13 @@ class RecyclerScrollMoreListener
@Override
public void onScrolled(RecyclerView view, int dx, int dy) {
if (loadMoreListener != null) {
// MODIFIED: throttle calls
currentScrollPos += dy;
if (currentScrollPos <= maxScrollPos) {
return;
}
maxScrollPos += dy;
int lastVisibleItemPosition = 0;
int totalItemCount = mLayoutManager.getItemCount();
smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/dialogs/other/CommentsPreferenceDialogFragment.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class CommentsPreferenceDialogFragment extends LeanbackPreferenceDialogFr
.circleCrop() // resize image
.into(imageView));
adapter.setLoadMoreListener((page, totalItemsCount) -> mCommentsReceiver.onLoadMore(mNextCommentsKey));
adapter.setOnMessageLongClickListener(message -> mCommentsReceiver.onCommentClicked(message.getNestedCommentsKey()));
adapter.setOnMessageClickListener(message -> mCommentsReceiver.onCommentClicked(message.getNestedCommentsKey()));
messagesList.setAdapter(adapter);
if (mCommentsReceiver != null) {
smarttubetv/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/widgets/chat/ChatItemMessage.java
+1 -1
View File
@@ -21,7 +21,7 @@ public class ChatItemMessage implements IMessage {
ChatItemMessage message = new ChatItemMessage();
message.mId = chatItem.getId();
if (chatItem.getMessage() != null && !chatItem.getMessage().trim().isEmpty()) {
message.mText = String.format("%s: %s", chatItem.getAuthorName(), chatItem.getMessage());
message.mText = TextUtils.concat(Utils.bold(chatItem.getAuthorName()), ": ", chatItem.getMessage());
}
message.mAuthor = ChatItemAuthor.from(chatItem);
message.mCreatedAt = new Date();