Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

new pinned toolbar & history view keys long press functions #691

Merged
merged 10 commits into from
May 1, 2024
Merged

new pinned toolbar & history view keys long press functions #691

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8bbd8a3
new pinned toolbar keys long press functions.
Apr 13, 2024
47d55c5
make clipboard toolbar scrollable to handle overflow
Apr 25, 2024
7a4e591
Use Heliboard keycodes. Move duplicated code to a new function
Apr 25, 2024
21799ed
move function to ToolbarUtils.kt
Apr 29, 2024
d173087
rearrange keycodes, etc.
Apr 29, 2024
5da2789
fix long press clipboard key
Apr 29, 2024
acdd41f
rename page up/down keycodes
May 1, 2024
c4c5952
fix clipboard long click replacing the underlined word
May 1, 2024
ac61096
onLongClick functions small fixes
May 1, 2024
2fe0917
attempt to fix copy crash
May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions app/src/main/java/helium314/keyboard/keyboard/KeyboardSwitcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputMethodSubtype;
import android.widget.HorizontalScrollView;
import android.widget.LinearLayout;

import androidx.annotation.NonNull;
Expand Down Expand Up @@ -49,6 +50,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
private EmojiPalettesView mEmojiPalettesView;
private View mEmojiTabStripView;
private LinearLayout mClipboardStripView;
private HorizontalScrollView mClipboardStripScrollView;
private View mSuggestionStripView;
private ClipboardHistoryView mClipboardHistoryView;
private LatinIME mLatinIME;
Expand Down Expand Up @@ -280,7 +282,7 @@ private void setMainKeyboardFrame(
mEmojiPalettesView.setVisibility(View.GONE);
mEmojiPalettesView.stopEmojiPalettes();
mEmojiTabStripView.setVisibility(View.GONE);
mClipboardStripView.setVisibility(View.GONE);
mClipboardStripScrollView.setVisibility(View.GONE);
mSuggestionStripView.setVisibility(View.VISIBLE);
mClipboardHistoryView.setVisibility(View.GONE);
mClipboardHistoryView.stopClipboardHistory();
Expand All @@ -299,7 +301,7 @@ public void setEmojiKeyboard() {
// @see LatinIME#onComputeInset(android.inputmethodservice.InputMethodService.Insets)
mKeyboardView.setVisibility(View.GONE);
mSuggestionStripView.setVisibility(View.GONE);
mClipboardStripView.setVisibility(View.GONE);
mClipboardStripScrollView.setVisibility(View.GONE);
mEmojiTabStripView.setVisibility(View.VISIBLE);
mClipboardHistoryView.setVisibility(View.GONE);
mEmojiPalettesView.startEmojiPalettes(
Expand All @@ -322,7 +324,8 @@ public void setClipboardKeyboard() {
mKeyboardView.setVisibility(View.GONE);
mEmojiTabStripView.setVisibility(View.GONE);
mSuggestionStripView.setVisibility(View.GONE);
mClipboardStripView.setVisibility(View.VISIBLE);
mClipboardStripScrollView.post(() -> mClipboardStripScrollView.fullScroll(HorizontalScrollView.FOCUS_RIGHT));
mClipboardStripScrollView.setVisibility(View.VISIBLE);
mEmojiPalettesView.setVisibility(View.GONE);
mClipboardHistoryView.startClipboardHistory(
mLatinIME.getClipboardHistoryManager(),
Expand Down Expand Up @@ -571,6 +574,7 @@ public View onCreateInputView(@NonNull Context displayContext, final boolean isH
mClipboardHistoryView.setKeyboardActionListener(mLatinIME.mKeyboardActionListener);
mEmojiTabStripView = mCurrentInputView.findViewById(R.id.emoji_tab_strip);
mClipboardStripView = mCurrentInputView.findViewById(R.id.clipboard_strip);
mClipboardStripScrollView = mCurrentInputView.findViewById(R.id.clipboard_strip_scroll_view);
mSuggestionStripView = mCurrentInputView.findViewById(R.id.suggestion_strip_view);

return mCurrentInputView;
Expand Down
27 changes: 17 additions & 10 deletions app/src/main/res/layout/strip_container.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,23 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
style="?attr/suggestionStripViewStyle" />
<LinearLayout
android:id="@+id/clipboard_strip"
android:orientation="horizontal"
<HorizontalScrollView
android:id="@+id/clipboard_strip_scroll_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
style="?attr/suggestionStripViewStyle" >
<!-- empty view to move buttons to the right -->
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
</LinearLayout>
android:visibility="gone"
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you add android:visibility="gone"? Is it necessary now for some reason?

android:scrollbarThumbHorizontal="@color/toolbar_scrollbar" >
<LinearLayout
android:id="@+id/clipboard_strip"
android:orientation="horizontal"
android:layout_width="wrap_content"
android:layout_height="match_parent"
style="?attr/suggestionStripViewStyle" >
<!-- empty view to move buttons to the right -->
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
</LinearLayout>
</HorizontalScrollView>
</FrameLayout>