wzray/tt9
1
0
Fork 0
Code Activity

fine-tuned the SuggestionBar when displaying hundreds of suggestions

Browse source
This commit is contained in:
sspanak 2025-03-26 15:03:07 +02:00 • committed by Dimo Karaivanov
parent 09c0a646dd
commit a5b6a20a50
1 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

36
app/src/main/java/io/github/sspanak/tt9/ui/tray/SuggestionsBar.java
View file

@ -34,7 +34,8 @@ public class SuggestionsBar {
private int backgroundColor = Color.TRANSPARENT; private int backgroundColor = Color.TRANSPARENT;
private double lastClickTime = 0; private double lastClickTime = 0;
protected int selectedIndex = 0; private int lastScrollIndex = 0;
private int selectedIndex = 0;
@Nullable private List<String> suggestions = new ArrayList<>(); @Nullable private List<String> suggestions = new ArrayList<>();
@NonNull private final List<String> visibleSuggestions = new ArrayList<>(); @NonNull private final List<String> visibleSuggestions = new ArrayList<>();
@ -78,8 +79,6 @@ public class SuggestionsBar {
animator.setChangeDuration(SettingsStore.SUGGESTIONS_TRANSLATE_ANIMATION_DURATION); animator.setChangeDuration(SettingsStore.SUGGESTIONS_TRANSLATE_ANIMATION_DURATION);
animator.setAddDuration(SettingsStore.SUGGESTIONS_TRANSLATE_ANIMATION_DURATION); animator.setAddDuration(SettingsStore.SUGGESTIONS_TRANSLATE_ANIMATION_DURATION);
animator.setRemoveDuration(SettingsStore.SUGGESTIONS_TRANSLATE_ANIMATION_DURATION); animator.setRemoveDuration(SettingsStore.SUGGESTIONS_TRANSLATE_ANIMATION_DURATION);
mView.setItemAnimator(animator);
} }
@ -196,7 +195,7 @@ public class SuggestionsBar {
setStem(newSuggestions, containsGenerated); setStem(newSuggestions, containsGenerated);
addManySuggestions(newSuggestions, mView != null ? SettingsStore.SUGGESTIONS_MAX : Integer.MAX_VALUE); addManySuggestions(newSuggestions, mView != null ? SettingsStore.SUGGESTIONS_MAX : Integer.MAX_VALUE);
selectedIndex = Math.min(selectedIndex, visibleSuggestions.size() - 1); selectedIndex = Math.min(selectedIndex, visibleSuggestions.size() - 1);
displaySuggestions(visibleSuggestions.size() <= SettingsStore.SUGGESTIONS_MAX); displaySuggestions();
} }
@ -266,12 +265,13 @@ public class SuggestionsBar {
} }
private void displaySuggestions(boolean withScrollAnimation) { private void displaySuggestions() {
if (mView == null) { if (mView == null) {
return; return;
} }
mView.setItemAnimator(withScrollAnimation ? animator : null); mView.setItemAnimator(visibleSuggestions.size() <= SettingsStore.SUGGESTIONS_MAX + 1 ? animator : null);
mSuggestionsAdapter.resetItems(selectedIndex); mSuggestionsAdapter.resetItems(selectedIndex);
if (selectedIndex > 0) { if (selectedIndex > 0) {
mView.scrollToPosition(selectedIndex); mView.scrollToPosition(selectedIndex);
@ -284,14 +284,16 @@ public class SuggestionsBar {
* the SHOW_MORE_SUGGESTION. This method will display remove the SHOW_MORE_SUGGESTION and display * the SHOW_MORE_SUGGESTION. This method will display remove the SHOW_MORE_SUGGESTION and display
* all the hidden suggestions. It also scrolls correctly to the new visible suggestion. * all the hidden suggestions. It also scrolls correctly to the new visible suggestion.
*/ */
private void displayHiddenSuggestionsIfNeeded(boolean scrollBack) { private boolean appendHiddenSuggestionsIfNeeded(boolean scrollBack) {
if (mView == null || !visibleSuggestions.get(selectedIndex).equals(SHOW_MORE_SUGGESTION)) { if (mView == null || !visibleSuggestions.get(selectedIndex).equals(SHOW_MORE_SUGGESTION)) {
return; return false;
} }
visibleSuggestions.clear(); visibleSuggestions.clear();
addManySuggestions(suggestions, Integer.MAX_VALUE); addManySuggestions(suggestions, Integer.MAX_VALUE);
selectedIndex = scrollBack ? visibleSuggestions.size() - 1 : selectedIndex; selectedIndex = scrollBack || selectedIndex >= visibleSuggestions.size() ? visibleSuggestions.size() - 1 : selectedIndex;
return true;
} }
@ -315,7 +317,9 @@ public class SuggestionsBar {
} }
calculateScrollIndex(increment); calculateScrollIndex(increment);
displayHiddenSuggestionsIfNeeded(increment < 0); if (appendHiddenSuggestionsIfNeeded(increment < 0)) {
displaySuggestions();
}
scrollToIndex(); scrollToIndex();
} }
@ -357,11 +361,9 @@ public class SuggestionsBar {
return; return;
} }
if (containsStem() && selectedIndex == 1) { mView.setItemAnimator(Math.abs(selectedIndex - lastScrollIndex) < SettingsStore.SUGGESTIONS_MAX ? animator : null);
mView.scrollToPosition(0); mView.scrollToPosition(containsStem() && selectedIndex == 1 ? 0 : selectedIndex);
} else { lastScrollIndex = selectedIndex;
mView.scrollToPosition(selectedIndex);
}
} }
@ -432,8 +434,12 @@ public class SuggestionsBar {
private void handleItemClick(int position) { private void handleItemClick(int position) {
vibration.vibrate(); vibration.vibrate();
selectedIndex = position; selectedIndex = position;
if (appendHiddenSuggestionsIfNeeded(false)) {
displaySuggestions();
} else {
onItemClick.run(); onItemClick.run();
} }
}
private boolean onTouch(View v, MotionEvent event) { private boolean onTouch(View v, MotionEvent event) {