From 009de5a3ee2b06756d8ef49794e8cc867de10c2e Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sat, 1 Apr 2017 19:06:02 +0200 Subject: [PATCH] Split up into modules and add float module Split the app/ module into three modules terminal/ - Terminal emulator library module. view/ - Terminal view library module (depending on terminal/). app/ - The main Termux app (depending on view/). Also add the float/ - The Termux:Float app (depending on view/). --- .idea/gradle.xml | 3 + app/build.gradle | 21 +- .../java/com/termux/ApplicationTest.java | 13 - .../com/termux/app/TermuxKeyListener.java | 5 + app/src/main/res/values/strings.xml | 4 - float/build.gradle | 37 +++ float/proguard-rules.pro | 25 ++ float/src/main/AndroidManifest.xml | 36 +++ .../termux/window/TermuxFloatActivity.java | 16 + .../window/TermuxFloatPermissionActivity.java | 35 +++ .../com/termux/window/TermuxFloatPrefs.java | 33 +++ .../com/termux/window/TermuxFloatService.java | 243 +++++++++++++++ .../com/termux/window/TermuxFloatView.java | 277 ++++++++++++++++++ .../drawable/floating_window_background.xml | 9 + .../floating_window_background_resize.xml | 8 + float/src/main/res/layout/activity_main.xml | 18 ++ .../main/res/layout/activity_permission.xml | 27 ++ .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 1094 bytes .../res/mipmap-hdpi/ic_launcher_round.png | Bin 0 -> 1699 bytes .../mipmap-hdpi/ic_service_notification.png | Bin 0 -> 695 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 2206 bytes .../res/mipmap-mdpi/ic_launcher_round.png | Bin 0 -> 1110 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 1315 bytes .../res/mipmap-xhdpi/ic_launcher_round.png | Bin 0 -> 2292 bytes .../mipmap-xhdpi/ic_service_notification.png | Bin 0 -> 779 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 1819 bytes .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin 0 -> 3739 bytes .../mipmap-xxhdpi/ic_service_notification.png | Bin 0 -> 983 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 2594 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 0 -> 5058 bytes .../ic_service_notification.png | Bin 0 -> 1184 bytes float/src/main/res/values/strings.xml | 19 ++ float/src/main/res/values/styles.xml | 20 ++ settings.gradle | 2 +- terminal/build.gradle | 47 +++ terminal/proguard-rules.pro | 25 ++ terminal/src/main/AndroidManifest.xml | 3 + .../java/com/termux/terminal/ByteQueue.java | 0 .../com/termux/terminal/EmulatorDebug.java | 0 .../main/java/com/termux/terminal/JNI.java | 0 .../java/com/termux/terminal/KeyHandler.java | 0 .../com/termux/terminal/TerminalBuffer.java | 0 .../termux/terminal/TerminalColorScheme.java | 0 .../com/termux/terminal/TerminalColors.java | 0 .../com/termux/terminal/TerminalEmulator.java | 0 .../com/termux/terminal/TerminalOutput.java | 0 .../java/com/termux/terminal/TerminalRow.java | 0 .../com/termux/terminal/TerminalSession.java | 0 .../java/com/termux/terminal/TextStyle.java | 0 .../java/com/termux/terminal/WcWidth.java | 0 {app => terminal}/src/main/jni/Android.mk | 0 {app => terminal}/src/main/jni/termux.c | 0 .../com/termux/terminal/ByteQueueTest.java | 0 .../ControlSequenceIntroducerTest.java | 0 .../termux/terminal/CursorAndScreenTest.java | 0 .../java/com/termux/terminal/DecSetTest.java | 0 .../terminal/DeviceControlStringTest.java | 0 .../java/com/termux/terminal/HistoryTest.java | 0 .../com/termux/terminal/KeyHandlerTest.java | 0 .../terminal/OperatingSystemControlTest.java | 0 .../termux/terminal/RectangularAreasTest.java | 0 .../java/com/termux/terminal/ResizeTest.java | 0 .../com/termux/terminal/ScreenBufferTest.java | 0 .../com/termux/terminal/ScrollRegionTest.java | 0 .../com/termux/terminal/TerminalRowTest.java | 0 .../com/termux/terminal/TerminalTest.java | 0 .../com/termux/terminal/TerminalTestCase.java | 0 .../com/termux/terminal/TextStyleTest.java | 0 .../com/termux/terminal/UnicodeInputTest.java | 0 .../java/com/termux/terminal/WcWidthTest.java | 0 view/build.gradle | 36 +++ view/proguard-rules.pro | 25 ++ view/src/main/AndroidManifest.xml | 3 + .../view/GestureAndScaleRecognizer.java | 0 .../com/termux/view/TerminalKeyListener.java | 10 +- .../com/termux/view/TerminalRenderer.java | 0 .../java/com/termux/view/TerminalView.java | 2 +- .../text_select_handle_left_mtrl_alpha.png | Bin .../text_select_handle_right_mtrl_alpha.png | Bin .../text_select_handle_left_material.xml | 0 .../text_select_handle_right_material.xml | 0 view/src/main/res/values/strings.xml | 5 + 82 files changed, 968 insertions(+), 39 deletions(-) delete mode 100644 app/src/androidTest/java/com/termux/ApplicationTest.java create mode 100644 float/build.gradle create mode 100644 float/proguard-rules.pro create mode 100644 float/src/main/AndroidManifest.xml create mode 100644 float/src/main/java/com/termux/window/TermuxFloatActivity.java create mode 100644 float/src/main/java/com/termux/window/TermuxFloatPermissionActivity.java create mode 100644 float/src/main/java/com/termux/window/TermuxFloatPrefs.java create mode 100644 float/src/main/java/com/termux/window/TermuxFloatService.java create mode 100644 float/src/main/java/com/termux/window/TermuxFloatView.java create mode 100644 float/src/main/res/drawable/floating_window_background.xml create mode 100644 float/src/main/res/drawable/floating_window_background_resize.xml create mode 100644 float/src/main/res/layout/activity_main.xml create mode 100644 float/src/main/res/layout/activity_permission.xml create mode 100644 float/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 float/src/main/res/mipmap-hdpi/ic_launcher_round.png create mode 100644 float/src/main/res/mipmap-hdpi/ic_service_notification.png create mode 100644 float/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 float/src/main/res/mipmap-mdpi/ic_launcher_round.png create mode 100644 float/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 float/src/main/res/mipmap-xhdpi/ic_launcher_round.png create mode 100644 float/src/main/res/mipmap-xhdpi/ic_service_notification.png create mode 100644 float/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 float/src/main/res/mipmap-xxhdpi/ic_launcher_round.png create mode 100644 float/src/main/res/mipmap-xxhdpi/ic_service_notification.png create mode 100644 float/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 float/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png create mode 100644 float/src/main/res/mipmap-xxxhdpi/ic_service_notification.png create mode 100644 float/src/main/res/values/strings.xml create mode 100644 float/src/main/res/values/styles.xml create mode 100644 terminal/build.gradle create mode 100644 terminal/proguard-rules.pro create mode 100644 terminal/src/main/AndroidManifest.xml rename {app => terminal}/src/main/java/com/termux/terminal/ByteQueue.java (100%) rename {app => terminal}/src/main/java/com/termux/terminal/EmulatorDebug.java (100%) rename {app => terminal}/src/main/java/com/termux/terminal/JNI.java (100%) rename {app => terminal}/src/main/java/com/termux/terminal/KeyHandler.java (100%) rename {app => terminal}/src/main/java/com/termux/terminal/TerminalBuffer.java (100%) rename {app => terminal}/src/main/java/com/termux/terminal/TerminalColorScheme.java (100%) rename {app => terminal}/src/main/java/com/termux/terminal/TerminalColors.java (100%) rename {app => terminal}/src/main/java/com/termux/terminal/TerminalEmulator.java (100%) rename {app => terminal}/src/main/java/com/termux/terminal/TerminalOutput.java (100%) rename {app => terminal}/src/main/java/com/termux/terminal/TerminalRow.java (100%) rename {app => terminal}/src/main/java/com/termux/terminal/TerminalSession.java (100%) rename {app => terminal}/src/main/java/com/termux/terminal/TextStyle.java (100%) rename {app => terminal}/src/main/java/com/termux/terminal/WcWidth.java (100%) rename {app => terminal}/src/main/jni/Android.mk (100%) rename {app => terminal}/src/main/jni/termux.c (100%) rename {app => terminal}/src/test/java/com/termux/terminal/ByteQueueTest.java (100%) rename {app => terminal}/src/test/java/com/termux/terminal/ControlSequenceIntroducerTest.java (100%) rename {app => terminal}/src/test/java/com/termux/terminal/CursorAndScreenTest.java (100%) rename {app => terminal}/src/test/java/com/termux/terminal/DecSetTest.java (100%) rename {app => terminal}/src/test/java/com/termux/terminal/DeviceControlStringTest.java (100%) rename {app => terminal}/src/test/java/com/termux/terminal/HistoryTest.java (100%) rename {app => terminal}/src/test/java/com/termux/terminal/KeyHandlerTest.java (100%) rename {app => terminal}/src/test/java/com/termux/terminal/OperatingSystemControlTest.java (100%) rename {app => terminal}/src/test/java/com/termux/terminal/RectangularAreasTest.java (100%) rename {app => terminal}/src/test/java/com/termux/terminal/ResizeTest.java (100%) rename {app => terminal}/src/test/java/com/termux/terminal/ScreenBufferTest.java (100%) rename {app => terminal}/src/test/java/com/termux/terminal/ScrollRegionTest.java (100%) rename {app => terminal}/src/test/java/com/termux/terminal/TerminalRowTest.java (100%) rename {app => terminal}/src/test/java/com/termux/terminal/TerminalTest.java (100%) rename {app => terminal}/src/test/java/com/termux/terminal/TerminalTestCase.java (100%) rename {app => terminal}/src/test/java/com/termux/terminal/TextStyleTest.java (100%) rename {app => terminal}/src/test/java/com/termux/terminal/UnicodeInputTest.java (100%) rename {app => terminal}/src/test/java/com/termux/terminal/WcWidthTest.java (100%) create mode 100644 view/build.gradle create mode 100644 view/proguard-rules.pro create mode 100644 view/src/main/AndroidManifest.xml rename {app => view}/src/main/java/com/termux/view/GestureAndScaleRecognizer.java (100%) rename {app => view}/src/main/java/com/termux/view/TerminalKeyListener.java (76%) rename {app => view}/src/main/java/com/termux/view/TerminalRenderer.java (100%) rename {app => view}/src/main/java/com/termux/view/TerminalView.java (99%) rename {app => view}/src/main/res/drawable-xxhdpi/text_select_handle_left_mtrl_alpha.png (100%) rename {app => view}/src/main/res/drawable-xxhdpi/text_select_handle_right_mtrl_alpha.png (100%) rename {app => view}/src/main/res/drawable/text_select_handle_left_material.xml (100%) rename {app => view}/src/main/res/drawable/text_select_handle_right_material.xml (100%) create mode 100644 view/src/main/res/values/strings.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml index cde9d869..0cb13414 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -10,6 +10,9 @@