From d5ee96dd46bdf0f912409aef462f013df7f58684 Mon Sep 17 00:00:00 2001 From: AlexandrKozlovskiy Date: Mon, 1 Jan 2024 20:25:57 +0300 Subject: [PATCH] downgraded to previous state,because some code will works incorrect --- .../org/telegram/ui/Cells/ChatMessageCell.java | 18 +++++++----------- .../ui/Components/RecyclerListView.java | 3 +++ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java index c4a12e644..cb33774e5 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Cells/ChatMessageCell.java @@ -21924,7 +21924,7 @@ CONTACT_VIEW = -1; getLocationOnScreen(loc); r.offset(loc[0],loc[1]); scrollBy(r.left, r.top); - //announceForAccessibility(getIterableTextForAccessibility()); + //announceForAccessibility(accessibilityText); } return getAccessibilityNodeProvider().performAction(currentFocusedVirtualView,action,arguments); }*/ @@ -21991,8 +21991,8 @@ CONTACT_VIEW = -1; event.setScrollX(getScrollX()); event.setScrollY(getScrollY()); if(seekBarAccessibilityDelegate!=null &¤tFocusedVirtualView==-1) seekBarAccessibilityDelegate.onInitializeAccessibilityEvent(ChatMessageCell.this,event); - CharSequence accText =getIterableTextForAccessibility(); - if(event.getText().size() ==0) event.setContentDescription(accText); + setAccessibilityTextIfNeeded(); + if(event.getText().size() ==0) event.setContentDescription(accessibilityText); } @Override @@ -22044,8 +22044,7 @@ CONTACT_VIEW = -1; public int[] getCoords(Boolean back) { return getCoords(back,false); } - //To support diferents granularities for talkback. See sources of View class in android sdk sources. - public CharSequence getIterableTextForAccessibility() { + public void setAccessibilityTextIfNeeded() { final boolean unread = currentMessageObject != null && currentMessageObject.isOut() && !currentMessageObject.scheduled && currentMessageObject.isUnread(); final boolean contentUnread = currentMessageObject != null && currentMessageObject.isContentUnread(); final long fileSize = currentMessageObject != null ? currentMessageObject.loadedFileSize : 0; @@ -22168,13 +22167,13 @@ CONTACT_VIEW = -1; sb.append("\n"); sb.append(LocaleController.getString("AccDescrMsgSendingError", R.string.AccDescrMsgSendingError)); } - } else if(currentTimeString!=null) { + } else if(currentTimeString.length()>0) { sb.append("\n"); sb.append(LocaleController.formatString("AccDescrReceivedDate", R.string.AccDescrReceivedDate, LocaleController.getString("TodayAt", R.string.TodayAt) + " " + currentTimeString)); } if(currentMessageObject.isSponsored()) { sb.append("\n"); - sb.append(LocaleController.getString("Sponsored")); + sb.append(LocaleController.getString("SponsoredMessage",R.string.SponsoredMessage)); } if (getRepliesCount() > 0 && !hasCommentLayout()) { sb.append("\n"); @@ -22248,14 +22247,11 @@ CONTACT_VIEW = -1; }; sb.setSpan(underlineSpan, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); } - //if some info has changed,such as message become read or played,etc,update our variable. - //if(accessibilityText==null ||!sb.toString().equals(accessibilityText.toString())) accessibilityText = sb; accessibilityText = sb; accessibilityTextUnread = unread; accessibilityTextContentUnread = contentUnread; accessibilityTextFileSize = fileSize; } - return accessibilityText; } @Override @@ -22571,7 +22567,7 @@ CONTACT_VIEW = -1; if (virtualViewId == HOST_VIEW_ID) { AccessibilityNodeInfo info = AccessibilityNodeInfo.obtain(ChatMessageCell.this); onInitializeAccessibilityNodeInfo(info); - if (accessibilityText == null) getIterableTextForAccessibility(); + setAccessibilityTextIfNeeded(); if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) { info.setContentDescription(accessibilityText.toString()); } else { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/RecyclerListView.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/RecyclerListView.java index fbeb40d7c..48b5dd8c6 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/RecyclerListView.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/RecyclerListView.java @@ -2974,6 +2974,8 @@ public class RecyclerListView extends RecyclerView { } @Override public boolean performAccessibilityAction(int action, Bundle arguments) { + //This code works not always correct,because i dont know,how to get correct coordinate,to scroll to next/previous item,to scroll to it. item. + /* if(action==AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD ||action==AccessibilityNodeInfo.ACTION_SCROLL_FORWARD) { if(getLayoutManager() instanceof GridLayoutManagerFixed) { GridLayoutManagerFixed g=(GridLayoutManagerFixed) getLayoutManager(); @@ -3009,6 +3011,7 @@ if(findViewHolderForLayoutPosition(pos)!=null &&findViewHolderForLayoutPosition( } } } + */ return super.performAccessibilityAction(action,arguments); } } \ No newline at end of file