diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0cb13414d6..56b8f4918b 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -11,8 +11,8 @@
-
-
+
+
diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 0000000000..7e951d4453
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,3 @@
+Released under [the GPLv3 license](https://www.gnu.org/licenses/gpl.html).
+
+Contains code from `Terminal Emulator for Android` by which is released under [the Apache License 2.0](https://www.apache.org/licenses/).
diff --git a/README.md b/README.md
index 26c6175e70..28691c108d 100644
--- a/README.md
+++ b/README.md
@@ -12,10 +12,6 @@ Termux app
Note that this repository is for the app itself (the user interface and the terminal emulation). For the packages installable inside the app, see [termux/termux-packages](https://github.com/termux/termux-packages)
-License
-=======
-Released under [the GPLv3 license](https://www.gnu.org/licenses/gpl.html). Contains code from `Terminal Emulator for Android` which is released under [the Apache License 2.0](https://www.apache.org/licenses/).
-
Terminal resources
==================
* [XTerm control sequences](http://invisible-island.net/xterm/ctlseqs/ctlseqs.html)
diff --git a/app/build.gradle b/app/build.gradle
index 7d8db5403d..88e2be6011 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,7 +7,7 @@ android {
dependencies {
compile 'com.android.support:support-annotations:25.3.1'
compile "com.android.support:support-v4:25.3.1"
- compile project(":view")
+ compile project(":terminal-view")
}
defaultConfig {
diff --git a/float/build.gradle b/float/build.gradle
index 8be67fb631..4427e84a2c 100644
--- a/float/build.gradle
+++ b/float/build.gradle
@@ -6,7 +6,7 @@ android {
dependencies {
compile 'com.android.support:support-annotations:25.3.1'
- compile project(":view")
+ compile project(":terminal-view")
}
defaultConfig {
diff --git a/settings.gradle b/settings.gradle
index 860dae9a0a..1f637fc7bf 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':terminal', ':view', ':float'
+include ':app', ':terminal-emulator', ':terminal-view', ':float'
diff --git a/terminal/build.gradle b/terminal-emulator/build.gradle
similarity index 88%
rename from terminal/build.gradle
rename to terminal-emulator/build.gradle
index 0cb8578e89..71718f1d79 100644
--- a/terminal/build.gradle
+++ b/terminal-emulator/build.gradle
@@ -33,6 +33,12 @@ android {
}
}
+tasks.withType(Test) {
+ testLogging {
+ events "started", "passed", "skipped", "failed"
+ }
+}
+
dependencies {
testCompile 'junit:junit:4.12'
}
diff --git a/terminal/proguard-rules.pro b/terminal-emulator/proguard-rules.pro
similarity index 100%
rename from terminal/proguard-rules.pro
rename to terminal-emulator/proguard-rules.pro
diff --git a/terminal/src/main/AndroidManifest.xml b/terminal-emulator/src/main/AndroidManifest.xml
similarity index 100%
rename from terminal/src/main/AndroidManifest.xml
rename to terminal-emulator/src/main/AndroidManifest.xml
diff --git a/terminal/src/main/java/com/termux/terminal/ByteQueue.java b/terminal-emulator/src/main/java/com/termux/terminal/ByteQueue.java
similarity index 100%
rename from terminal/src/main/java/com/termux/terminal/ByteQueue.java
rename to terminal-emulator/src/main/java/com/termux/terminal/ByteQueue.java
diff --git a/terminal/src/main/java/com/termux/terminal/EmulatorDebug.java b/terminal-emulator/src/main/java/com/termux/terminal/EmulatorDebug.java
similarity index 100%
rename from terminal/src/main/java/com/termux/terminal/EmulatorDebug.java
rename to terminal-emulator/src/main/java/com/termux/terminal/EmulatorDebug.java
diff --git a/terminal/src/main/java/com/termux/terminal/JNI.java b/terminal-emulator/src/main/java/com/termux/terminal/JNI.java
similarity index 100%
rename from terminal/src/main/java/com/termux/terminal/JNI.java
rename to terminal-emulator/src/main/java/com/termux/terminal/JNI.java
diff --git a/terminal/src/main/java/com/termux/terminal/KeyHandler.java b/terminal-emulator/src/main/java/com/termux/terminal/KeyHandler.java
similarity index 100%
rename from terminal/src/main/java/com/termux/terminal/KeyHandler.java
rename to terminal-emulator/src/main/java/com/termux/terminal/KeyHandler.java
diff --git a/terminal/src/main/java/com/termux/terminal/TerminalBuffer.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java
similarity index 100%
rename from terminal/src/main/java/com/termux/terminal/TerminalBuffer.java
rename to terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java
diff --git a/terminal/src/main/java/com/termux/terminal/TerminalColorScheme.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalColorScheme.java
similarity index 100%
rename from terminal/src/main/java/com/termux/terminal/TerminalColorScheme.java
rename to terminal-emulator/src/main/java/com/termux/terminal/TerminalColorScheme.java
diff --git a/terminal/src/main/java/com/termux/terminal/TerminalColors.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalColors.java
similarity index 100%
rename from terminal/src/main/java/com/termux/terminal/TerminalColors.java
rename to terminal-emulator/src/main/java/com/termux/terminal/TerminalColors.java
diff --git a/terminal/src/main/java/com/termux/terminal/TerminalEmulator.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
similarity index 100%
rename from terminal/src/main/java/com/termux/terminal/TerminalEmulator.java
rename to terminal-emulator/src/main/java/com/termux/terminal/TerminalEmulator.java
diff --git a/terminal/src/main/java/com/termux/terminal/TerminalOutput.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalOutput.java
similarity index 100%
rename from terminal/src/main/java/com/termux/terminal/TerminalOutput.java
rename to terminal-emulator/src/main/java/com/termux/terminal/TerminalOutput.java
diff --git a/terminal/src/main/java/com/termux/terminal/TerminalRow.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalRow.java
similarity index 100%
rename from terminal/src/main/java/com/termux/terminal/TerminalRow.java
rename to terminal-emulator/src/main/java/com/termux/terminal/TerminalRow.java
diff --git a/terminal/src/main/java/com/termux/terminal/TerminalSession.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
similarity index 100%
rename from terminal/src/main/java/com/termux/terminal/TerminalSession.java
rename to terminal-emulator/src/main/java/com/termux/terminal/TerminalSession.java
diff --git a/terminal/src/main/java/com/termux/terminal/TextStyle.java b/terminal-emulator/src/main/java/com/termux/terminal/TextStyle.java
similarity index 100%
rename from terminal/src/main/java/com/termux/terminal/TextStyle.java
rename to terminal-emulator/src/main/java/com/termux/terminal/TextStyle.java
diff --git a/terminal/src/main/java/com/termux/terminal/WcWidth.java b/terminal-emulator/src/main/java/com/termux/terminal/WcWidth.java
similarity index 100%
rename from terminal/src/main/java/com/termux/terminal/WcWidth.java
rename to terminal-emulator/src/main/java/com/termux/terminal/WcWidth.java
diff --git a/terminal/src/main/jni/Android.mk b/terminal-emulator/src/main/jni/Android.mk
similarity index 100%
rename from terminal/src/main/jni/Android.mk
rename to terminal-emulator/src/main/jni/Android.mk
diff --git a/terminal/src/main/jni/termux.c b/terminal-emulator/src/main/jni/termux.c
similarity index 100%
rename from terminal/src/main/jni/termux.c
rename to terminal-emulator/src/main/jni/termux.c
diff --git a/terminal/src/test/java/com/termux/terminal/ByteQueueTest.java b/terminal-emulator/src/test/java/com/termux/terminal/ByteQueueTest.java
similarity index 100%
rename from terminal/src/test/java/com/termux/terminal/ByteQueueTest.java
rename to terminal-emulator/src/test/java/com/termux/terminal/ByteQueueTest.java
diff --git a/terminal/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java b/terminal-emulator/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java
similarity index 100%
rename from terminal/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java
rename to terminal-emulator/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java
diff --git a/terminal/src/test/java/com/termux/terminal/CursorAndScreenTest.java b/terminal-emulator/src/test/java/com/termux/terminal/CursorAndScreenTest.java
similarity index 100%
rename from terminal/src/test/java/com/termux/terminal/CursorAndScreenTest.java
rename to terminal-emulator/src/test/java/com/termux/terminal/CursorAndScreenTest.java
diff --git a/terminal/src/test/java/com/termux/terminal/DecSetTest.java b/terminal-emulator/src/test/java/com/termux/terminal/DecSetTest.java
similarity index 100%
rename from terminal/src/test/java/com/termux/terminal/DecSetTest.java
rename to terminal-emulator/src/test/java/com/termux/terminal/DecSetTest.java
diff --git a/terminal/src/test/java/com/termux/terminal/DeviceControlStringTest.java b/terminal-emulator/src/test/java/com/termux/terminal/DeviceControlStringTest.java
similarity index 100%
rename from terminal/src/test/java/com/termux/terminal/DeviceControlStringTest.java
rename to terminal-emulator/src/test/java/com/termux/terminal/DeviceControlStringTest.java
diff --git a/terminal/src/test/java/com/termux/terminal/HistoryTest.java b/terminal-emulator/src/test/java/com/termux/terminal/HistoryTest.java
similarity index 100%
rename from terminal/src/test/java/com/termux/terminal/HistoryTest.java
rename to terminal-emulator/src/test/java/com/termux/terminal/HistoryTest.java
diff --git a/terminal/src/test/java/com/termux/terminal/KeyHandlerTest.java b/terminal-emulator/src/test/java/com/termux/terminal/KeyHandlerTest.java
similarity index 100%
rename from terminal/src/test/java/com/termux/terminal/KeyHandlerTest.java
rename to terminal-emulator/src/test/java/com/termux/terminal/KeyHandlerTest.java
diff --git a/terminal/src/test/java/com/termux/terminal/OperatingSystemControlTest.java b/terminal-emulator/src/test/java/com/termux/terminal/OperatingSystemControlTest.java
similarity index 100%
rename from terminal/src/test/java/com/termux/terminal/OperatingSystemControlTest.java
rename to terminal-emulator/src/test/java/com/termux/terminal/OperatingSystemControlTest.java
diff --git a/terminal/src/test/java/com/termux/terminal/RectangularAreasTest.java b/terminal-emulator/src/test/java/com/termux/terminal/RectangularAreasTest.java
similarity index 100%
rename from terminal/src/test/java/com/termux/terminal/RectangularAreasTest.java
rename to terminal-emulator/src/test/java/com/termux/terminal/RectangularAreasTest.java
diff --git a/terminal/src/test/java/com/termux/terminal/ResizeTest.java b/terminal-emulator/src/test/java/com/termux/terminal/ResizeTest.java
similarity index 100%
rename from terminal/src/test/java/com/termux/terminal/ResizeTest.java
rename to terminal-emulator/src/test/java/com/termux/terminal/ResizeTest.java
diff --git a/terminal/src/test/java/com/termux/terminal/ScreenBufferTest.java b/terminal-emulator/src/test/java/com/termux/terminal/ScreenBufferTest.java
similarity index 100%
rename from terminal/src/test/java/com/termux/terminal/ScreenBufferTest.java
rename to terminal-emulator/src/test/java/com/termux/terminal/ScreenBufferTest.java
diff --git a/terminal/src/test/java/com/termux/terminal/ScrollRegionTest.java b/terminal-emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java
similarity index 100%
rename from terminal/src/test/java/com/termux/terminal/ScrollRegionTest.java
rename to terminal-emulator/src/test/java/com/termux/terminal/ScrollRegionTest.java
diff --git a/terminal/src/test/java/com/termux/terminal/TerminalRowTest.java b/terminal-emulator/src/test/java/com/termux/terminal/TerminalRowTest.java
similarity index 100%
rename from terminal/src/test/java/com/termux/terminal/TerminalRowTest.java
rename to terminal-emulator/src/test/java/com/termux/terminal/TerminalRowTest.java
diff --git a/terminal/src/test/java/com/termux/terminal/TerminalTest.java b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java
similarity index 100%
rename from terminal/src/test/java/com/termux/terminal/TerminalTest.java
rename to terminal-emulator/src/test/java/com/termux/terminal/TerminalTest.java
diff --git a/terminal/src/test/java/com/termux/terminal/TerminalTestCase.java b/terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java
similarity index 100%
rename from terminal/src/test/java/com/termux/terminal/TerminalTestCase.java
rename to terminal-emulator/src/test/java/com/termux/terminal/TerminalTestCase.java
diff --git a/terminal/src/test/java/com/termux/terminal/TextStyleTest.java b/terminal-emulator/src/test/java/com/termux/terminal/TextStyleTest.java
similarity index 100%
rename from terminal/src/test/java/com/termux/terminal/TextStyleTest.java
rename to terminal-emulator/src/test/java/com/termux/terminal/TextStyleTest.java
diff --git a/terminal/src/test/java/com/termux/terminal/UnicodeInputTest.java b/terminal-emulator/src/test/java/com/termux/terminal/UnicodeInputTest.java
similarity index 100%
rename from terminal/src/test/java/com/termux/terminal/UnicodeInputTest.java
rename to terminal-emulator/src/test/java/com/termux/terminal/UnicodeInputTest.java
diff --git a/terminal/src/test/java/com/termux/terminal/WcWidthTest.java b/terminal-emulator/src/test/java/com/termux/terminal/WcWidthTest.java
similarity index 100%
rename from terminal/src/test/java/com/termux/terminal/WcWidthTest.java
rename to terminal-emulator/src/test/java/com/termux/terminal/WcWidthTest.java
diff --git a/view/build.gradle b/terminal-view/build.gradle
similarity index 92%
rename from view/build.gradle
rename to terminal-view/build.gradle
index 155963ffe3..b3f64eae60 100644
--- a/view/build.gradle
+++ b/terminal-view/build.gradle
@@ -6,7 +6,7 @@ android {
dependencies {
compile 'com.android.support:support-annotations:25.3.1'
- compile project(":terminal")
+ compile project(":terminal-emulator")
}
defaultConfig {
diff --git a/view/proguard-rules.pro b/terminal-view/proguard-rules.pro
similarity index 100%
rename from view/proguard-rules.pro
rename to terminal-view/proguard-rules.pro
diff --git a/view/src/main/AndroidManifest.xml b/terminal-view/src/main/AndroidManifest.xml
similarity index 100%
rename from view/src/main/AndroidManifest.xml
rename to terminal-view/src/main/AndroidManifest.xml
diff --git a/view/src/main/java/com/termux/view/GestureAndScaleRecognizer.java b/terminal-view/src/main/java/com/termux/view/GestureAndScaleRecognizer.java
similarity index 100%
rename from view/src/main/java/com/termux/view/GestureAndScaleRecognizer.java
rename to terminal-view/src/main/java/com/termux/view/GestureAndScaleRecognizer.java
diff --git a/view/src/main/java/com/termux/view/TerminalKeyListener.java b/terminal-view/src/main/java/com/termux/view/TerminalKeyListener.java
similarity index 100%
rename from view/src/main/java/com/termux/view/TerminalKeyListener.java
rename to terminal-view/src/main/java/com/termux/view/TerminalKeyListener.java
diff --git a/view/src/main/java/com/termux/view/TerminalRenderer.java b/terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
similarity index 100%
rename from view/src/main/java/com/termux/view/TerminalRenderer.java
rename to terminal-view/src/main/java/com/termux/view/TerminalRenderer.java
diff --git a/view/src/main/java/com/termux/view/TerminalView.java b/terminal-view/src/main/java/com/termux/view/TerminalView.java
similarity index 100%
rename from view/src/main/java/com/termux/view/TerminalView.java
rename to terminal-view/src/main/java/com/termux/view/TerminalView.java
diff --git a/view/src/main/res/drawable-xxhdpi/text_select_handle_left_mtrl_alpha.png b/terminal-view/src/main/res/drawable-xxhdpi/text_select_handle_left_mtrl_alpha.png
similarity index 100%
rename from view/src/main/res/drawable-xxhdpi/text_select_handle_left_mtrl_alpha.png
rename to terminal-view/src/main/res/drawable-xxhdpi/text_select_handle_left_mtrl_alpha.png
diff --git a/view/src/main/res/drawable-xxhdpi/text_select_handle_right_mtrl_alpha.png b/terminal-view/src/main/res/drawable-xxhdpi/text_select_handle_right_mtrl_alpha.png
similarity index 100%
rename from view/src/main/res/drawable-xxhdpi/text_select_handle_right_mtrl_alpha.png
rename to terminal-view/src/main/res/drawable-xxhdpi/text_select_handle_right_mtrl_alpha.png
diff --git a/view/src/main/res/drawable/text_select_handle_left_material.xml b/terminal-view/src/main/res/drawable/text_select_handle_left_material.xml
similarity index 100%
rename from view/src/main/res/drawable/text_select_handle_left_material.xml
rename to terminal-view/src/main/res/drawable/text_select_handle_left_material.xml
diff --git a/view/src/main/res/drawable/text_select_handle_right_material.xml b/terminal-view/src/main/res/drawable/text_select_handle_right_material.xml
similarity index 100%
rename from view/src/main/res/drawable/text_select_handle_right_material.xml
rename to terminal-view/src/main/res/drawable/text_select_handle_right_material.xml
diff --git a/view/src/main/res/values/strings.xml b/terminal-view/src/main/res/values/strings.xml
similarity index 100%
rename from view/src/main/res/values/strings.xml
rename to terminal-view/src/main/res/values/strings.xml