From 63adb2b132f72a6c04b81c2f8e479821f9648c97 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 2 Apr 2017 14:25:34 +0200 Subject: [PATCH] Rename TerminalKeyListener to TerminalViewClient --- .../java/com/termux/app/TermuxActivity.java | 2 +- ...KeyListener.java => TermuxViewClient.java} | 6 ++-- .../com/termux/window/TermuxFloatView.java | 2 +- ...stener.java => TermuxFloatViewClient.java} | 6 ++-- .../java/com/termux/view/TerminalView.java | 28 +++++++++---------- ...yListener.java => TerminalViewClient.java} | 5 ++-- 6 files changed, 24 insertions(+), 25 deletions(-) rename app/src/main/java/com/termux/app/{TermuxKeyListener.java => TermuxViewClient.java} (98%) rename float/src/main/java/com/termux/window/{TermuxFloatKeyListener.java => TermuxFloatViewClient.java} (97%) rename terminal-view/src/main/java/com/termux/view/{TerminalKeyListener.java => TerminalViewClient.java} (87%) diff --git a/app/src/main/java/com/termux/app/TermuxActivity.java b/app/src/main/java/com/termux/app/TermuxActivity.java index dfd1dd49..8e6c7255 100644 --- a/app/src/main/java/com/termux/app/TermuxActivity.java +++ b/app/src/main/java/com/termux/app/TermuxActivity.java @@ -213,7 +213,7 @@ public final class TermuxActivity extends Activity implements ServiceConnection setContentView(R.layout.drawer_layout); mTerminalView = (TerminalView) findViewById(R.id.terminal_view); - mTerminalView.setOnKeyListener(new TermuxKeyListener(this)); + mTerminalView.setOnKeyListener(new TermuxViewClient(this)); mTerminalView.setTextSize(mSettings.getFontSize()); mFullScreenHelper.setImmersive(mSettings.isFullScreen()); diff --git a/app/src/main/java/com/termux/app/TermuxKeyListener.java b/app/src/main/java/com/termux/app/TermuxViewClient.java similarity index 98% rename from app/src/main/java/com/termux/app/TermuxKeyListener.java rename to app/src/main/java/com/termux/app/TermuxViewClient.java index 4e5f91c3..f02451d5 100644 --- a/app/src/main/java/com/termux/app/TermuxKeyListener.java +++ b/app/src/main/java/com/termux/app/TermuxViewClient.java @@ -12,18 +12,18 @@ import android.view.inputmethod.InputMethodManager; import com.termux.terminal.KeyHandler; import com.termux.terminal.TerminalEmulator; import com.termux.terminal.TerminalSession; -import com.termux.view.TerminalKeyListener; +import com.termux.view.TerminalViewClient; import java.util.List; -public final class TermuxKeyListener implements TerminalKeyListener { +public final class TermuxViewClient implements TerminalViewClient { final TermuxActivity mActivity; /** Keeping track of the special keys acting as Ctrl and Fn for the soft keyboard and other hardware keys. */ boolean mVirtualControlKeyDown, mVirtualFnKeyDown; - public TermuxKeyListener(TermuxActivity activity) { + public TermuxViewClient(TermuxActivity activity) { this.mActivity = activity; } diff --git a/float/src/main/java/com/termux/window/TermuxFloatView.java b/float/src/main/java/com/termux/window/TermuxFloatView.java index 64ec6f6a..26a4b622 100644 --- a/float/src/main/java/com/termux/window/TermuxFloatView.java +++ b/float/src/main/java/com/termux/window/TermuxFloatView.java @@ -87,7 +87,7 @@ public class TermuxFloatView extends LinearLayout { public void initializeFloatingWindow() { mTerminalView = (TerminalView) findViewById(R.id.terminal_view); - mTerminalView.setOnKeyListener(new TermuxFloatKeyListener(this)); + mTerminalView.setOnKeyListener(new TermuxFloatViewClient(this)); } @Override diff --git a/float/src/main/java/com/termux/window/TermuxFloatKeyListener.java b/float/src/main/java/com/termux/window/TermuxFloatViewClient.java similarity index 97% rename from float/src/main/java/com/termux/window/TermuxFloatKeyListener.java rename to float/src/main/java/com/termux/window/TermuxFloatViewClient.java index 55cb669d..0e86df53 100644 --- a/float/src/main/java/com/termux/window/TermuxFloatKeyListener.java +++ b/float/src/main/java/com/termux/window/TermuxFloatViewClient.java @@ -10,9 +10,9 @@ import android.view.inputmethod.InputMethodManager; import com.termux.terminal.KeyHandler; import com.termux.terminal.TerminalEmulator; import com.termux.terminal.TerminalSession; -import com.termux.view.TerminalKeyListener; +import com.termux.view.TerminalViewClient; -public class TermuxFloatKeyListener implements TerminalKeyListener { +public class TermuxFloatViewClient implements TerminalViewClient { private final TermuxFloatView view; /** @@ -20,7 +20,7 @@ public class TermuxFloatKeyListener implements TerminalKeyListener { */ boolean mVirtualControlKeyDown, mVirtualFnKeyDown; - public TermuxFloatKeyListener(TermuxFloatView view) { + public TermuxFloatViewClient(TermuxFloatView view) { this.view = view; } diff --git a/terminal-view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java index e8d18e48..fb018747 100644 --- a/terminal-view/src/main/java/com/termux/view/TerminalView.java +++ b/terminal-view/src/main/java/com/termux/view/TerminalView.java @@ -48,7 +48,7 @@ public final class TerminalView extends View { TerminalRenderer mRenderer; - TerminalKeyListener mOnKeyListener; + TerminalViewClient mClient; /** The top row of text to display. Ranges from -activeTranscriptRows to 0. */ int mTopRow; @@ -105,7 +105,7 @@ public final class TerminalView extends View { requestFocus(); if (!mEmulator.isMouseTrackingActive()) { if (!e.isFromSource(InputDevice.SOURCE_MOUSE)) { - mOnKeyListener.onSingleTapUp(e); + mClient.onSingleTapUp(e); return true; } } @@ -135,7 +135,7 @@ public final class TerminalView extends View { public boolean onScale(float focusX, float focusY, float scale) { if (mEmulator == null || mIsSelectingText) return true; mScaleFactor *= scale; - mScaleFactor = mOnKeyListener.onScale(mScaleFactor); + mScaleFactor = mClient.onScale(mScaleFactor); return true; } @@ -189,7 +189,7 @@ public final class TerminalView extends View { @Override public void onLongPress(MotionEvent e) { if (mGestureRecognizer.isInProgress()) return; - if (mOnKeyListener.onLongPress(e)) return; + if (mClient.onLongPress(e)) return; if (!mIsSelectingText) { performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); toggleSelectingText(e); @@ -203,8 +203,8 @@ public final class TerminalView extends View { * @param onKeyListener Listener for all kinds of key events, both hardware and IME (which makes it different from that * available with {@link View#setOnKeyListener(OnKeyListener)}. */ - public void setOnKeyListener(TerminalKeyListener onKeyListener) { - this.mOnKeyListener = onKeyListener; + public void setOnKeyListener(TerminalViewClient onKeyListener) { + this.mClient = onKeyListener; } /** @@ -556,7 +556,7 @@ public final class TerminalView extends View { if (mIsSelectingText) { toggleSelectingText(null); return true; - } else if (mOnKeyListener.shouldBackButtonBeMappedToEscape()) { + } else if (mClient.shouldBackButtonBeMappedToEscape()) { // Intercept back button to treat it as escape: switch (event.getAction()) { case KeyEvent.ACTION_DOWN: @@ -575,10 +575,10 @@ public final class TerminalView extends View { Log.i(EmulatorDebug.LOG_TAG, "onKeyDown(keyCode=" + keyCode + ", isSystem()=" + event.isSystem() + ", event=" + event + ")"); if (mEmulator == null) return true; - if (mOnKeyListener.onKeyDown(keyCode, event, mTermSession)) { + if (mClient.onKeyDown(keyCode, event, mTermSession)) { invalidate(); return true; - } else if (event.isSystem() && (!mOnKeyListener.shouldBackButtonBeMappedToEscape() || keyCode != KeyEvent.KEYCODE_BACK)) { + } else if (event.isSystem() && (!mClient.shouldBackButtonBeMappedToEscape() || keyCode != KeyEvent.KEYCODE_BACK)) { return super.onKeyDown(keyCode, event); } else if (event.getAction() == KeyEvent.ACTION_MULTIPLE && keyCode == KeyEvent.KEYCODE_UNKNOWN) { mTermSession.write(event.getCharacters()); @@ -642,10 +642,10 @@ public final class TerminalView extends View { + leftAltDownFromEvent + ")"); } - final boolean controlDown = controlDownFromEvent || mOnKeyListener.readControlKey(); - final boolean altDown = leftAltDownFromEvent || mOnKeyListener.readAltKey(); + final boolean controlDown = controlDownFromEvent || mClient.readControlKey(); + final boolean altDown = leftAltDownFromEvent || mClient.readAltKey(); - if (mOnKeyListener.onCodePoint(codePoint, controlDown, mTermSession)) return; + if (mClient.onCodePoint(codePoint, controlDown, mTermSession)) return; if (controlDown) { if (codePoint >= 'a' && codePoint <= 'z') { @@ -714,7 +714,7 @@ public final class TerminalView extends View { Log.i(EmulatorDebug.LOG_TAG, "onKeyUp(keyCode=" + keyCode + ", event=" + event + ")"); if (mEmulator == null) return true; - if (mOnKeyListener.onKeyUp(keyCode, event)) { + if (mClient.onKeyUp(keyCode, event)) { invalidate(); return true; } else if (event.isSystem()) { @@ -782,7 +782,7 @@ public final class TerminalView extends View { @TargetApi(23) public void toggleSelectingText(MotionEvent ev) { mIsSelectingText = !mIsSelectingText; - mOnKeyListener.copyModeChanged(mIsSelectingText); + mClient.copyModeChanged(mIsSelectingText); if (mIsSelectingText) { if (mLeftSelectionHandle == null) { diff --git a/terminal-view/src/main/java/com/termux/view/TerminalKeyListener.java b/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java similarity index 87% rename from terminal-view/src/main/java/com/termux/view/TerminalKeyListener.java rename to terminal-view/src/main/java/com/termux/view/TerminalViewClient.java index ae21f39a..d2b62fa1 100644 --- a/terminal-view/src/main/java/com/termux/view/TerminalKeyListener.java +++ b/terminal-view/src/main/java/com/termux/view/TerminalViewClient.java @@ -8,11 +8,10 @@ import com.termux.terminal.TerminalSession; /** * Input and scale listener which may be set on a {@link TerminalView} through - * {@link TerminalView#setOnKeyListener(TerminalKeyListener)}. + * {@link TerminalView#setOnKeyListener(TerminalViewClient)}. *

- * TODO: Rename to TerminalViewClient. */ -public interface TerminalKeyListener { +public interface TerminalViewClient { /** * Callback function on scale events according to {@link ScaleGestureDetector#getScaleFactor()}.