diff --git a/app/src/main/java/io/neoterm/component/NeoInitializer.kt b/app/src/main/java/io/neoterm/component/NeoInitializer.kt index 01e3203..379cb60 100644 --- a/app/src/main/java/io/neoterm/component/NeoInitializer.kt +++ b/app/src/main/java/io/neoterm/component/NeoInitializer.kt @@ -5,7 +5,7 @@ import io.neoterm.component.codegen.CodeGenComponent import io.neoterm.component.color.ColorSchemeComponent import io.neoterm.component.completion.CompletionComponent import io.neoterm.component.config.ConfigureComponent -import io.neoterm.component.eks.ExtraKeysComponent +import io.neoterm.component.extrakey.ExtraKeysComponent import io.neoterm.component.font.FontComponent import io.neoterm.component.pm.PackageComponent import io.neoterm.component.profile.ProfileComponent diff --git a/app/src/main/java/io/neoterm/component/color/ColorSchemeComponent.kt b/app/src/main/java/io/neoterm/component/color/ColorSchemeComponent.kt index 418c199..7681f9b 100644 --- a/app/src/main/java/io/neoterm/component/color/ColorSchemeComponent.kt +++ b/app/src/main/java/io/neoterm/component/color/ColorSchemeComponent.kt @@ -11,7 +11,7 @@ import io.neoterm.frontend.component.NeoComponent import io.neoterm.frontend.logging.NLog import io.neoterm.utils.AssetsUtils import io.neoterm.frontend.terminal.TerminalView -import io.neoterm.frontend.terminal.eks.ExtraKeysView +import io.neoterm.frontend.terminal.extrakey.ExtraKeysView import io.neoterm.utils.FileUtils import java.io.File diff --git a/app/src/main/java/io/neoterm/component/color/NeoColorScheme.kt b/app/src/main/java/io/neoterm/component/color/NeoColorScheme.kt index fd93c4d..3ab7eb0 100644 --- a/app/src/main/java/io/neoterm/component/color/NeoColorScheme.kt +++ b/app/src/main/java/io/neoterm/component/color/NeoColorScheme.kt @@ -12,7 +12,7 @@ import io.neoterm.frontend.component.ComponentManager import io.neoterm.frontend.config.NeoConfigureFile import io.neoterm.frontend.logging.NLog import io.neoterm.frontend.terminal.TerminalView -import io.neoterm.frontend.terminal.eks.ExtraKeysView +import io.neoterm.frontend.terminal.extrakey.ExtraKeysView import java.io.File /** diff --git a/app/src/main/java/io/neoterm/component/config/loaders/OldExtraKeysConfigureFile.kt b/app/src/main/java/io/neoterm/component/config/loaders/OldExtraKeysConfigureFile.kt index 7a5c787..df5c0c8 100644 --- a/app/src/main/java/io/neoterm/component/config/loaders/OldExtraKeysConfigureFile.kt +++ b/app/src/main/java/io/neoterm/component/config/loaders/OldExtraKeysConfigureFile.kt @@ -2,10 +2,10 @@ package io.neoterm.component.config.loaders import io.neolang.runtime.type.NeoLangValue import io.neolang.visitor.ConfigVisitor -import io.neoterm.component.eks.NeoExtraKey +import io.neoterm.component.extrakey.NeoExtraKey import io.neoterm.frontend.config.NeoConfigureFile import io.neoterm.frontend.logging.NLog -import io.neoterm.frontend.terminal.eks.button.TextButton +import io.neoterm.frontend.terminal.extrakey.button.TextButton import java.io.BufferedReader import java.io.File import java.io.FileReader diff --git a/app/src/main/java/io/neoterm/component/eks/ExtraKeysComponent.kt b/app/src/main/java/io/neoterm/component/extrakey/ExtraKeysComponent.kt similarity index 95% rename from app/src/main/java/io/neoterm/component/eks/ExtraKeysComponent.kt rename to app/src/main/java/io/neoterm/component/extrakey/ExtraKeysComponent.kt index fdfde5c..1e51905 100644 --- a/app/src/main/java/io/neoterm/component/eks/ExtraKeysComponent.kt +++ b/app/src/main/java/io/neoterm/component/extrakey/ExtraKeysComponent.kt @@ -1,4 +1,4 @@ -package io.neoterm.component.eks +package io.neoterm.component.extrakey import android.content.Context import io.neoterm.App @@ -6,7 +6,7 @@ import io.neoterm.frontend.logging.NLog import io.neoterm.frontend.config.NeoTermPath import io.neoterm.frontend.component.NeoComponent import io.neoterm.utils.AssetsUtils -import io.neoterm.frontend.terminal.eks.ExtraKeysView +import io.neoterm.frontend.terminal.extrakey.ExtraKeysView import java.io.File import java.io.FileFilter diff --git a/app/src/main/java/io/neoterm/component/eks/NeoExtraKey.kt b/app/src/main/java/io/neoterm/component/extrakey/NeoExtraKey.kt similarity index 94% rename from app/src/main/java/io/neoterm/component/eks/NeoExtraKey.kt rename to app/src/main/java/io/neoterm/component/extrakey/NeoExtraKey.kt index 0abfc72..1b7c200 100644 --- a/app/src/main/java/io/neoterm/component/eks/NeoExtraKey.kt +++ b/app/src/main/java/io/neoterm/component/extrakey/NeoExtraKey.kt @@ -1,13 +1,13 @@ -package io.neoterm.component.eks +package io.neoterm.component.extrakey import io.neolang.visitor.ConfigVisitor import io.neoterm.component.config.ConfigureComponent import io.neoterm.frontend.config.NeoConfigureFile import io.neoterm.frontend.logging.NLog import io.neoterm.frontend.component.ComponentManager -import io.neoterm.frontend.terminal.eks.ExtraKeysView -import io.neoterm.frontend.terminal.eks.button.IExtraButton -import io.neoterm.frontend.terminal.eks.button.TextButton +import io.neoterm.frontend.terminal.extrakey.ExtraKeysView +import io.neoterm.frontend.terminal.extrakey.button.IExtraButton +import io.neoterm.frontend.terminal.extrakey.button.TextButton import java.io.File /** diff --git a/app/src/main/java/io/neoterm/component/font/FontComponent.kt b/app/src/main/java/io/neoterm/component/font/FontComponent.kt index 44ad40b..038e197 100644 --- a/app/src/main/java/io/neoterm/component/font/FontComponent.kt +++ b/app/src/main/java/io/neoterm/component/font/FontComponent.kt @@ -9,7 +9,7 @@ import io.neoterm.frontend.config.NeoTermPath import io.neoterm.frontend.component.NeoComponent import io.neoterm.frontend.config.DefaultValues import io.neoterm.frontend.terminal.TerminalView -import io.neoterm.frontend.terminal.eks.ExtraKeysView +import io.neoterm.frontend.terminal.extrakey.ExtraKeysView import io.neoterm.utils.AssetsUtils import java.io.File diff --git a/app/src/main/java/io/neoterm/component/font/NeoFont.kt b/app/src/main/java/io/neoterm/component/font/NeoFont.kt index 779f545..8165658 100644 --- a/app/src/main/java/io/neoterm/component/font/NeoFont.kt +++ b/app/src/main/java/io/neoterm/component/font/NeoFont.kt @@ -2,7 +2,7 @@ package io.neoterm.component.font import android.graphics.Typeface import io.neoterm.frontend.terminal.TerminalView -import io.neoterm.frontend.terminal.eks.ExtraKeysView +import io.neoterm.frontend.terminal.extrakey.ExtraKeysView import java.io.File /** diff --git a/app/src/main/java/io/neoterm/frontend/session/shell/client/TermDataHolder.kt b/app/src/main/java/io/neoterm/frontend/session/shell/client/TermDataHolder.kt index e5ffe5f..dd8963a 100644 --- a/app/src/main/java/io/neoterm/frontend/session/shell/client/TermDataHolder.kt +++ b/app/src/main/java/io/neoterm/frontend/session/shell/client/TermDataHolder.kt @@ -3,7 +3,7 @@ package io.neoterm.frontend.session.shell.client import io.neoterm.backend.TerminalSession import io.neoterm.frontend.completion.listener.OnAutoCompleteListener import io.neoterm.frontend.terminal.TerminalView -import io.neoterm.frontend.terminal.eks.ExtraKeysView +import io.neoterm.frontend.terminal.extrakey.ExtraKeysView /** * @author kiva diff --git a/app/src/main/java/io/neoterm/frontend/session/shell/client/TermViewClient.kt b/app/src/main/java/io/neoterm/frontend/session/shell/client/TermViewClient.kt index 650fcc8..30024cc 100644 --- a/app/src/main/java/io/neoterm/frontend/session/shell/client/TermViewClient.kt +++ b/app/src/main/java/io/neoterm/frontend/session/shell/client/TermViewClient.kt @@ -9,7 +9,7 @@ import android.view.View import android.view.inputmethod.InputMethodManager import io.neoterm.backend.KeyHandler import io.neoterm.backend.TerminalSession -import io.neoterm.component.eks.ExtraKeysComponent +import io.neoterm.component.extrakey.ExtraKeysComponent import io.neoterm.frontend.component.ComponentManager import io.neoterm.frontend.config.NeoPreference import io.neoterm.frontend.session.shell.ShellTermSession diff --git a/app/src/main/java/io/neoterm/frontend/terminal/eks/impl/ArrowButton.kt b/app/src/main/java/io/neoterm/frontend/terminal/eks/impl/ArrowButton.kt deleted file mode 100644 index d4c7b17..0000000 --- a/app/src/main/java/io/neoterm/frontend/terminal/eks/impl/ArrowButton.kt +++ /dev/null @@ -1,8 +0,0 @@ -package io.neoterm.frontend.terminal.eks.impl - -import io.neoterm.frontend.terminal.eks.button.RepeatableButton - -/** - * @author kiva - */ -class ArrowButton(arrowText: String) : RepeatableButton(arrowText) diff --git a/app/src/main/java/io/neoterm/frontend/terminal/eks/ExtraKeysView.kt b/app/src/main/java/io/neoterm/frontend/terminal/extrakey/ExtraKeysView.kt similarity index 94% rename from app/src/main/java/io/neoterm/frontend/terminal/eks/ExtraKeysView.kt rename to app/src/main/java/io/neoterm/frontend/terminal/extrakey/ExtraKeysView.kt index c77ff2a..8fa68fd 100755 --- a/app/src/main/java/io/neoterm/frontend/terminal/eks/ExtraKeysView.kt +++ b/app/src/main/java/io/neoterm/frontend/terminal/extrakey/ExtraKeysView.kt @@ -1,4 +1,4 @@ -package io.neoterm.frontend.terminal.eks +package io.neoterm.frontend.terminal.extrakey import android.content.Context import android.graphics.Typeface @@ -7,15 +7,15 @@ import android.view.* import android.widget.GridLayout import android.widget.LinearLayout import io.neoterm.R -import io.neoterm.component.eks.NeoExtraKey +import io.neoterm.component.extrakey.NeoExtraKey import io.neoterm.frontend.config.NeoPreference import io.neoterm.frontend.config.NeoTermPath 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 -import io.neoterm.frontend.terminal.eks.button.StatedControlButton -import io.neoterm.frontend.terminal.eks.impl.ArrowButton +import io.neoterm.frontend.terminal.extrakey.button.ControlButton +import io.neoterm.frontend.terminal.extrakey.button.IExtraButton +import io.neoterm.frontend.terminal.extrakey.button.RepeatableButton +import io.neoterm.frontend.terminal.extrakey.button.StatedControlButton +import io.neoterm.frontend.terminal.extrakey.impl.ArrowButton import org.greenrobot.eventbus.EventBus import java.io.File diff --git a/app/src/main/java/io/neoterm/frontend/terminal/eks/button/ControlButton.kt b/app/src/main/java/io/neoterm/frontend/terminal/extrakey/button/ControlButton.kt similarity index 62% rename from app/src/main/java/io/neoterm/frontend/terminal/eks/button/ControlButton.kt rename to app/src/main/java/io/neoterm/frontend/terminal/extrakey/button/ControlButton.kt index 1339397..e9a1ff7 100644 --- a/app/src/main/java/io/neoterm/frontend/terminal/eks/button/ControlButton.kt +++ b/app/src/main/java/io/neoterm/frontend/terminal/extrakey/button/ControlButton.kt @@ -1,4 +1,4 @@ -package io.neoterm.frontend.terminal.eks.button +package io.neoterm.frontend.terminal.extrakey.button /** * @author kiva diff --git a/app/src/main/java/io/neoterm/frontend/terminal/eks/button/IExtraButton.kt b/app/src/main/java/io/neoterm/frontend/terminal/extrakey/button/IExtraButton.kt similarity index 96% rename from app/src/main/java/io/neoterm/frontend/terminal/eks/button/IExtraButton.kt rename to app/src/main/java/io/neoterm/frontend/terminal/extrakey/button/IExtraButton.kt index c0ca221..e7a0635 100644 --- a/app/src/main/java/io/neoterm/frontend/terminal/eks/button/IExtraButton.kt +++ b/app/src/main/java/io/neoterm/frontend/terminal/extrakey/button/IExtraButton.kt @@ -1,4 +1,4 @@ -package io.neoterm.frontend.terminal.eks.button +package io.neoterm.frontend.terminal.extrakey.button import android.content.Context import android.util.AttributeSet @@ -7,7 +7,7 @@ import android.view.View import android.widget.Button import io.neoterm.R import io.neoterm.frontend.terminal.TerminalView -import io.neoterm.frontend.terminal.eks.combine.CombinedSequence +import io.neoterm.frontend.terminal.extrakey.combine.CombinedSequence /** * @author kiva diff --git a/app/src/main/java/io/neoterm/frontend/terminal/eks/button/RepeatableButton.kt b/app/src/main/java/io/neoterm/frontend/terminal/extrakey/button/RepeatableButton.kt similarity index 96% rename from app/src/main/java/io/neoterm/frontend/terminal/eks/button/RepeatableButton.kt rename to app/src/main/java/io/neoterm/frontend/terminal/extrakey/button/RepeatableButton.kt index ccb1c8b..be58776 100644 --- a/app/src/main/java/io/neoterm/frontend/terminal/eks/button/RepeatableButton.kt +++ b/app/src/main/java/io/neoterm/frontend/terminal/extrakey/button/RepeatableButton.kt @@ -1,4 +1,4 @@ -package io.neoterm.frontend.terminal.eks.button +package io.neoterm.frontend.terminal.extrakey.button import android.content.Context import android.os.Handler diff --git a/app/src/main/java/io/neoterm/frontend/terminal/eks/button/StatedControlButton.kt b/app/src/main/java/io/neoterm/frontend/terminal/extrakey/button/StatedControlButton.kt similarity index 96% rename from app/src/main/java/io/neoterm/frontend/terminal/eks/button/StatedControlButton.kt rename to app/src/main/java/io/neoterm/frontend/terminal/extrakey/button/StatedControlButton.kt index 4159444..38109a8 100644 --- a/app/src/main/java/io/neoterm/frontend/terminal/eks/button/StatedControlButton.kt +++ b/app/src/main/java/io/neoterm/frontend/terminal/extrakey/button/StatedControlButton.kt @@ -1,4 +1,4 @@ -package io.neoterm.frontend.terminal.eks.button +package io.neoterm.frontend.terminal.extrakey.button import android.content.Context import android.util.AttributeSet diff --git a/app/src/main/java/io/neoterm/frontend/terminal/eks/button/TextButton.kt b/app/src/main/java/io/neoterm/frontend/terminal/extrakey/button/TextButton.kt similarity index 85% rename from app/src/main/java/io/neoterm/frontend/terminal/eks/button/TextButton.kt rename to app/src/main/java/io/neoterm/frontend/terminal/extrakey/button/TextButton.kt index e246345..d9e0df5 100644 --- a/app/src/main/java/io/neoterm/frontend/terminal/eks/button/TextButton.kt +++ b/app/src/main/java/io/neoterm/frontend/terminal/extrakey/button/TextButton.kt @@ -1,10 +1,10 @@ -package io.neoterm.frontend.terminal.eks.button +package io.neoterm.frontend.terminal.extrakey.button import android.content.Context import android.util.AttributeSet import android.view.View import android.widget.Button -import io.neoterm.frontend.terminal.eks.combine.CombinedSequence +import io.neoterm.frontend.terminal.extrakey.combine.CombinedSequence /** * @author kiva diff --git a/app/src/main/java/io/neoterm/frontend/terminal/eks/combine/CombinedSequence.kt b/app/src/main/java/io/neoterm/frontend/terminal/extrakey/combine/CombinedSequence.kt similarity index 92% rename from app/src/main/java/io/neoterm/frontend/terminal/eks/combine/CombinedSequence.kt rename to app/src/main/java/io/neoterm/frontend/terminal/extrakey/combine/CombinedSequence.kt index b8e357a..bca4116 100644 --- a/app/src/main/java/io/neoterm/frontend/terminal/eks/combine/CombinedSequence.kt +++ b/app/src/main/java/io/neoterm/frontend/terminal/extrakey/combine/CombinedSequence.kt @@ -1,4 +1,4 @@ -package io.neoterm.frontend.terminal.eks.combine +package io.neoterm.frontend.terminal.extrakey.combine /** * diff --git a/app/src/main/java/io/neoterm/frontend/terminal/extrakey/impl/ArrowButton.kt b/app/src/main/java/io/neoterm/frontend/terminal/extrakey/impl/ArrowButton.kt new file mode 100644 index 0000000..1a6fc01 --- /dev/null +++ b/app/src/main/java/io/neoterm/frontend/terminal/extrakey/impl/ArrowButton.kt @@ -0,0 +1,8 @@ +package io.neoterm.frontend.terminal.extrakey.impl + +import io.neoterm.frontend.terminal.extrakey.button.RepeatableButton + +/** + * @author kiva + */ +class ArrowButton(arrowText: String) : RepeatableButton(arrowText) 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 4986848..278f101 100644 --- a/app/src/main/java/io/neoterm/ui/customize/BaseCustomizeActivity.kt +++ b/app/src/main/java/io/neoterm/ui/customize/BaseCustomizeActivity.kt @@ -12,7 +12,7 @@ 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 +import io.neoterm.frontend.terminal.extrakey.ExtraKeysView /** * @author kiva 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 d99ccb4..6508422 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 @@ -16,9 +16,8 @@ import io.neoterm.NeoGLView import io.neoterm.R import io.neoterm.component.color.ColorSchemeComponent import io.neoterm.frontend.component.ComponentManager -import io.neoterm.frontend.logging.NLog import io.neoterm.frontend.terminal.TerminalView -import io.neoterm.frontend.terminal.eks.ExtraKeysView +import io.neoterm.frontend.terminal.extrakey.ExtraKeysView import io.neoterm.ui.term.NeoTermActivity import io.neoterm.utils.TerminalUtils diff --git a/app/src/main/java/io/neoterm/utils/TerminalUtils.kt b/app/src/main/java/io/neoterm/utils/TerminalUtils.kt index 0749be1..f7b4171 100644 --- a/app/src/main/java/io/neoterm/utils/TerminalUtils.kt +++ b/app/src/main/java/io/neoterm/utils/TerminalUtils.kt @@ -12,7 +12,7 @@ import io.neoterm.frontend.session.xorg.XParameter import io.neoterm.frontend.session.xorg.XSession import io.neoterm.frontend.terminal.TerminalView import io.neoterm.frontend.terminal.TerminalViewClient -import io.neoterm.frontend.terminal.eks.ExtraKeysView +import io.neoterm.frontend.terminal.extrakey.ExtraKeysView /** * @author kiva diff --git a/app/src/main/res/layout/ui_color_scheme.xml b/app/src/main/res/layout/ui_color_scheme.xml index 1e298f0..8103698 100644 --- a/app/src/main/res/layout/ui_color_scheme.xml +++ b/app/src/main/res/layout/ui_color_scheme.xml @@ -27,7 +27,7 @@ android:layout_weight="1.0" android:background="@color/terminal_background"> - - -