From bff6b96f1e2a4c14d474852b8b5d8b22793f8b21 Mon Sep 17 00:00:00 2001 From: zt515 Date: Thu, 30 Nov 2017 00:31:58 +0800 Subject: [PATCH] Refactor: package structure --- .../frontend/client/event/CreateNewSessionEvent.kt | 6 ------ .../client/event/SwitchIndexedSessionEvent.kt | 6 ------ .../frontend/client/event/SwitchSessionEvent.kt | 6 ------ .../frontend/client/event/TitleChangedEvent.kt | 6 ------ .../frontend/client/event/ToggleFullScreenEvent.kt | 6 ------ .../neoterm/frontend/client/event/ToggleImeEvent.kt | 6 ------ .../io/neoterm/frontend/floating/TerminalDialog.kt | 8 ++++---- .../frontend/{ => session}/shell/ShellParameter.kt | 2 +- .../{ => session}/shell/ShellTermSession.kt | 4 ++-- .../shell}/client/BasicSessionCallback.kt | 2 +- .../{ => session/shell}/client/BasicViewClient.kt | 2 +- .../shell}/client/TermCompleteListener.kt | 2 +- .../{ => session/shell}/client/TermDataHolder.kt | 2 +- .../shell}/client/TermSessionCallback.kt | 2 +- .../{ => session/shell}/client/TermUiPresenter.kt | 2 +- .../{ => session/shell}/client/TermViewClient.kt | 2 +- .../shell/client/event/CreateNewSessionEvent.kt | 6 ++++++ .../shell/client/event/SwitchIndexedSessionEvent.kt | 6 ++++++ .../shell/client/event/SwitchSessionEvent.kt | 6 ++++++ .../shell}/client/event/TabCloseEvent.kt | 2 +- .../session/shell/client/event/TitleChangedEvent.kt | 6 ++++++ .../shell/client/event/ToggleFullScreenEvent.kt | 6 ++++++ .../session/shell/client/event/ToggleImeEvent.kt | 6 ++++++ .../frontend/{ => session}/xorg/XParameter.java | 2 +- .../neoterm/frontend/{ => session}/xorg/XSession.kt | 3 ++- .../{xorg => session/xorg/client}/XSessionData.kt | 2 +- .../neoterm/frontend/terminal/eks/ExtraKeysView.kt | 2 +- .../io/neoterm/services/NeoTermEmbeddedService.kt | 4 +--- .../main/java/io/neoterm/services/NeoTermService.kt | 6 +++--- .../neoterm/ui/customize/BaseCustomizeActivity.kt | 6 +++--- .../main/java/io/neoterm/ui/term/NeoTermActivity.kt | 13 ++++++------- .../io/neoterm/ui/term/NeoTermRemoteInterface.kt | 4 ++-- .../main/java/io/neoterm/ui/term/SessionRemover.kt | 3 +-- .../java/io/neoterm/ui/term/tab/NeoTabDecorator.kt | 2 +- app/src/main/java/io/neoterm/ui/term/tab/TermTab.kt | 7 +++---- .../main/java/io/neoterm/ui/term/tab/XSessionTab.kt | 2 +- app/src/main/java/io/neoterm/utils/TerminalUtils.kt | 4 ++-- 37 files changed, 79 insertions(+), 83 deletions(-) delete mode 100644 app/src/main/java/io/neoterm/frontend/client/event/CreateNewSessionEvent.kt delete mode 100644 app/src/main/java/io/neoterm/frontend/client/event/SwitchIndexedSessionEvent.kt delete mode 100644 app/src/main/java/io/neoterm/frontend/client/event/SwitchSessionEvent.kt delete mode 100644 app/src/main/java/io/neoterm/frontend/client/event/TitleChangedEvent.kt delete mode 100644 app/src/main/java/io/neoterm/frontend/client/event/ToggleFullScreenEvent.kt delete mode 100644 app/src/main/java/io/neoterm/frontend/client/event/ToggleImeEvent.kt rename app/src/main/java/io/neoterm/frontend/{ => session}/shell/ShellParameter.kt (96%) rename app/src/main/java/io/neoterm/frontend/{ => session}/shell/ShellTermSession.kt (98%) rename app/src/main/java/io/neoterm/frontend/{ => session/shell}/client/BasicSessionCallback.kt (94%) rename app/src/main/java/io/neoterm/frontend/{ => session/shell}/client/BasicViewClient.kt (97%) rename app/src/main/java/io/neoterm/frontend/{ => session/shell}/client/TermCompleteListener.kt (98%) rename app/src/main/java/io/neoterm/frontend/{ => session/shell}/client/TermDataHolder.kt (96%) rename app/src/main/java/io/neoterm/frontend/{ => session/shell}/client/TermSessionCallback.kt (97%) rename app/src/main/java/io/neoterm/frontend/{ => session/shell}/client/TermUiPresenter.kt (89%) rename app/src/main/java/io/neoterm/frontend/{ => session/shell}/client/TermViewClient.kt (99%) create mode 100644 app/src/main/java/io/neoterm/frontend/session/shell/client/event/CreateNewSessionEvent.kt create mode 100644 app/src/main/java/io/neoterm/frontend/session/shell/client/event/SwitchIndexedSessionEvent.kt create mode 100644 app/src/main/java/io/neoterm/frontend/session/shell/client/event/SwitchSessionEvent.kt rename app/src/main/java/io/neoterm/frontend/{ => session/shell}/client/event/TabCloseEvent.kt (66%) create mode 100644 app/src/main/java/io/neoterm/frontend/session/shell/client/event/TitleChangedEvent.kt create mode 100644 app/src/main/java/io/neoterm/frontend/session/shell/client/event/ToggleFullScreenEvent.kt create mode 100644 app/src/main/java/io/neoterm/frontend/session/shell/client/event/ToggleImeEvent.kt rename app/src/main/java/io/neoterm/frontend/{ => session}/xorg/XParameter.java (56%) rename app/src/main/java/io/neoterm/frontend/{ => session}/xorg/XSession.kt (99%) rename app/src/main/java/io/neoterm/frontend/{xorg => session/xorg/client}/XSessionData.kt (92%) diff --git a/app/src/main/java/io/neoterm/frontend/client/event/CreateNewSessionEvent.kt b/app/src/main/java/io/neoterm/frontend/client/event/CreateNewSessionEvent.kt deleted file mode 100644 index 819d01e..0000000 --- a/app/src/main/java/io/neoterm/frontend/client/event/CreateNewSessionEvent.kt +++ /dev/null @@ -1,6 +0,0 @@ -package io.neoterm.frontend.client.event - -/** - * @author kiva - */ -class CreateNewSessionEvent \ No newline at end of file diff --git a/app/src/main/java/io/neoterm/frontend/client/event/SwitchIndexedSessionEvent.kt b/app/src/main/java/io/neoterm/frontend/client/event/SwitchIndexedSessionEvent.kt deleted file mode 100644 index d060ac0..0000000 --- a/app/src/main/java/io/neoterm/frontend/client/event/SwitchIndexedSessionEvent.kt +++ /dev/null @@ -1,6 +0,0 @@ -package io.neoterm.frontend.client.event - -/** - * @author kiva - */ -class SwitchIndexedSessionEvent(val index: Int) \ No newline at end of file diff --git a/app/src/main/java/io/neoterm/frontend/client/event/SwitchSessionEvent.kt b/app/src/main/java/io/neoterm/frontend/client/event/SwitchSessionEvent.kt deleted file mode 100644 index b266a7e..0000000 --- a/app/src/main/java/io/neoterm/frontend/client/event/SwitchSessionEvent.kt +++ /dev/null @@ -1,6 +0,0 @@ -package io.neoterm.frontend.client.event - -/** - * @author kiva - */ -class SwitchSessionEvent(val toNext: Boolean) \ No newline at end of file diff --git a/app/src/main/java/io/neoterm/frontend/client/event/TitleChangedEvent.kt b/app/src/main/java/io/neoterm/frontend/client/event/TitleChangedEvent.kt deleted file mode 100644 index 359cfff..0000000 --- a/app/src/main/java/io/neoterm/frontend/client/event/TitleChangedEvent.kt +++ /dev/null @@ -1,6 +0,0 @@ -package io.neoterm.frontend.client.event - -/** - * @author kiva - */ -class TitleChangedEvent(val title: String) \ No newline at end of file diff --git a/app/src/main/java/io/neoterm/frontend/client/event/ToggleFullScreenEvent.kt b/app/src/main/java/io/neoterm/frontend/client/event/ToggleFullScreenEvent.kt deleted file mode 100644 index 3b5d15b..0000000 --- a/app/src/main/java/io/neoterm/frontend/client/event/ToggleFullScreenEvent.kt +++ /dev/null @@ -1,6 +0,0 @@ -package io.neoterm.frontend.client.event - -/** - * @author kiva - */ -class ToggleFullScreenEvent() \ No newline at end of file diff --git a/app/src/main/java/io/neoterm/frontend/client/event/ToggleImeEvent.kt b/app/src/main/java/io/neoterm/frontend/client/event/ToggleImeEvent.kt deleted file mode 100644 index bbc4006..0000000 --- a/app/src/main/java/io/neoterm/frontend/client/event/ToggleImeEvent.kt +++ /dev/null @@ -1,6 +0,0 @@ -package io.neoterm.frontend.client.event - -/** - * @author kiva - */ -class ToggleImeEvent \ No newline at end of file diff --git a/app/src/main/java/io/neoterm/frontend/floating/TerminalDialog.kt b/app/src/main/java/io/neoterm/frontend/floating/TerminalDialog.kt index bf442d6..52255c2 100644 --- a/app/src/main/java/io/neoterm/frontend/floating/TerminalDialog.kt +++ b/app/src/main/java/io/neoterm/frontend/floating/TerminalDialog.kt @@ -5,10 +5,10 @@ import android.content.Context import android.content.DialogInterface import io.neoterm.R import io.neoterm.backend.TerminalSession -import io.neoterm.frontend.client.BasicSessionCallback -import io.neoterm.frontend.client.BasicViewClient -import io.neoterm.frontend.shell.ShellParameter -import io.neoterm.frontend.shell.ShellTermSession +import io.neoterm.frontend.session.shell.client.BasicSessionCallback +import io.neoterm.frontend.session.shell.client.BasicViewClient +import io.neoterm.frontend.session.shell.ShellParameter +import io.neoterm.frontend.session.shell.ShellTermSession import io.neoterm.utils.TerminalUtils /** diff --git a/app/src/main/java/io/neoterm/frontend/shell/ShellParameter.kt b/app/src/main/java/io/neoterm/frontend/session/shell/ShellParameter.kt similarity index 96% rename from app/src/main/java/io/neoterm/frontend/shell/ShellParameter.kt rename to app/src/main/java/io/neoterm/frontend/session/shell/ShellParameter.kt index f18e1ea..9b9bed8 100644 --- a/app/src/main/java/io/neoterm/frontend/shell/ShellParameter.kt +++ b/app/src/main/java/io/neoterm/frontend/session/shell/ShellParameter.kt @@ -1,4 +1,4 @@ -package io.neoterm.frontend.shell +package io.neoterm.frontend.session.shell import io.neoterm.backend.TerminalSession diff --git a/app/src/main/java/io/neoterm/frontend/shell/ShellTermSession.kt b/app/src/main/java/io/neoterm/frontend/session/shell/ShellTermSession.kt similarity index 98% rename from app/src/main/java/io/neoterm/frontend/shell/ShellTermSession.kt rename to app/src/main/java/io/neoterm/frontend/session/shell/ShellTermSession.kt index c58f7b3..690b19b 100644 --- a/app/src/main/java/io/neoterm/frontend/shell/ShellTermSession.kt +++ b/app/src/main/java/io/neoterm/frontend/session/shell/ShellTermSession.kt @@ -1,10 +1,10 @@ -package io.neoterm.frontend.shell +package io.neoterm.frontend.session.shell import android.content.Context import io.neoterm.App import io.neoterm.R import io.neoterm.backend.TerminalSession -import io.neoterm.frontend.client.TermSessionCallback +import io.neoterm.frontend.session.shell.client.TermSessionCallback import io.neoterm.frontend.preference.NeoPreference import io.neoterm.frontend.preference.NeoTermPath import java.io.File diff --git a/app/src/main/java/io/neoterm/frontend/client/BasicSessionCallback.kt b/app/src/main/java/io/neoterm/frontend/session/shell/client/BasicSessionCallback.kt similarity index 94% rename from app/src/main/java/io/neoterm/frontend/client/BasicSessionCallback.kt rename to app/src/main/java/io/neoterm/frontend/session/shell/client/BasicSessionCallback.kt index d1ec258..c4026cf 100644 --- a/app/src/main/java/io/neoterm/frontend/client/BasicSessionCallback.kt +++ b/app/src/main/java/io/neoterm/frontend/session/shell/client/BasicSessionCallback.kt @@ -1,4 +1,4 @@ -package io.neoterm.frontend.client +package io.neoterm.frontend.session.shell.client import io.neoterm.backend.TerminalSession import io.neoterm.frontend.terminal.TerminalView diff --git a/app/src/main/java/io/neoterm/frontend/client/BasicViewClient.kt b/app/src/main/java/io/neoterm/frontend/session/shell/client/BasicViewClient.kt similarity index 97% rename from app/src/main/java/io/neoterm/frontend/client/BasicViewClient.kt rename to app/src/main/java/io/neoterm/frontend/session/shell/client/BasicViewClient.kt index b78fb88..8045e89 100644 --- a/app/src/main/java/io/neoterm/frontend/client/BasicViewClient.kt +++ b/app/src/main/java/io/neoterm/frontend/session/shell/client/BasicViewClient.kt @@ -1,4 +1,4 @@ -package io.neoterm.frontend.client +package io.neoterm.frontend.session.shell.client import android.content.Context import android.view.KeyEvent diff --git a/app/src/main/java/io/neoterm/frontend/client/TermCompleteListener.kt b/app/src/main/java/io/neoterm/frontend/session/shell/client/TermCompleteListener.kt similarity index 98% rename from app/src/main/java/io/neoterm/frontend/client/TermCompleteListener.kt rename to app/src/main/java/io/neoterm/frontend/session/shell/client/TermCompleteListener.kt index f3b8edc..2689773 100644 --- a/app/src/main/java/io/neoterm/frontend/client/TermCompleteListener.kt +++ b/app/src/main/java/io/neoterm/frontend/session/shell/client/TermCompleteListener.kt @@ -1,4 +1,4 @@ -package io.neoterm.frontend.client +package io.neoterm.frontend.session.shell.client import android.util.Log import android.view.KeyEvent diff --git a/app/src/main/java/io/neoterm/frontend/client/TermDataHolder.kt b/app/src/main/java/io/neoterm/frontend/session/shell/client/TermDataHolder.kt similarity index 96% rename from app/src/main/java/io/neoterm/frontend/client/TermDataHolder.kt rename to app/src/main/java/io/neoterm/frontend/session/shell/client/TermDataHolder.kt index b471d07..e5ffe5f 100644 --- a/app/src/main/java/io/neoterm/frontend/client/TermDataHolder.kt +++ b/app/src/main/java/io/neoterm/frontend/session/shell/client/TermDataHolder.kt @@ -1,4 +1,4 @@ -package io.neoterm.frontend.client +package io.neoterm.frontend.session.shell.client import io.neoterm.backend.TerminalSession import io.neoterm.frontend.completion.listener.OnAutoCompleteListener diff --git a/app/src/main/java/io/neoterm/frontend/client/TermSessionCallback.kt b/app/src/main/java/io/neoterm/frontend/session/shell/client/TermSessionCallback.kt similarity index 97% rename from app/src/main/java/io/neoterm/frontend/client/TermSessionCallback.kt rename to app/src/main/java/io/neoterm/frontend/session/shell/client/TermSessionCallback.kt index d7535ed..1a769f1 100644 --- a/app/src/main/java/io/neoterm/frontend/client/TermSessionCallback.kt +++ b/app/src/main/java/io/neoterm/frontend/session/shell/client/TermSessionCallback.kt @@ -1,4 +1,4 @@ -package io.neoterm.frontend.client +package io.neoterm.frontend.session.shell.client import android.content.ClipData import android.content.ClipboardManager diff --git a/app/src/main/java/io/neoterm/frontend/client/TermUiPresenter.kt b/app/src/main/java/io/neoterm/frontend/session/shell/client/TermUiPresenter.kt similarity index 89% rename from app/src/main/java/io/neoterm/frontend/client/TermUiPresenter.kt rename to app/src/main/java/io/neoterm/frontend/session/shell/client/TermUiPresenter.kt index 583abe4..f99718c 100644 --- a/app/src/main/java/io/neoterm/frontend/client/TermUiPresenter.kt +++ b/app/src/main/java/io/neoterm/frontend/session/shell/client/TermUiPresenter.kt @@ -1,4 +1,4 @@ -package io.neoterm.frontend.client +package io.neoterm.frontend.session.shell.client /** * @author kiva diff --git a/app/src/main/java/io/neoterm/frontend/client/TermViewClient.kt b/app/src/main/java/io/neoterm/frontend/session/shell/client/TermViewClient.kt similarity index 99% rename from app/src/main/java/io/neoterm/frontend/client/TermViewClient.kt rename to app/src/main/java/io/neoterm/frontend/session/shell/client/TermViewClient.kt index 8ea6b3f..961e351 100644 --- a/app/src/main/java/io/neoterm/frontend/client/TermViewClient.kt +++ b/app/src/main/java/io/neoterm/frontend/session/shell/client/TermViewClient.kt @@ -1,4 +1,4 @@ -package io.neoterm.frontend.client +package io.neoterm.frontend.session.shell.client import android.content.Context import android.media.AudioManager diff --git a/app/src/main/java/io/neoterm/frontend/session/shell/client/event/CreateNewSessionEvent.kt b/app/src/main/java/io/neoterm/frontend/session/shell/client/event/CreateNewSessionEvent.kt new file mode 100644 index 0000000..c42f28a --- /dev/null +++ b/app/src/main/java/io/neoterm/frontend/session/shell/client/event/CreateNewSessionEvent.kt @@ -0,0 +1,6 @@ +package io.neoterm.frontend.session.shell.client.event + +/** + * @author kiva + */ +class CreateNewSessionEvent \ No newline at end of file diff --git a/app/src/main/java/io/neoterm/frontend/session/shell/client/event/SwitchIndexedSessionEvent.kt b/app/src/main/java/io/neoterm/frontend/session/shell/client/event/SwitchIndexedSessionEvent.kt new file mode 100644 index 0000000..9287238 --- /dev/null +++ b/app/src/main/java/io/neoterm/frontend/session/shell/client/event/SwitchIndexedSessionEvent.kt @@ -0,0 +1,6 @@ +package io.neoterm.frontend.session.shell.client.event + +/** + * @author kiva + */ +class SwitchIndexedSessionEvent(val index: Int) \ No newline at end of file diff --git a/app/src/main/java/io/neoterm/frontend/session/shell/client/event/SwitchSessionEvent.kt b/app/src/main/java/io/neoterm/frontend/session/shell/client/event/SwitchSessionEvent.kt new file mode 100644 index 0000000..1fce05e --- /dev/null +++ b/app/src/main/java/io/neoterm/frontend/session/shell/client/event/SwitchSessionEvent.kt @@ -0,0 +1,6 @@ +package io.neoterm.frontend.session.shell.client.event + +/** + * @author kiva + */ +class SwitchSessionEvent(val toNext: Boolean) \ No newline at end of file diff --git a/app/src/main/java/io/neoterm/frontend/client/event/TabCloseEvent.kt b/app/src/main/java/io/neoterm/frontend/session/shell/client/event/TabCloseEvent.kt similarity index 66% rename from app/src/main/java/io/neoterm/frontend/client/event/TabCloseEvent.kt rename to app/src/main/java/io/neoterm/frontend/session/shell/client/event/TabCloseEvent.kt index e66572f..2a0104b 100644 --- a/app/src/main/java/io/neoterm/frontend/client/event/TabCloseEvent.kt +++ b/app/src/main/java/io/neoterm/frontend/session/shell/client/event/TabCloseEvent.kt @@ -1,4 +1,4 @@ -package io.neoterm.frontend.client.event +package io.neoterm.frontend.session.shell.client.event import io.neoterm.ui.term.tab.TermTab diff --git a/app/src/main/java/io/neoterm/frontend/session/shell/client/event/TitleChangedEvent.kt b/app/src/main/java/io/neoterm/frontend/session/shell/client/event/TitleChangedEvent.kt new file mode 100644 index 0000000..5a7404e --- /dev/null +++ b/app/src/main/java/io/neoterm/frontend/session/shell/client/event/TitleChangedEvent.kt @@ -0,0 +1,6 @@ +package io.neoterm.frontend.session.shell.client.event + +/** + * @author kiva + */ +class TitleChangedEvent(val title: String) \ No newline at end of file diff --git a/app/src/main/java/io/neoterm/frontend/session/shell/client/event/ToggleFullScreenEvent.kt b/app/src/main/java/io/neoterm/frontend/session/shell/client/event/ToggleFullScreenEvent.kt new file mode 100644 index 0000000..d25c014 --- /dev/null +++ b/app/src/main/java/io/neoterm/frontend/session/shell/client/event/ToggleFullScreenEvent.kt @@ -0,0 +1,6 @@ +package io.neoterm.frontend.session.shell.client.event + +/** + * @author kiva + */ +class ToggleFullScreenEvent() \ No newline at end of file diff --git a/app/src/main/java/io/neoterm/frontend/session/shell/client/event/ToggleImeEvent.kt b/app/src/main/java/io/neoterm/frontend/session/shell/client/event/ToggleImeEvent.kt new file mode 100644 index 0000000..363e9af --- /dev/null +++ b/app/src/main/java/io/neoterm/frontend/session/shell/client/event/ToggleImeEvent.kt @@ -0,0 +1,6 @@ +package io.neoterm.frontend.session.shell.client.event + +/** + * @author kiva + */ +class ToggleImeEvent \ No newline at end of file diff --git a/app/src/main/java/io/neoterm/frontend/xorg/XParameter.java b/app/src/main/java/io/neoterm/frontend/session/xorg/XParameter.java similarity index 56% rename from app/src/main/java/io/neoterm/frontend/xorg/XParameter.java rename to app/src/main/java/io/neoterm/frontend/session/xorg/XParameter.java index 2740dfa..5f67a17 100644 --- a/app/src/main/java/io/neoterm/frontend/xorg/XParameter.java +++ b/app/src/main/java/io/neoterm/frontend/session/xorg/XParameter.java @@ -1,4 +1,4 @@ -package io.neoterm.frontend.xorg; +package io.neoterm.frontend.session.xorg; /** * @author kiva diff --git a/app/src/main/java/io/neoterm/frontend/xorg/XSession.kt b/app/src/main/java/io/neoterm/frontend/session/xorg/XSession.kt similarity index 99% rename from app/src/main/java/io/neoterm/frontend/xorg/XSession.kt rename to app/src/main/java/io/neoterm/frontend/session/xorg/XSession.kt index e40a7c5..354d2b0 100644 --- a/app/src/main/java/io/neoterm/frontend/xorg/XSession.kt +++ b/app/src/main/java/io/neoterm/frontend/session/xorg/XSession.kt @@ -1,4 +1,4 @@ -package io.neoterm.frontend.xorg +package io.neoterm.frontend.session.xorg import android.app.Activity import android.app.UiModeManager @@ -15,6 +15,7 @@ import android.view.inputmethod.InputMethodManager import android.widget.EditText import android.widget.FrameLayout import io.neoterm.* +import io.neoterm.frontend.session.xorg.client.XSessionData import io.neoterm.xorg.NeoXorgViewClient import io.neoterm.xorg.R import java.util.* diff --git a/app/src/main/java/io/neoterm/frontend/xorg/XSessionData.kt b/app/src/main/java/io/neoterm/frontend/session/xorg/client/XSessionData.kt similarity index 92% rename from app/src/main/java/io/neoterm/frontend/xorg/XSessionData.kt rename to app/src/main/java/io/neoterm/frontend/session/xorg/client/XSessionData.kt index 27bcaff..97c41d2 100644 --- a/app/src/main/java/io/neoterm/frontend/xorg/XSessionData.kt +++ b/app/src/main/java/io/neoterm/frontend/session/xorg/client/XSessionData.kt @@ -1,4 +1,4 @@ -package io.neoterm.frontend.xorg +package io.neoterm.frontend.session.xorg.client import android.view.View import android.widget.FrameLayout diff --git a/app/src/main/java/io/neoterm/frontend/terminal/eks/ExtraKeysView.kt b/app/src/main/java/io/neoterm/frontend/terminal/eks/ExtraKeysView.kt index 45670fb..cd401ab 100755 --- a/app/src/main/java/io/neoterm/frontend/terminal/eks/ExtraKeysView.kt +++ b/app/src/main/java/io/neoterm/frontend/terminal/eks/ExtraKeysView.kt @@ -10,7 +10,7 @@ import io.neoterm.R import io.neoterm.component.eks.NeoExtraKey import io.neoterm.frontend.preference.NeoPreference import io.neoterm.frontend.preference.NeoTermPath -import io.neoterm.frontend.client.event.ToggleImeEvent +import io.neoterm.frontend.session.shell.client.event.ToggleImeEvent import io.neoterm.frontend.terminal.eks.button.ControlButton import io.neoterm.frontend.terminal.eks.button.IExtraButton import io.neoterm.frontend.terminal.eks.button.RepeatableButton diff --git a/app/src/main/java/io/neoterm/services/NeoTermEmbeddedService.kt b/app/src/main/java/io/neoterm/services/NeoTermEmbeddedService.kt index f7d2d2b..cdf3db5 100644 --- a/app/src/main/java/io/neoterm/services/NeoTermEmbeddedService.kt +++ b/app/src/main/java/io/neoterm/services/NeoTermEmbeddedService.kt @@ -5,14 +5,12 @@ import android.content.ComponentName import android.content.Context import android.content.Intent import android.content.ServiceConnection -import android.os.Binder import android.os.Handler import android.os.IBinder import android.os.RemoteException import android.os.ResultReceiver import android.text.TextUtils import android.util.ArrayMap -import android.util.Log import android.view.Gravity import android.view.LayoutInflater import android.view.MotionEvent @@ -23,7 +21,7 @@ import android.widget.FrameLayout import io.neoterm.R import io.neoterm.backend.TerminalSession import io.neoterm.frontend.preference.NeoPreference -import io.neoterm.frontend.shell.ShellParameter +import io.neoterm.frontend.session.shell.ShellParameter import io.neoterm.frontend.terminal.TerminalView class NeoTermEmbeddedService : Service() { diff --git a/app/src/main/java/io/neoterm/services/NeoTermService.kt b/app/src/main/java/io/neoterm/services/NeoTermService.kt index 694fb21..e6b3a20 100644 --- a/app/src/main/java/io/neoterm/services/NeoTermService.kt +++ b/app/src/main/java/io/neoterm/services/NeoTermService.kt @@ -13,9 +13,9 @@ import android.support.v4.app.NotificationCompat import io.neoterm.R import io.neoterm.backend.EmulatorDebug import io.neoterm.backend.TerminalSession -import io.neoterm.frontend.shell.ShellParameter -import io.neoterm.frontend.xorg.XParameter -import io.neoterm.frontend.xorg.XSession +import io.neoterm.frontend.session.shell.ShellParameter +import io.neoterm.frontend.session.xorg.XParameter +import io.neoterm.frontend.session.xorg.XSession import io.neoterm.ui.term.NeoTermActivity import io.neoterm.utils.TerminalUtils diff --git a/app/src/main/java/io/neoterm/ui/customize/BaseCustomizeActivity.kt b/app/src/main/java/io/neoterm/ui/customize/BaseCustomizeActivity.kt index 5be4d1e..4d19931 100644 --- a/app/src/main/java/io/neoterm/ui/customize/BaseCustomizeActivity.kt +++ b/app/src/main/java/io/neoterm/ui/customize/BaseCustomizeActivity.kt @@ -7,9 +7,9 @@ import android.view.MenuItem import io.neoterm.R import io.neoterm.backend.TerminalSession import io.neoterm.frontend.preference.NeoTermPath -import io.neoterm.frontend.shell.ShellParameter -import io.neoterm.frontend.client.BasicSessionCallback -import io.neoterm.frontend.client.BasicViewClient +import io.neoterm.frontend.session.shell.ShellParameter +import io.neoterm.frontend.session.shell.client.BasicSessionCallback +import io.neoterm.frontend.session.shell.client.BasicViewClient import io.neoterm.utils.TerminalUtils import io.neoterm.frontend.terminal.TerminalView import io.neoterm.frontend.terminal.eks.ExtraKeysView diff --git a/app/src/main/java/io/neoterm/ui/term/NeoTermActivity.kt b/app/src/main/java/io/neoterm/ui/term/NeoTermActivity.kt index 6440fe1..72d46d9 100644 --- a/app/src/main/java/io/neoterm/ui/term/NeoTermActivity.kt +++ b/app/src/main/java/io/neoterm/ui/term/NeoTermActivity.kt @@ -21,15 +21,14 @@ import io.neoterm.App import io.neoterm.R import io.neoterm.backend.TerminalSession import io.neoterm.component.setup.BaseFileInstaller -import io.neoterm.frontend.client.TermSessionCallback -import io.neoterm.frontend.client.TermViewClient -import io.neoterm.frontend.client.event.* -import io.neoterm.frontend.logging.NLog +import io.neoterm.frontend.session.shell.client.TermSessionCallback +import io.neoterm.frontend.session.shell.client.TermViewClient +import io.neoterm.frontend.session.shell.client.event.* import io.neoterm.frontend.preference.NeoPermission import io.neoterm.frontend.preference.NeoPreference -import io.neoterm.frontend.shell.ShellParameter -import io.neoterm.frontend.xorg.XParameter -import io.neoterm.frontend.xorg.XSession +import io.neoterm.frontend.session.shell.ShellParameter +import io.neoterm.frontend.session.xorg.XParameter +import io.neoterm.frontend.session.xorg.XSession import io.neoterm.services.NeoTermService import io.neoterm.ui.pm.PackageManagerActivity import io.neoterm.ui.settings.SettingActivity diff --git a/app/src/main/java/io/neoterm/ui/term/NeoTermRemoteInterface.kt b/app/src/main/java/io/neoterm/ui/term/NeoTermRemoteInterface.kt index 723d8cf..f3dbf39 100644 --- a/app/src/main/java/io/neoterm/ui/term/NeoTermRemoteInterface.kt +++ b/app/src/main/java/io/neoterm/ui/term/NeoTermRemoteInterface.kt @@ -14,10 +14,10 @@ import io.neoterm.App import io.neoterm.R import io.neoterm.component.script.UserScript import io.neoterm.component.script.UserScriptComponent -import io.neoterm.frontend.client.TermSessionCallback +import io.neoterm.frontend.session.shell.client.TermSessionCallback import io.neoterm.frontend.component.ComponentManager import io.neoterm.frontend.preference.NeoPreference -import io.neoterm.frontend.shell.ShellParameter +import io.neoterm.frontend.session.shell.ShellParameter import io.neoterm.services.NeoTermService import io.neoterm.utils.MediaUtils import io.neoterm.utils.TerminalUtils diff --git a/app/src/main/java/io/neoterm/ui/term/SessionRemover.kt b/app/src/main/java/io/neoterm/ui/term/SessionRemover.kt index 6896df5..5bb604c 100644 --- a/app/src/main/java/io/neoterm/ui/term/SessionRemover.kt +++ b/app/src/main/java/io/neoterm/ui/term/SessionRemover.kt @@ -1,8 +1,7 @@ package io.neoterm.ui.term import io.neoterm.backend.TerminalSession -import io.neoterm.frontend.logging.NLog -import io.neoterm.frontend.xorg.XSession +import io.neoterm.frontend.session.xorg.XSession import io.neoterm.services.NeoTermService import io.neoterm.ui.term.tab.TermTab import io.neoterm.ui.term.tab.XSessionTab diff --git a/app/src/main/java/io/neoterm/ui/term/tab/NeoTabDecorator.kt b/app/src/main/java/io/neoterm/ui/term/tab/NeoTabDecorator.kt index 27fde5f..2ac11b9 100644 --- a/app/src/main/java/io/neoterm/ui/term/tab/NeoTabDecorator.kt +++ b/app/src/main/java/io/neoterm/ui/term/tab/NeoTabDecorator.kt @@ -10,7 +10,7 @@ import de.mrapp.android.tabswitcher.TabSwitcher import de.mrapp.android.tabswitcher.TabSwitcherDecorator import io.neoterm.R import io.neoterm.component.color.ColorSchemeComponent -import io.neoterm.frontend.client.TermCompleteListener +import io.neoterm.frontend.session.shell.client.TermCompleteListener import io.neoterm.frontend.completion.listener.OnAutoCompleteListener import io.neoterm.frontend.component.ComponentManager import io.neoterm.frontend.preference.NeoPreference diff --git a/app/src/main/java/io/neoterm/ui/term/tab/TermTab.kt b/app/src/main/java/io/neoterm/ui/term/tab/TermTab.kt index 213c2dd..71ae776 100644 --- a/app/src/main/java/io/neoterm/ui/term/tab/TermTab.kt +++ b/app/src/main/java/io/neoterm/ui/term/tab/TermTab.kt @@ -3,11 +3,10 @@ package io.neoterm.ui.term.tab import android.content.Context import android.support.v7.widget.Toolbar import android.view.inputmethod.InputMethodManager -import de.mrapp.android.tabswitcher.Tab import io.neoterm.component.color.ColorSchemeComponent -import io.neoterm.frontend.client.TermDataHolder -import io.neoterm.frontend.client.TermUiPresenter -import io.neoterm.frontend.client.event.* +import io.neoterm.frontend.session.shell.client.TermDataHolder +import io.neoterm.frontend.session.shell.client.TermUiPresenter +import io.neoterm.frontend.session.shell.client.event.* import io.neoterm.frontend.component.ComponentManager import org.greenrobot.eventbus.EventBus diff --git a/app/src/main/java/io/neoterm/ui/term/tab/XSessionTab.kt b/app/src/main/java/io/neoterm/ui/term/tab/XSessionTab.kt index 401a6c5..cb5f3cb 100644 --- a/app/src/main/java/io/neoterm/ui/term/tab/XSessionTab.kt +++ b/app/src/main/java/io/neoterm/ui/term/tab/XSessionTab.kt @@ -1,6 +1,6 @@ package io.neoterm.ui.term.tab -import io.neoterm.frontend.xorg.XSession +import io.neoterm.frontend.session.xorg.XSession /** * @author kiva diff --git a/app/src/main/java/io/neoterm/utils/TerminalUtils.kt b/app/src/main/java/io/neoterm/utils/TerminalUtils.kt index 9f51e7e..a2f042f 100644 --- a/app/src/main/java/io/neoterm/utils/TerminalUtils.kt +++ b/app/src/main/java/io/neoterm/utils/TerminalUtils.kt @@ -6,8 +6,8 @@ import io.neoterm.backend.TerminalSession import io.neoterm.component.font.FontComponent import io.neoterm.frontend.component.ComponentManager import io.neoterm.frontend.preference.NeoPreference -import io.neoterm.frontend.shell.ShellParameter -import io.neoterm.frontend.shell.ShellTermSession +import io.neoterm.frontend.session.shell.ShellParameter +import io.neoterm.frontend.session.shell.ShellTermSession import io.neoterm.frontend.terminal.TerminalView import io.neoterm.frontend.terminal.TerminalViewClient import io.neoterm.frontend.terminal.eks.ExtraKeysView