Profile: create sessions with profile

app/src/main/java/io/neoterm/component/profile/Profile.kt

@@ -1,5 +1,8 @@
 package io.neoterm.component.profile
 
+import io.neoterm.component.color.ColorSchemeComponent
+import io.neoterm.component.font.FontComponent
+import io.neoterm.frontend.component.ComponentManager
 import io.neoterm.frontend.preference.DefaultPreference
 
 /**
@@ -13,7 +16,16 @@ class Profile {
     var enableVibrate = DefaultPreference.enableVibrate
     var enableExecveWrapper = DefaultPreference.enableExecveWrapper
     var enableSpecialVolumeKeys = DefaultPreference.enableSpecialVolumeKeys
+    var enableExitMessage = DefaultPreference.enableExitMessage;
 
-    lateinit var profileFont: String
-    lateinit var profileColorScheme: String
+    var profileFont: String
+    var profileColorScheme: String
+
+    init {
+        val fontComp = ComponentManager.getComponent<FontComponent>()
+        val colorComp = ComponentManager.getComponent<ColorSchemeComponent>()
+
+        profileFont = fontComp.getCurrentFontName()
+        profileColorScheme = colorComp.getCurrentColorSchemeName()
+    }
 }

app/src/main/java/io/neoterm/component/session/SessionComponent.kt

@@ -101,10 +101,6 @@ class SessionComponent : NeoComponent {
     }
 
     fun createSession(context: Context, parameter: ShellParameter): ShellTermSession {
-        val initCommand = parameter.initialCommand ?:
-                NeoPreference.loadString(R.string.key_general_initial_command,
-                        DefaultPreference.initialCommand)
-
         val session = ShellTermSession.Builder()
                 .executablePath(parameter.executablePath)
                 .currentWorkingDirectory(parameter.cwd)
@@ -112,9 +108,10 @@ class SessionComponent : NeoComponent {
                 .systemShell(parameter.systemShell)
                 .envArray(parameter.env)
                 .argArray(parameter.arguments)
+                .initialCommand(parameter.initialCommand)
+                .profile(parameter.profile)
                 .create(context)
         TerminalUtils.setupTerminalSession(session)
-        session.initialCommand = initCommand
         return session
     }
 }

app/src/main/java/io/neoterm/frontend/preference/DefaultPreference.kt

@@ -19,6 +19,7 @@ object DefaultPreference {
     const val enableExplicitExtraKeysWeight = false
     const val enableBackButtonBeMappedToEscape = false
     const val enableSpecialVolumeKeys = false
+    const val enableExitMessage = true
 
     const val loginShell = "sh"
     const val initialCommand = ""

app/src/main/java/io/neoterm/frontend/session/shell/ShellParameter.kt

@@ -1,6 +1,7 @@
 package io.neoterm.frontend.session.shell
 
 import io.neoterm.backend.TerminalSession
+import io.neoterm.component.profile.Profile
 
 /**
  * @author kiva
@@ -13,6 +14,7 @@ class ShellParameter {
     var env: Array<Pair<String, String>>? = null
     var sessionCallback: TerminalSession.SessionChangedCallback? = null
     var systemShell: Boolean = false
+    var profile: Profile? = null
 
     fun executablePath(executablePath: String?): ShellParameter {
         this.executablePath = executablePath
@@ -48,4 +50,9 @@ class ShellParameter {
         this.systemShell = systemShell
         return this
     }
+
+    fun profile(profile: Profile): ShellParameter {
+        this.profile = profile
+        return this
+    }
 }

app/src/main/java/io/neoterm/frontend/session/shell/ShellTermSession.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import io.neoterm.App
 import io.neoterm.R
 import io.neoterm.backend.TerminalSession
+import io.neoterm.component.profile.Profile
 import io.neoterm.frontend.preference.DefaultPreference
 import io.neoterm.frontend.session.shell.client.TermSessionCallback
 import io.neoterm.frontend.preference.NeoPreference
@@ -13,7 +14,12 @@ import java.io.File
 /**
  * @author kiva
  */
-open class ShellTermSession private constructor(shellPath: String, cwd: String, args: Array<String>, env: Array<String>, changeCallback: SessionChangedCallback) : TerminalSession(shellPath, cwd, args, env, changeCallback) {
+open class ShellTermSession private constructor(shellPath: String, cwd: String,
+                                                args: Array<String>, env: Array<String>,
+                                                changeCallback: SessionChangedCallback,
+                                                profile: Profile)
+    : TerminalSession(shellPath, cwd, args, env, changeCallback) {
+
     var initialCommand: String? = null
     var exitPrompt = App.get().getString(R.string.process_exit_prompt)
 
@@ -55,6 +61,20 @@ open class ShellTermSession private constructor(shellPath: String, cwd: String,
         private var env: MutableList<Pair<String, String>>? = null
         private var changeCallback: SessionChangedCallback? = null
         private var systemShell = false
+        private var initialCommand: String? = null
+        private var profile = Profile()
+
+        fun profile(profile: Profile?): Builder {
+            if (profile != null) {
+                this.profile = profile
+            }
+            return this
+        }
+
+        fun initialCommand(command: String?): Builder {
+            this.initialCommand = command
+            return this
+        }
 
         fun executablePath(shell: String?): Builder {
             this.executablePath = shell
@@ -140,7 +160,7 @@ open class ShellTermSession private constructor(shellPath: String, cwd: String,
             val args = this.args ?: mutableListOf(shell)
             val env = transformEnvironment(this.env) ?: buildEnvironment(cwd, systemShell)
             val callback = changeCallback ?: TermSessionCallback()
-            return ShellTermSession(shell, cwd, args.toTypedArray(), env, callback)
+            return ShellTermSession(shell, cwd, args.toTypedArray(), env, callback, profile)
         }
 
         private fun transformEnvironment(env: MutableList<Pair<String, String>>?): Array<String>? {