Merge branch 'master' of git.oschina.net:lody/neoterm

# Conflicts:
#	app/src/main/java/io/neoterm/view/tab/TermTab.kt

app/src/main/AndroidManifest.xml

@@ -11,7 +11,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name=".NeoTermActivity"
+            android:name=".ui.NeoTermActivity"
             android:launchMode="singleTask"
             android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize|stateAlwaysVisible">
@@ -23,7 +23,7 @@
         </activity>
 
         <service
-            android:name=".NeoTermService"
+            android:name=".services.NeoTermService"
             android:enabled="true" />
     </application>
 

app/src/main/java/io/neoterm/backend/ByteQueue.java

@@ -1,4 +1,4 @@
-package io.neoterm.terminal;
+package io.neoterm.backend;
 
 /** A circular byte buffer allowing one producer and one consumer thread. */
 final class ByteQueue {

app/src/main/java/io/neoterm/backend/EmulatorDebug.java

@@ -1,4 +1,4 @@
-package io.neoterm.terminal;
+package io.neoterm.backend;
 
 import android.util.Log;
 

app/src/main/java/io/neoterm/backend/JNI.java

@@ -1,4 +1,4 @@
-package io.neoterm.terminal;
+package io.neoterm.backend;
 
 /**
  * Native methods for creating and managing pseudoterminal subprocesses. C code is in jni/termux.c.

app/src/main/java/io/neoterm/backend/KeyHandler.java

@@ -1,4 +1,4 @@
-package io.neoterm.terminal;
+package io.neoterm.backend;
 
 import java.util.HashMap;
 import java.util.Map;

app/src/main/java/io/neoterm/backend/TerminalBuffer.java

@@ -1,4 +1,4 @@
-package io.neoterm.terminal;
+package io.neoterm.backend;
 
 /**
  * A circular buffer of {@link TerminalRow}:s which keeps notes about what is visible on a logical screen and the scroll

app/src/main/java/io/neoterm/backend/TerminalColorScheme.java

@@ -1,4 +1,4 @@
-package io.neoterm.terminal;
+package io.neoterm.backend;
 
 import java.util.Map;
 import java.util.Properties;

app/src/main/java/io/neoterm/backend/TerminalColors.java

@@ -1,4 +1,4 @@
-package io.neoterm.terminal;
+package io.neoterm.backend;
 
 /** Current terminal colors (if different from default). */
 public final class TerminalColors {

app/src/main/java/io/neoterm/backend/TerminalEmulator.java

@@ -1,4 +1,4 @@
-package io.neoterm.terminal;
+package io.neoterm.backend;
 
 import android.util.Base64;
 import android.util.Log;

app/src/main/java/io/neoterm/backend/TerminalOutput.java

@@ -1,4 +1,4 @@
-package io.neoterm.terminal;
+package io.neoterm.backend;
 
 import java.nio.charset.StandardCharsets;
 

app/src/main/java/io/neoterm/backend/TerminalRow.java

@@ -1,4 +1,4 @@
-package io.neoterm.terminal;
+package io.neoterm.backend;
 
 import java.util.Arrays;
 

app/src/main/java/io/neoterm/backend/TerminalSession.java

@@ -1,4 +1,4 @@
-package io.neoterm.terminal;
+package io.neoterm.backend;
 
 import android.annotation.SuppressLint;
 import android.os.Handler;

app/src/main/java/io/neoterm/backend/TextStyle.java

@@ -1,4 +1,4 @@
-package io.neoterm.terminal;
+package io.neoterm.backend;
 
 /**
  * <p>

app/src/main/java/io/neoterm/backend/WcWidth.java

@@ -1,4 +1,4 @@
-package io.neoterm.terminal;
+package io.neoterm.backend;
 
 /**
  * Implementation of wcwidth(3) for Unicode 9.

app/src/main/java/io/neoterm/customize/color/NeoTermColorScheme.kt

@@ -1,7 +1,7 @@
 package io.neoterm.customize
 
-import io.neoterm.terminal.TerminalColors
+import io.neoterm.backend.TerminalColors
-import io.neoterm.terminal.TerminalSession
+import io.neoterm.backend.TerminalSession
 
 /**
  * @author kiva

app/src/main/java/io/neoterm/customize/color/builtin/MaterialColorScheme.kt

@@ -0,0 +1,7 @@
+package io.neoterm.customize.color.builtin
+
+/**
+ * @author kiva
+ */
+class MaterialColorScheme {
+}

app/src/main/java/io/neoterm/preference/NeoTermPreference.kt

@@ -2,10 +2,8 @@ package io.neoterm.preference
 
 import android.content.Context
 import android.preference.PreferenceManager
-
+import io.neoterm.backend.TerminalSession
-import io.neoterm.NeoTermActivity
+import io.neoterm.services.NeoTermService
-import io.neoterm.NeoTermService
-import io.neoterm.terminal.TerminalSession
 
 /**
  * @author kiva
@@ -15,7 +13,10 @@ object NeoTermPreference {
     var CURRENT_SESSION_KEY = "neoterm_current_session"
 
     fun storeCurrentSession(context: Context, session: TerminalSession) {
-        PreferenceManager.getDefaultSharedPreferences(context).edit().putString(NeoTermPreference.CURRENT_SESSION_KEY, session.mHandle).apply()
+        PreferenceManager.getDefaultSharedPreferences(context)
+                .edit()
+                .putString(NeoTermPreference.CURRENT_SESSION_KEY, session.mHandle)
+                .apply()
     }
 
     fun getCurrentSession(termService: NeoTermService?): TerminalSession? {

app/src/main/java/io/neoterm/services/NeoTermService.java

@@ -1,4 +1,4 @@
-package io.neoterm;
+package io.neoterm.services;
 
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -15,8 +15,10 @@ import android.util.Log;
 import java.util.ArrayList;
 import java.util.List;
 
-import io.neoterm.terminal.EmulatorDebug;
+import io.neoterm.ui.NeoTermActivity;
-import io.neoterm.terminal.TerminalSession;
+import io.neoterm.R;
+import io.neoterm.backend.EmulatorDebug;
+import io.neoterm.backend.TerminalSession;
 
 /**
  * @author kiva
@@ -78,7 +80,7 @@ public class NeoTermService extends Service {
         return mTerminalSessions;
     }
 
-    TerminalSession createTermSession(String executablePath, String[] arguments, String cwd, String[] env, TerminalSession.SessionChangedCallback sessionCallback) {
+    public TerminalSession createTermSession(String executablePath, String[] arguments, String cwd, String[] env, TerminalSession.SessionChangedCallback sessionCallback) {
         if (cwd == null) cwd = getFilesDir().getAbsolutePath();
 
         boolean isLoginShell = false;

app/src/main/java/io/neoterm/ui/NeoTermActivity.kt

@@ -1,7 +1,6 @@
-package io.neoterm
+package io.neoterm.ui
 
 import android.content.ComponentName
-import android.content.Context
 import android.content.Intent
 import android.content.ServiceConnection
 import android.os.Bundle
@@ -11,18 +10,18 @@ import android.support.v4.view.OnApplyWindowInsetsListener
 import android.support.v4.view.ViewCompat
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.Toolbar
-import android.util.Log
 import android.view.View
-import android.view.inputmethod.InputMethodManager
 import android.widget.ImageButton
 import de.mrapp.android.tabswitcher.*
 import de.mrapp.android.tabswitcher.view.TabSwitcherButton
+import io.neoterm.R
 import io.neoterm.preference.NeoTermPreference
-import io.neoterm.tab.TermSessionChangedCallback
+import io.neoterm.services.NeoTermService
-import io.neoterm.tab.TermTab
+import io.neoterm.view.tab.TermSessionChangedCallback
-import io.neoterm.tab.TermTabDecorator
+import io.neoterm.view.tab.TermTab
-import io.neoterm.tab.TermViewClient
+import io.neoterm.view.tab.TermTabDecorator
-import io.neoterm.terminal.TerminalSession
+import io.neoterm.view.tab.TermViewClient
+import io.neoterm.backend.TerminalSession
 
 
 class NeoTermActivity : AppCompatActivity(), ServiceConnection {

app/src/main/java/io/neoterm/view/ExtraKeysView.java

@@ -11,7 +11,7 @@ import android.widget.GridLayout;
 import android.widget.ToggleButton;
 
 import io.neoterm.R;
-import io.neoterm.terminal.TerminalSession;
+import io.neoterm.backend.TerminalSession;
 
 /**
  * A view showing extra keys (such as Escape, Ctrl, Alt) not normally available on an Android soft

app/src/main/java/io/neoterm/view/TerminalRenderer.java

@@ -5,11 +5,11 @@ import android.graphics.Paint;
 import android.graphics.PorterDuff;
 import android.graphics.Typeface;
 
-import io.neoterm.terminal.TerminalBuffer;
+import io.neoterm.backend.TerminalBuffer;
-import io.neoterm.terminal.TerminalEmulator;
+import io.neoterm.backend.TerminalEmulator;
-import io.neoterm.terminal.TerminalRow;
+import io.neoterm.backend.TerminalRow;
-import io.neoterm.terminal.TextStyle;
+import io.neoterm.backend.TextStyle;
-import io.neoterm.terminal.WcWidth;
+import io.neoterm.backend.WcWidth;
 
 /**
  * Renderer of a {@link TerminalEmulator} into a {@link Canvas}.

app/src/main/java/io/neoterm/view/TerminalView.java

@@ -30,11 +30,11 @@ import android.view.inputmethod.InputConnection;
 import android.widget.Scroller;
 
 import io.neoterm.R;
-import io.neoterm.terminal.EmulatorDebug;
+import io.neoterm.backend.EmulatorDebug;
-import io.neoterm.terminal.KeyHandler;
+import io.neoterm.backend.KeyHandler;
-import io.neoterm.terminal.TerminalBuffer;
+import io.neoterm.backend.TerminalBuffer;
-import io.neoterm.terminal.TerminalEmulator;
+import io.neoterm.backend.TerminalEmulator;
-import io.neoterm.terminal.TerminalSession;
+import io.neoterm.backend.TerminalSession;
 
 /** View displaying and interacting with a {@link TerminalSession}. */
 public final class TerminalView extends View {

app/src/main/java/io/neoterm/view/TerminalViewClient.java

@@ -4,7 +4,7 @@ import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;
 
-import io.neoterm.terminal.TerminalSession;
+import io.neoterm.backend.TerminalSession;
 
 /**
  * Input and scale listener which may be set on a {@link TerminalView} through

app/src/main/java/io/neoterm/view/tab/TermSessionChangedCallback.kt

@@ -1,6 +1,6 @@
-package io.neoterm.tab
+package io.neoterm.view.tab
 
-import io.neoterm.terminal.TerminalSession
+import io.neoterm.backend.TerminalSession
 import io.neoterm.view.TerminalView
 
 /**

app/src/main/java/io/neoterm/view/tab/TermTab.kt

@@ -1,11 +1,11 @@
-package io.neoterm.tab
+package io.neoterm.view.tab
 
 import android.os.Parcel
 import android.os.Parcelable
 import android.support.v7.widget.Toolbar
 import de.mrapp.android.tabswitcher.Tab
+import io.neoterm.backend.TerminalSession
 import io.neoterm.customize.NeoTermColorScheme
-import io.neoterm.terminal.TerminalSession
 
 /**
  * @author kiva

app/src/main/java/io/neoterm/view/tab/TermTabDecorator.kt

@@ -1,4 +1,4 @@
-package io.neoterm.tab
+package io.neoterm.view.tab
 
 import android.content.Context
 import android.graphics.Typeface
@@ -10,7 +10,7 @@ import android.view.ViewGroup
 import de.mrapp.android.tabswitcher.Tab
 import de.mrapp.android.tabswitcher.TabSwitcher
 import de.mrapp.android.tabswitcher.TabSwitcherDecorator
-import io.neoterm.NeoTermActivity
+import io.neoterm.ui.NeoTermActivity
 import io.neoterm.R
 import io.neoterm.view.ExtraKeysView
 import io.neoterm.view.TerminalView

app/src/main/java/io/neoterm/view/tab/TermViewClient.kt

@@ -1,11 +1,11 @@
-package io.neoterm.tab
+package io.neoterm.view.tab
 
 import android.content.Context
 import android.view.InputDevice
 import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.inputmethod.InputMethodManager
-import io.neoterm.terminal.TerminalSession
+import io.neoterm.backend.TerminalSession
 import io.neoterm.view.ExtraKeysView
 import io.neoterm.view.TerminalView
 import io.neoterm.view.TerminalViewClient