Refactor: package structure

This commit is contained in:
zt515 2017-11-30 00:31:58 +08:00
parent 48dfac4c77
commit bff6b96f1e
37 changed files with 79 additions and 83 deletions

View File

@ -1,6 +0,0 @@
package io.neoterm.frontend.client.event
/**
* @author kiva
*/
class CreateNewSessionEvent

View File

@ -1,6 +0,0 @@
package io.neoterm.frontend.client.event
/**
* @author kiva
*/
class SwitchIndexedSessionEvent(val index: Int)

View File

@ -1,6 +0,0 @@
package io.neoterm.frontend.client.event
/**
* @author kiva
*/
class SwitchSessionEvent(val toNext: Boolean)

View File

@ -1,6 +0,0 @@
package io.neoterm.frontend.client.event
/**
* @author kiva
*/
class TitleChangedEvent(val title: String)

View File

@ -1,6 +0,0 @@
package io.neoterm.frontend.client.event
/**
* @author kiva
*/
class ToggleFullScreenEvent()

View File

@ -1,6 +0,0 @@
package io.neoterm.frontend.client.event
/**
* @author kiva
*/
class ToggleImeEvent

View File

@ -5,10 +5,10 @@ import android.content.Context
import android.content.DialogInterface import android.content.DialogInterface
import io.neoterm.R import io.neoterm.R
import io.neoterm.backend.TerminalSession import io.neoterm.backend.TerminalSession
import io.neoterm.frontend.client.BasicSessionCallback import io.neoterm.frontend.session.shell.client.BasicSessionCallback
import io.neoterm.frontend.client.BasicViewClient import io.neoterm.frontend.session.shell.client.BasicViewClient
import io.neoterm.frontend.shell.ShellParameter import io.neoterm.frontend.session.shell.ShellParameter
import io.neoterm.frontend.shell.ShellTermSession import io.neoterm.frontend.session.shell.ShellTermSession
import io.neoterm.utils.TerminalUtils import io.neoterm.utils.TerminalUtils
/** /**

View File

@ -1,4 +1,4 @@
package io.neoterm.frontend.shell package io.neoterm.frontend.session.shell
import io.neoterm.backend.TerminalSession import io.neoterm.backend.TerminalSession

View File

@ -1,10 +1,10 @@
package io.neoterm.frontend.shell package io.neoterm.frontend.session.shell
import android.content.Context import android.content.Context
import io.neoterm.App import io.neoterm.App
import io.neoterm.R import io.neoterm.R
import io.neoterm.backend.TerminalSession 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.NeoPreference
import io.neoterm.frontend.preference.NeoTermPath import io.neoterm.frontend.preference.NeoTermPath
import java.io.File import java.io.File

View File

@ -1,4 +1,4 @@
package io.neoterm.frontend.client package io.neoterm.frontend.session.shell.client
import io.neoterm.backend.TerminalSession import io.neoterm.backend.TerminalSession
import io.neoterm.frontend.terminal.TerminalView import io.neoterm.frontend.terminal.TerminalView

View File

@ -1,4 +1,4 @@
package io.neoterm.frontend.client package io.neoterm.frontend.session.shell.client
import android.content.Context import android.content.Context
import android.view.KeyEvent import android.view.KeyEvent

View File

@ -1,4 +1,4 @@
package io.neoterm.frontend.client package io.neoterm.frontend.session.shell.client
import android.util.Log import android.util.Log
import android.view.KeyEvent import android.view.KeyEvent

View File

@ -1,4 +1,4 @@
package io.neoterm.frontend.client package io.neoterm.frontend.session.shell.client
import io.neoterm.backend.TerminalSession import io.neoterm.backend.TerminalSession
import io.neoterm.frontend.completion.listener.OnAutoCompleteListener import io.neoterm.frontend.completion.listener.OnAutoCompleteListener

View File

@ -1,4 +1,4 @@
package io.neoterm.frontend.client package io.neoterm.frontend.session.shell.client
import android.content.ClipData import android.content.ClipData
import android.content.ClipboardManager import android.content.ClipboardManager

View File

@ -1,4 +1,4 @@
package io.neoterm.frontend.client package io.neoterm.frontend.session.shell.client
/** /**
* @author kiva * @author kiva

View File

@ -1,4 +1,4 @@
package io.neoterm.frontend.client package io.neoterm.frontend.session.shell.client
import android.content.Context import android.content.Context
import android.media.AudioManager import android.media.AudioManager

View File

@ -0,0 +1,6 @@
package io.neoterm.frontend.session.shell.client.event
/**
* @author kiva
*/
class CreateNewSessionEvent

