expvintl/NeoTerm_System
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: Create session with profile

Browse Source
This commit is contained in:
zt515 2017-12-28 23:55:34 +08:00
parent e3ee785243
commit eb845484b5
5 changed files with 64 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/io/neoterm/frontend/session/shell/ShellProfile.kt
View File

@ -27,6 +27,10 @@ class ShellProfile : NeoProfile() {
private const val FONT = "font"
private const val COLOR_SCHEME = "color-scheme"
private const val WORD_BASED_IME = "word-based-ime"
fun create() : ShellProfile {
return ShellProfile()
}
}
override val profileMetaName = PROFILE_META_NAME

74
app/src/main/java/io/neoterm/ui/term/NeoTermActivity.kt
View File

@ -20,9 +20,12 @@ import de.mrapp.android.tabswitcher.*
import io.neoterm.App
import io.neoterm.R
import io.neoterm.backend.TerminalSession
import io.neoterm.component.profile.ProfileComponent
import io.neoterm.frontend.component.ComponentManager
import io.neoterm.frontend.config.NeoPermission
import io.neoterm.frontend.config.NeoPreference
import io.neoterm.frontend.session.shell.ShellParameter
import io.neoterm.frontend.session.shell.ShellProfile
import io.neoterm.frontend.session.shell.client.TermSessionCallback
import io.neoterm.frontend.session.shell.client.TermViewClient
import io.neoterm.frontend.session.shell.client.event.*
@ -151,6 +154,10 @@ class NeoTermActivity : AppCompatActivity(), ServiceConnection, SharedPreference
addNewSession()
true
}
R.id.menu_item_new_session_with_profile -> {
showProfileDialog()
true
}
R.id.menu_item_new_system_session -> {
forceAddSystemSession()
true
@ -370,7 +377,7 @@ class NeoTermActivity : AppCompatActivity(), ServiceConnection, SharedPreference
val lastSession = getStoredCurrentSessionOrLast()
for (session in termService!!.sessions) {
addNewSession(session)
addNewSessionFromExisting(session)
}
for (session in termService!!.xSessions) {
@ -425,14 +432,55 @@ class NeoTermActivity : AppCompatActivity(), ServiceConnection, SharedPreference
this@NeoTermActivity.recreate()
}
private fun addNewSession() {
private fun showProfileDialog() {
val profileComponent = ComponentManager.getComponent<ProfileComponent>()
val profiles = profileComponent.getProfiles(ShellProfile.PROFILE_META_NAME)
.filterIsInstance<ShellProfile>()
AlertDialog.Builder(this)
.setTitle(R.string.new_session_with_profile)
.setItems(profiles.map { it.profileName }.toTypedArray(), { dialog, which ->
val selectedProfile = profiles[which]
addNewSessionWithProfile(selectedProfile)
})
.setPositiveButton(android.R.string.no, null)
.show()
}
private fun addNewSession() = addNewSessionWithProfile(ShellProfile.create())
private fun addNewSession(sessionName: String?, systemShell: Boolean, animation: Animation)
= addNewSessionWithProfile(sessionName, systemShell, animation, ShellProfile.create())
private fun addNewSessionWithProfile(profile: ShellProfile) {
if (!tabSwitcher.isSwitcherShown) {
toggleSwitcher(showSwitcher = true, easterEgg = false)
}
addNewSession(null, getSystemShellMode(), createRevealAnimation())
addNewSessionWithProfile(null, getSystemShellMode(),
createRevealAnimation(), profile)
}
private fun addNewSession(session: TerminalSession?) {
private fun addNewSessionWithProfile(sessionName: String?, systemShell: Boolean,
animation: Animation, profile: ShellProfile) {
val sessionCallback = TermSessionCallback()
val viewClient = TermViewClient(this)
val parameter = ShellParameter()
.callback(sessionCallback)
.systemShell(systemShell)
.profile(profile)
val session = termService!!.createTermSession(parameter)
session.mSessionName = sessionName ?: generateSessionName("NeoTerm")
val tab = createTab(session.mSessionName) as TermTab
tab.termData.initializeSessionWith(session, sessionCallback, viewClient)
addNewTab(tab, animation)
switchToSession(tab)
}
private fun addNewSessionFromExisting(session: TerminalSession?) {
if (session == null) {
return
}
@ -455,24 +503,6 @@ class NeoTermActivity : AppCompatActivity(), ServiceConnection, SharedPreference
switchToSession(tab)
}
private fun addNewSession(sessionName: String?, systemShell: Boolean, animation: Animation) {
val sessionCallback = TermSessionCallback()
val viewClient = TermViewClient(this)
val parameter = ShellParameter()
.callback(sessionCallback)
.systemShell(systemShell)
val session = termService!!.createTermSession(parameter)
session.mSessionName = sessionName ?: generateSessionName("NeoTerm")
val tab = createTab(session.mSessionName) as TermTab
tab.termData.initializeSessionWith(session, sessionCallback, viewClient)
addNewTab(tab, animation)
switchToSession(tab)
}
private fun addXSession() {
if (!tabSwitcher.isSwitcherShown) {
toggleSwitcher(showSwitcher = true, easterEgg = false)

5
app/src/main/res/menu/menu_main.xml
View File

@ -13,6 +13,11 @@
android:title="@string/new_session"
app:showAsAction="never" />
<item
android:id="@+id/menu_item_new_session_with_profile"
android:title="@string/new_session_with_profile"
app:showAsAction="never" />
<item
android:id="@+id/menu_item_new_system_session"
android:title="@string/new_system_session"

2
app/src/main/res/values-zh-rCN/strings.xml
View File

@ -152,6 +152,8 @@
<string name="select_new_value">选择</string>
<string name="input_new_value">输入新颜色</string>
<string name="toggle_eks">切换拓展键</string>
<string name="new_x_session">新建图形会话</string>
<string name="new_session_with_profile">新建个性化会话</string>
<string-array name="color_item_names">
<item>背景色</item>

1
app/src/main/res/values/strings.xml
View File

@ -157,6 +157,7 @@
<string name="input_new_value">Enter new color</string>
<string name="toggle_eks">Toggle extra keys</string>
<string name="new_x_session">New X Session</string>
<string name="new_session_with_profile">New Session With Profile</string>
<string name="default_source_url">http://neoterm.studio</string>
<string name="lnpo_source_url">http://lnpo.top:81/neoterm</string>