View File

@ -0,0 +1,6 @@
package io.neoterm.frontend.session.shell.client.event
/**
* @author kiva
*/
class SwitchIndexedSessionEvent(val index: Int)

View File

@ -0,0 +1,6 @@
package io.neoterm.frontend.session.shell.client.event
/**
* @author kiva
*/
class SwitchSessionEvent(val toNext: Boolean)

View File

@ -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 import io.neoterm.ui.term.tab.TermTab

View File

@ -0,0 +1,6 @@
package io.neoterm.frontend.session.shell.client.event
/**
* @author kiva
*/
class TitleChangedEvent(val title: String)

View File

@ -0,0 +1,6 @@
package io.neoterm.frontend.session.shell.client.event
/**
* @author kiva
*/
class ToggleFullScreenEvent()

View File

@ -0,0 +1,6 @@
package io.neoterm.frontend.session.shell.client.event
/**
* @author kiva
*/
class ToggleImeEvent

View File

@ -1,4 +1,4 @@
package io.neoterm.frontend.xorg; package io.neoterm.frontend.session.xorg;
/** /**
* @author kiva * @author kiva

View File

@ -1,4 +1,4 @@
package io.neoterm.frontend.xorg package io.neoterm.frontend.session.xorg
import android.app.Activity import android.app.Activity
import android.app.UiModeManager import android.app.UiModeManager
@ -15,6 +15,7 @@ import android.view.inputmethod.InputMethodManager
import android.widget.EditText import android.widget.EditText
import android.widget.FrameLayout import android.widget.FrameLayout
import io.neoterm.* import io.neoterm.*
import io.neoterm.frontend.session.xorg.client.XSessionData
import io.neoterm.xorg.NeoXorgViewClient import io.neoterm.xorg.NeoXorgViewClient
import io.neoterm.xorg.R import io.neoterm.xorg.R
import java.util.* import java.util.*

View File

@ -1,4 +1,4 @@
package io.neoterm.frontend.xorg package io.neoterm.frontend.session.xorg.client
import android.view.View import android.view.View
import android.widget.FrameLayout import android.widget.FrameLayout

View File

@ -10,7 +10,7 @@ import io.neoterm.R
import io.neoterm.component.eks.NeoExtraKey import io.neoterm.component.eks.NeoExtraKey
import io.neoterm.frontend.preference.NeoPreference import io.neoterm.frontend.preference.NeoPreference
import io.neoterm.frontend.preference.NeoTermPath 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.ControlButton
import io.neoterm.frontend.terminal.eks.button.IExtraButton import io.neoterm.frontend.terminal.eks.button.IExtraButton
import io.neoterm.frontend.terminal.eks.button.RepeatableButton import io.neoterm.frontend.terminal.eks.button.RepeatableButton

View File

@ -5,14 +5,12 @@ import android.content.ComponentName
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.ServiceConnection import android.content.ServiceConnection
import android.os.Binder
import android.os.Handler import android.os.Handler
import android.os.IBinder import android.os.IBinder
import android.os.RemoteException import android.os.RemoteException
import android.os.ResultReceiver import android.os.ResultReceiver
import android.text.TextUtils import android.text.TextUtils
import android.util.ArrayMap import android.util.ArrayMap
import android.util.Log
import android.view.Gravity import android.view.Gravity
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.MotionEvent import android.view.MotionEvent
@ -23,7 +21,7 @@ import android.widget.FrameLayout
import io.neoterm.R import io.neoterm.R
import io.neoterm.backend.TerminalSession import io.neoterm.backend.TerminalSession
import io.neoterm.frontend.preference.NeoPreference 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 import io.neoterm.frontend.terminal.TerminalView
class NeoTermEmbeddedService : Service() { class NeoTermEmbeddedService : Service() {

View File

@ -13,9 +13,9 @@ import android.support.v4.app.NotificationCompat
import io.neoterm.R import io.neoterm.R
import io.neoterm.backend.EmulatorDebug import io.neoterm.backend.EmulatorDebug
import io.neoterm.backend.TerminalSession import io.neoterm.backend.TerminalSession
import io.neoterm.frontend.shell.ShellParameter import io.neoterm.frontend.session.shell.ShellParameter
import io.neoterm.frontend.xorg.XParameter import io.neoterm.frontend.session.xorg.XParameter
import io.neoterm.frontend.xorg.XSession import io.neoterm.frontend.session.xorg.XSession
import io.neoterm.ui.term.NeoTermActivity import io.neoterm.ui.term.NeoTermActivity
import io.neoterm.utils.TerminalUtils import io.neoterm.utils.TerminalUtils

View File

@ -7,9 +7,9 @@ import android.view.MenuItem
import io.neoterm.R import io.neoterm.R
import io.neoterm.backend.TerminalSession import io.neoterm.backend.TerminalSession
import io.neoterm.frontend.preference.NeoTermPath import io.neoterm.frontend.preference.NeoTermPath
import io.neoterm.frontend.shell.ShellParameter import io.neoterm.frontend.session.shell.ShellParameter
import io.neoterm.frontend.client.BasicSessionCallback import io.neoterm.frontend.session.shell.client.BasicSessionCallback
import io.neoterm.frontend.client.BasicViewClient import io.neoterm.frontend.session.shell.client.BasicViewClient
import io.neoterm.utils.TerminalUtils import io.neoterm.utils.TerminalUtils
import io.neoterm.frontend.terminal.TerminalView import io.neoterm.frontend.terminal.TerminalView
import io.neoterm.frontend.terminal.eks.ExtraKeysView import io.neoterm.frontend.terminal.eks.ExtraKeysView

View File

@ -21,15 +21,14 @@ import io.neoterm.App
import io.neoterm.R import io.neoterm.R
import io.neoterm.backend.TerminalSession import io.neoterm.backend.TerminalSession
import io.neoterm.component.setup.BaseFileInstaller import io.neoterm.component.setup.BaseFileInstaller
import io.neoterm.frontend.client.TermSessionCallback import io.neoterm.frontend.session.shell.client.TermSessionCallback
import io.neoterm.frontend.client.TermViewClient import io.neoterm.frontend.session.shell.client.TermViewClient
import io.neoterm.frontend.client.event.* import io.neoterm.frontend.session.shell.client.event.*
import io.neoterm.frontend.logging.NLog
import io.neoterm.frontend.preference.NeoPermission import io.neoterm.frontend.preference.NeoPermission
import io.neoterm.frontend.preference.NeoPreference import io.neoterm.frontend.preference.NeoPreference
import io.neoterm.frontend.shell.ShellParameter import io.neoterm.frontend.session.shell.ShellParameter
import io.neoterm.frontend.xorg.XParameter import io.neoterm.frontend.session.xorg.XParameter
import io.neoterm.frontend.xorg.XSession import io.neoterm.frontend.session.xorg.XSession
import io.neoterm.services.NeoTermService import io.neoterm.services.NeoTermService
import io.neoterm.ui.pm.PackageManagerActivity import io.neoterm.ui.pm.PackageManagerActivity
import io.neoterm.ui.settings.SettingActivity import io.neoterm.ui.settings.SettingActivity

View File

@ -14,10 +14,10 @@ import io.neoterm.App
import io.neoterm.R import io.neoterm.R
import io.neoterm.component.script.UserScript import io.neoterm.component.script.UserScript
import io.neoterm.component.script.UserScriptComponent 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.component.ComponentManager
import io.neoterm.frontend.preference.NeoPreference 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.services.NeoTermService
import io.neoterm.utils.MediaUtils import io.neoterm.utils.MediaUtils
import io.neoterm.utils.TerminalUtils import io.neoterm.utils.TerminalUtils

View File

@ -1,8 +1,7 @@
package io.neoterm.ui.term package io.neoterm.ui.term
import io.neoterm.backend.TerminalSession import io.neoterm.backend.TerminalSession
import io.neoterm.frontend.logging.NLog import io.neoterm.frontend.session.xorg.XSession
import io.neoterm.frontend.xorg.XSession
import io.neoterm.services.NeoTermService import io.neoterm.services.NeoTermService
import io.neoterm.ui.term.tab.TermTab import io.neoterm.ui.term.tab.TermTab
import io.neoterm.ui.term.tab.XSessionTab import io.neoterm.ui.term.tab.XSessionTab

View File

@ -10,7 +10,7 @@ import de.mrapp.android.tabswitcher.TabSwitcher
import de.mrapp.android.tabswitcher.TabSwitcherDecorator import de.mrapp.android.tabswitcher.TabSwitcherDecorator
import io.neoterm.R import io.neoterm.R
import io.neoterm.component.color.ColorSchemeComponent 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.completion.listener.OnAutoCompleteListener
import io.neoterm.frontend.component.ComponentManager import io.neoterm.frontend.component.ComponentManager
import io.neoterm.frontend.preference.NeoPreference import io.neoterm.frontend.preference.NeoPreference

View File

@ -3,11 +3,10 @@ package io.neoterm.ui.term.tab
import android.content.Context import android.content.Context
import android.support.v7.widget.Toolbar import android.support.v7.widget.Toolbar
import android.view.inputmethod.InputMethodManager import android.view.inputmethod.InputMethodManager
import de.mrapp.android.tabswitcher.Tab
import io.neoterm.component.color.ColorSchemeComponent import io.neoterm.component.color.ColorSchemeComponent
import io.neoterm.frontend.client.TermDataHolder import io.neoterm.frontend.session.shell.client.TermDataHolder
import io.neoterm.frontend.client.TermUiPresenter import io.neoterm.frontend.session.shell.client.TermUiPresenter
import io.neoterm.frontend.client.event.* import io.neoterm.frontend.session.shell.client.event.*
import io.neoterm.frontend.component.ComponentManager import io.neoterm.frontend.component.ComponentManager
import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.EventBus

View File

@ -1,6 +1,6 @@
package io.neoterm.ui.term.tab package io.neoterm.ui.term.tab
import io.neoterm.frontend.xorg.XSession import io.neoterm.frontend.session.xorg.XSession
/** /**
* @author kiva * @author kiva

View File

@ -6,8 +6,8 @@ import io.neoterm.backend.TerminalSession
import io.neoterm.component.font.FontComponent import io.neoterm.component.font.FontComponent
import io.neoterm.frontend.component.ComponentManager import io.neoterm.frontend.component.ComponentManager
import io.neoterm.frontend.preference.NeoPreference import io.neoterm.frontend.preference.NeoPreference
import io.neoterm.frontend.shell.ShellParameter import io.neoterm.frontend.session.shell.ShellParameter
import io.neoterm.frontend.shell.ShellTermSession import io.neoterm.frontend.session.shell.ShellTermSession
import io.neoterm.frontend.terminal.TerminalView import io.neoterm.frontend.terminal.TerminalView
import io.neoterm.frontend.terminal.TerminalViewClient import io.neoterm.frontend.terminal.TerminalViewClient
import io.neoterm.frontend.terminal.eks.ExtraKeysView import io.neoterm.frontend.terminal.eks.ExtraKeysView