From 13c753e16a51054fc11675ac1ecd47f4a3578212 Mon Sep 17 00:00:00 2001
From: Eduardo Pereira de Sousa <edupsousa@gmail.com>
Date: Thu, 6 May 2021 19:42:11 -0300
Subject: [PATCH 01/27] Update gradle plugin to version 4.1.3 (#32)

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ea46394..0321ce5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.1.3'
     }
 }
 

From 0f4cbe3ecc84790362ad1035fdc95758db0f5d14 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <31106828+agnostic-apollo@users.noreply.github.com>
Date: Fri, 2 Jul 2021 09:33:28 +0500
Subject: [PATCH 02/27] Update debug_build.yml

---
 .github/workflows/debug_build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
index 457424c..b13d07a 100644
--- a/.github/workflows/debug_build.yml
+++ b/.github/workflows/debug_build.yml
@@ -12,7 +12,7 @@ jobs:
       run: |
         ./gradlew assembleDebug
     - name: Store generated APK file
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v2
       with:
         name: termux-float
         path: ./app/build/outputs/apk/debug/app-debug.apk

From 17a76b2d6f6201662f67c139d9d1a8e6563660c9 Mon Sep 17 00:00:00 2001
From: David Kramer <daveskypilot@gmail.com>
Date: Mon, 30 Aug 2021 17:13:54 -0500
Subject: [PATCH 03/27] Implement floating "chat head" bubble (#35)

* Implement floating bubble for TermuxFloatView
* Add Window Controls toolbar w/ icons
* Don't show the long press toast if moving while minimized
* Remove focus when displaying as bubble
* Focus window if top control bar is tapped
---
 .../termux/window/FloatingBubbleManager.java  | 135 ++++++++++++++++++
 .../com/termux/window/TermuxFloatView.java    |  58 +++++++-
 app/src/main/res/drawable/ic_exit_icon.xml    |  12 ++
 .../main/res/drawable/ic_minimize_icon.xml    |  15 ++
 app/src/main/res/drawable/round_button.xml    |   8 ++
 .../drawable/round_button_with_outline.xml    |  10 ++
 app/src/main/res/layout/activity_main.xml     |  30 ++++
 7 files changed, 266 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/com/termux/window/FloatingBubbleManager.java
 create mode 100644 app/src/main/res/drawable/ic_exit_icon.xml
 create mode 100644 app/src/main/res/drawable/ic_minimize_icon.xml
 create mode 100644 app/src/main/res/drawable/round_button.xml
 create mode 100644 app/src/main/res/drawable/round_button_with_outline.xml

diff --git a/app/src/main/java/com/termux/window/FloatingBubbleManager.java b/app/src/main/java/com/termux/window/FloatingBubbleManager.java
new file mode 100644
index 0000000..11e0ce3
--- /dev/null
+++ b/app/src/main/java/com/termux/window/FloatingBubbleManager.java
@@ -0,0 +1,135 @@
+package com.termux.window;
+
+import android.graphics.drawable.Drawable;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+
+import com.termux.view.TerminalView;
+
+/**
+ * Handles displaying our TermuxFloatView as a collapsed bubble and restoring back
+ * to its original display.
+ */
+public class FloatingBubbleManager {
+    private static final int BUBBLE_SIZE = 200;
+
+    private TermuxFloatView mTermuxFloatView;
+
+    private boolean mIsMinimized;
+
+    // preserve original layout values so we can restore to normal window
+    // from our bubble
+    private int mOriginalLayoutWidth;
+    private int mOriginalLayoutHeight;
+    private boolean mDidCaptureOriginalValues;
+    private Drawable mOriginalTerminalViewBackground;
+    private Drawable mOriginalFloatViewBackground;
+
+
+    public FloatingBubbleManager(TermuxFloatView termuxFloatView) {
+        mTermuxFloatView = termuxFloatView;
+    }
+
+    public void toggleBubble() {
+        if (isMinimized()) {
+            displayAsFloatingWindow();
+        } else {
+            displayAsFloatingBubble();
+        }
+    }
+
+    public void updateLongPressBackgroundResource(boolean isInLongPressState) {
+        if (isMinimized()) {
+            return;
+        }
+        mTermuxFloatView.setBackgroundResource(isInLongPressState ? R.drawable.floating_window_background_resize : R.drawable.floating_window_background);
+    }
+
+    public void displayAsFloatingBubble() {
+        captureOriginalLayoutValues();
+
+        WindowManager.LayoutParams layoutParams = getLayoutParams();
+        layoutParams.width = BUBBLE_SIZE;
+        layoutParams.height = BUBBLE_SIZE;
+
+        TerminalView terminalView = getTerminalView();
+        terminalView.setBackgroundResource(R.drawable.round_button);
+        terminalView.setClipToOutline(true);
+
+        TermuxFloatView termuxFloatView = getTermuxFloatView();
+        termuxFloatView.setBackgroundResource(R.drawable.round_button_with_outline);
+        termuxFloatView.setClipToOutline(true);
+        termuxFloatView.hideTouchKeyboard();
+        termuxFloatView.changeFocus(false);
+
+        ViewGroup windowControls = termuxFloatView.findViewById(R.id.window_controls);
+        windowControls.setVisibility(View.GONE);
+
+        getWindowManager().updateViewLayout(termuxFloatView, layoutParams);
+        mIsMinimized = true;
+    }
+
+    public void displayAsFloatingWindow() {
+        WindowManager.LayoutParams layoutParams = getLayoutParams();
+
+        // restore back to previous values
+        layoutParams.width = mOriginalLayoutWidth;
+        layoutParams.height = mOriginalLayoutHeight;
+
+        TerminalView terminalView = getTerminalView();
+        terminalView.setBackground(mOriginalTerminalViewBackground);
+        terminalView.setClipToOutline(false);
+
+        TermuxFloatView termuxFloatView = getTermuxFloatView();
+        termuxFloatView.setBackground(mOriginalFloatViewBackground);
+        termuxFloatView.setClipToOutline(false);
+
+        ViewGroup windowControls = termuxFloatView.findViewById(R.id.window_controls);
+        windowControls.setVisibility(View.VISIBLE);
+
+        getWindowManager().updateViewLayout(termuxFloatView, layoutParams);
+        mIsMinimized = false;
+
+        // clear so we can capture proper values on next minimize
+        mDidCaptureOriginalValues = false;
+    }
+
+    public boolean isMinimized() {
+        return mIsMinimized;
+    }
+
+    private void captureOriginalLayoutValues() {
+        if (!mDidCaptureOriginalValues) {
+            WindowManager.LayoutParams layoutParams = getLayoutParams();
+            mOriginalLayoutWidth = layoutParams.width;
+            mOriginalLayoutHeight = layoutParams.height;
+
+            mOriginalTerminalViewBackground = getTerminalView().getBackground();
+            mOriginalFloatViewBackground = getTermuxFloatView().getBackground();
+            mDidCaptureOriginalValues = true;
+        }
+    }
+
+    public void cleanup() {
+        mTermuxFloatView = null;
+        mOriginalFloatViewBackground = null;
+        mOriginalTerminalViewBackground = null;
+    }
+
+    private TermuxFloatView getTermuxFloatView() {
+        return mTermuxFloatView;
+    }
+
+    private TerminalView getTerminalView() {
+        return mTermuxFloatView.mTerminalView;
+    }
+
+    private WindowManager getWindowManager() {
+        return mTermuxFloatView.mWindowManager;
+    }
+
+    private WindowManager.LayoutParams getLayoutParams() {
+        return (WindowManager.LayoutParams) mTermuxFloatView.getLayoutParams();
+    }
+}
diff --git a/app/src/main/java/com/termux/window/TermuxFloatView.java b/app/src/main/java/com/termux/window/TermuxFloatView.java
index 88da566..5b0f4df 100644
--- a/app/src/main/java/com/termux/window/TermuxFloatView.java
+++ b/app/src/main/java/com/termux/window/TermuxFloatView.java
@@ -2,6 +2,7 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.PixelFormat;
 import android.graphics.Point;
 import android.graphics.Typeface;
@@ -12,8 +13,11 @@
 import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;
 import android.view.ScaleGestureDetector.OnScaleGestureListener;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.Toast;
 
@@ -35,6 +39,8 @@ public class TermuxFloatView extends LinearLayout {
     InputMethodManager imm;
 
     TerminalView mTerminalView;
+    ViewGroup mWindowControls;
+    FloatingBubbleManager mFloatingBubbleManager;
 
     private boolean withFocus = true;
     int initialX;
@@ -46,6 +52,8 @@ public class TermuxFloatView extends LinearLayout {
 
     final int[] location = new int[2];
 
+    final int[] windowControlsLocation = new int[2];
+
     final ScaleGestureDetector mScaleDetector = new ScaleGestureDetector(getContext(), new OnScaleGestureListener() {
         private static final int MIN_SIZE = 50;
 
@@ -89,6 +97,19 @@ private static int computeLayoutFlags(boolean withFocus) {
     public void initializeFloatingWindow() {
         mTerminalView = findViewById(R.id.terminal_view);
         mTerminalView.setOnKeyListener(new TermuxFloatViewClient(this));
+        mFloatingBubbleManager = new FloatingBubbleManager(this);
+        initWindowControls();
+    }
+
+    private void initWindowControls() {
+        mWindowControls = findViewById(R.id.window_controls);
+        mWindowControls.setOnClickListener(v -> changeFocus(true));
+
+        Button minimizeButton = findViewById(R.id.minimize_button);
+        minimizeButton.setOnClickListener(v -> mFloatingBubbleManager.toggleBubble());
+
+        Button exitButton = findViewById(R.id.exit_button);
+        exitButton.setOnClickListener(v -> exit());
     }
 
     @Override
@@ -147,6 +168,13 @@ public boolean onInterceptTouchEvent(MotionEvent event) {
         int y = location[1];
         float touchX = event.getRawX();
         float touchY = event.getRawY();
+
+        if (didClickInsideWindowControls(touchX, touchY)) {
+            // avoid unintended focus event if we are tapping on our window controls
+            // so that keyboard doesn't possibly show briefly
+            return false;
+        }
+
         boolean clickedInside = (touchX >= x) && (touchX <= (x + layoutParams.width)) && (touchY >= y) && (touchY <= (y + layoutParams.height));
 
         switch (event.getAction()) {
@@ -163,15 +191,31 @@ public boolean onInterceptTouchEvent(MotionEvent event) {
         return false;
     }
 
+    private boolean didClickInsideWindowControls(float touchX, float touchY) {
+        if (mWindowControls.getVisibility() == View.GONE) {
+            return false;
+        }
+        mWindowControls.getLocationOnScreen(windowControlsLocation);
+        int controlsX = windowControlsLocation[0];
+        int controlsY = windowControlsLocation[1];
+
+        return (touchX >= controlsX && touchX <= controlsX + mWindowControls.getWidth()) &&
+                (touchY >= controlsY && touchY <= controlsY + mWindowControls.getHeight());
+    }
+
     void showTouchKeyboard() {
         mTerminalView.post(() -> imm.showSoftInput(mTerminalView, InputMethodManager.SHOW_IMPLICIT));
     }
 
+    void hideTouchKeyboard() {
+        mTerminalView.post(() -> imm.hideSoftInputFromWindow(mTerminalView.getWindowToken(), InputMethodManager.HIDE_IMPLICIT_ONLY));
+    }
+
     void updateLongPressMode(boolean newValue) {
         isInLongPressState = newValue;
-        setBackgroundResource(newValue ? R.drawable.floating_window_background_resize : R.drawable.floating_window_background);
+        mFloatingBubbleManager.updateLongPressBackgroundResource(isInLongPressState);
         setAlpha(newValue ? ALPHA_MOVING : (withFocus ? ALPHA_FOCUS : ALPHA_NOT_FOCUS));
-        if (newValue) {
+        if (newValue && !mFloatingBubbleManager.isMinimized()) {
             Toast toast = Toast.makeText(getContext(), R.string.after_long_press, Toast.LENGTH_SHORT);
             toast.setGravity(Gravity.CENTER, 0, 0);
             toast.show();
@@ -207,6 +251,9 @@ public boolean onTouchEvent(MotionEvent event) {
      * Visually indicate focus and show the soft input as needed.
      */
     void changeFocus(boolean newFocus) {
+        if (newFocus && mFloatingBubbleManager.isMinimized()) {
+            mFloatingBubbleManager.displayAsFloatingWindow();
+        }
         if (newFocus == withFocus) {
             if (newFocus) showTouchKeyboard();
             return;
@@ -219,5 +266,12 @@ void changeFocus(boolean newFocus) {
 
     public void closeFloatingWindow() {
         mWindowManager.removeView(this);
+        mFloatingBubbleManager.cleanup();
+        mFloatingBubbleManager = null;
+    }
+
+    private void exit() {
+        Intent intent = new Intent(getContext(), TermuxFloatService.class);
+        getContext().stopService(intent);
     }
 }
diff --git a/app/src/main/res/drawable/ic_exit_icon.xml b/app/src/main/res/drawable/ic_exit_icon.xml
new file mode 100644
index 0000000..12f9875
--- /dev/null
+++ b/app/src/main/res/drawable/ic_exit_icon.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M16.083,31.125c-8.489,0 -15.396,-6.906 -15.396,-15.396S7.594,0.334 16.083,0.334S31.479,7.24 31.479,15.729S24.572,31.125 16.083,31.125zM16.083,2.334c-7.386,0 -13.396,6.009 -13.396,13.396c0,7.387 6.009,13.396 13.396,13.396c7.387,0 13.396,-6.009 13.396,-13.396C29.479,8.343 23.47,2.334 16.083,2.334z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M17.414,16l7.042,-7.042c0.391,-0.391 0.391,-1.023 0,-1.414s-1.023,-0.391 -1.414,0L16,14.586L8.958,7.544c-0.391,-0.391 -1.023,-0.391 -1.414,0s-0.391,1.023 0,1.414L14.586,16l-7.042,7.042c-0.391,0.391 -0.391,1.023 0,1.414c0.195,0.195 0.451,0.293 0.707,0.293s0.512,-0.098 0.707,-0.293L16,17.414l7.042,7.042c0.195,0.195 0.451,0.293 0.707,0.293s0.512,-0.098 0.707,-0.293c0.391,-0.391 0.391,-1.023 0,-1.414L17.414,16z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_minimize_icon.xml b/app/src/main/res/drawable/ic_minimize_icon.xml
new file mode 100644
index 0000000..918d3a3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_minimize_icon.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M29.625,30.125H16.156c-0.552,0 -1,-0.447 -1,-1s0.448,-1 1,-1h12.469V3.312H3.688v12.632c0,0.552 -0.448,1 -1,1s-1,-0.448 -1,-1V2.312c0,-0.552 0.448,-1 1,-1h26.938c0.553,0 1,0.448 1,1v26.812C30.625,29.678 30.178,30.125 29.625,30.125z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M8.031,30.625c-3.498,0 -6.344,-2.846 -6.344,-6.344s2.846,-6.344 6.344,-6.344s6.344,2.846 6.344,6.344S11.529,30.625 8.031,30.625zM8.031,19.938c-2.395,0 -4.344,1.948 -4.344,4.344s1.949,4.344 4.344,4.344s4.344,-1.948 4.344,-4.344S10.426,19.938 8.031,19.938z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M27.051,5.012c-0.391,-0.391 -1.023,-0.391 -1.414,0l-9.199,9.199V9.75c0,-0.552 -0.448,-1 -1,-1s-1,0.448 -1,1V16c0,0.552 0.448,1 1,1h6.5c0.553,0 1,-0.448 1,-1s-0.447,-1 -1,-1h-3.461l8.574,-8.574C27.441,6.035 27.441,5.402 27.051,5.012z"
+      android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_button.xml b/app/src/main/res/drawable/round_button.xml
new file mode 100644
index 0000000..c5f59c9
--- /dev/null
+++ b/app/src/main/res/drawable/round_button.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@android:color/black" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/round_button_with_outline.xml b/app/src/main/res/drawable/round_button_with_outline.xml
new file mode 100644
index 0000000..0a14446
--- /dev/null
+++ b/app/src/main/res/drawable/round_button_with_outline.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@android:color/black" />
+            <stroke android:color="@android:color/white"
+                android:width="1dp" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 8acbdd3..65b0b10 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,8 +4,38 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="@drawable/floating_window_background"
+    android:orientation="vertical"
     android:padding="1px" >
 
+    <LinearLayout
+        android:id="@+id/window_controls"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#ff333333">
+        <Button
+            android:id="@+id/minimize_button"
+            android:layout_width="22dp"
+            android:layout_height="22dp"
+            android:background="@drawable/ic_minimize_icon"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="4dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp" />
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+        <Button
+            android:id="@+id/exit_button"
+            android:layout_width="22dp"
+            android:layout_height="22dp"
+            android:background="@drawable/ic_exit_icon"
+            android:layout_marginTop="4dp"
+            android:layout_marginBottom="4dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"/>
+    </LinearLayout>
+
     <com.termux.view.TerminalView
         android:id="@+id/terminal_view"
         android:layout_width="match_parent"

From 4c5bed24dc27d8e783f7a1817695579267a436d6 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 2 Sep 2021 00:35:27 +0500
Subject: [PATCH 04/27] Changed: Bump compileSdkVersion to 30

---
 app/build.gradle  | 6 +++---
 gradle.properties | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5c013ce..b0bad58 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion project.properties.compileSdkVersion.toInteger()
     defaultConfig {
         applicationId "com.termux.window"
-        minSdkVersion 24
-        targetSdkVersion 28
+        minSdkVersion project.properties.minSdkVersion.toInteger()
+        targetSdkVersion project.properties.targetSdkVersion.toInteger()
         versionCode 14
         versionName "0.14"
     }
diff --git a/gradle.properties b/gradle.properties
index e9645a3..8618581 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,3 +14,7 @@
 # org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx2048M
 android.useAndroidX=true
+
+minSdkVersion=24
+targetSdkVersion=28
+compileSdkVersion=30

From f939b968e3f5e6714ccc120ebbf020b8d87d73a6 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 2 Sep 2021 00:36:13 +0500
Subject: [PATCH 05/27] Changed: Bump gradle library dependency versions

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b0bad58..fed5cae 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,10 +38,10 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'androidx.annotation:annotation:1.2.0'
     implementation 'com.termux:terminal-view:0.106'
 
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.2'
 }
 
 task versionName {

From 5ea6e1321e1155423ae83320bb62e1aaae0faa32 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 2 Sep 2021 00:39:22 +0500
Subject: [PATCH 06/27] Changed: Bump gradle to 7.2

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 622ab64..a0f7639 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 4d0a1b0f2dd64286060c235de14c68ff079b4e71 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 2 Sep 2021 00:40:25 +0500
Subject: [PATCH 07/27] Changed: Bump android gradle plugin to 4.2.2

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 0321ce5..f9d31a0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:4.2.2'
     }
 }
 

From 529268a1c90819872c76ffa752946650f3b450c4 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 2 Sep 2021 00:43:34 +0500
Subject: [PATCH 08/27] Added: Automatically attach debug APKs when a release
 is created

---
 .../attach_debug_apks_to_release.yml          | 32 +++++++++++++++++++
 app/build.gradle                              | 10 ++++++
 2 files changed, 42 insertions(+)
 create mode 100644 .github/workflows/attach_debug_apks_to_release.yml

diff --git a/.github/workflows/attach_debug_apks_to_release.yml b/.github/workflows/attach_debug_apks_to_release.yml
new file mode 100644
index 0000000..156cc94
--- /dev/null
+++ b/.github/workflows/attach_debug_apks_to_release.yml
@@ -0,0 +1,32 @@
+name: Attach Debug APKs To Release
+
+on:
+  release:
+    types:
+      - published
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - name: Set tag
+        id: vars
+        run: echo ::set-output name=tag::${GITHUB_REF/refs\/tags\//}
+      - name: Clone repository
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ env.GITHUB_REF }}
+      - name: Build
+        env:
+          RELEASE_TAG: ${{ steps.vars.outputs.tag }}
+        run: ./gradlew assembleDebug
+      - name: Attach debug APKs to release
+        env:
+          RELEASE_TAG: ${{ steps.vars.outputs.tag }}
+        run: >-
+          hub release edit
+          -m ""
+          -a ./app/build/outputs/apk/debug/termux-float-$RELEASE_TAG-debug.apk
+          $RELEASE_TAG
diff --git a/app/build.gradle b/app/build.gradle
index fed5cae..a517d50 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,10 +31,20 @@ android {
             zipAlignEnabled true
         }
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    applicationVariants.all { variant ->
+        variant.outputs.all { output ->
+            if (variant.buildType.name == "debug") {
+                def releaseTag = System.getenv("RELEASE_TAG")
+                outputFileName = new File("termux-float" + (releaseTag ? "-" + releaseTag : "") + "-debug.apk")
+            }
+        }
+    }
 }
 
 dependencies {

From a46762a86d526d02382c4afd26be2ac214699857 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 2 Sep 2021 06:47:30 +0500
Subject: [PATCH 09/27] Changed: Use termux-shared

- All hardcoded `com.termux` constants have been removed and will be handled by `TermuxConstants` and `TermuxPreferenceConstants`.
- Fixed issue with losing reference to `TermuxFloatView` in `TermuxFloatService` and destroying view not working.
- Removed unnecessary toasts and fixed custom broken ones by using the one provided by `Logger` class.
- Updated `TerminalView` and `TerminalSession` to latest versions and removed duplicated `TerminalSession` code based on old `TermuxService` and start using `TermuxSession` which will also have consistent shell environment as `termux-app`.
- Removed `SharedPrefernces` management and use the one in `termux-shared` provided by `TermuxFloatAppSharedPreferences`.
- Use action constants defined in `TermuxConstants` for `TermuxFloatService`.
- Use notification constants defined in `TermuxConstants` for `TermuxFloatService`.
- Use `KeyboardUtils` for showing and hiding keyboard.
- Implement logging system based on `Logger` class. Log levels can be changed in `termux-app` settings but require restarting `termux-float` for changes to take effect since both apps run in different processes.
- Fixed potential `IllegalArgumentException` when adding and removing `TermuxFloatView` to `WindowManager`.
- Added crash handler so that crash notifications can be shown in `termux-app` at startup.
---
 app/build.gradle                              |   7 +-
 app/src/main/AndroidManifest.xml              |   3 +-
 .../termux/window/TermuxFloatApplication.java |  31 ++
 .../com/termux/window/TermuxFloatPrefs.java   |  32 --
 .../com/termux/window/TermuxFloatService.java | 356 ++++++++----------
 .../window/TermuxFloatSessionClient.java      |  44 +++
 .../com/termux/window/TermuxFloatView.java    | 110 ++++--
 .../termux/window/TermuxFloatViewClient.java  |  56 ++-
 app/src/main/res/values/strings.xml           |  16 +-
 build.gradle                                  |   5 +-
 10 files changed, 381 insertions(+), 279 deletions(-)
 create mode 100644 app/src/main/java/com/termux/window/TermuxFloatApplication.java
 delete mode 100644 app/src/main/java/com/termux/window/TermuxFloatPrefs.java
 create mode 100644 app/src/main/java/com/termux/window/TermuxFloatSessionClient.java

diff --git a/app/build.gradle b/app/build.gradle
index a517d50..1eff812 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,6 +8,10 @@ android {
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
         versionCode 14
         versionName "0.14"
+
+        manifestPlaceholders.TERMUX_PACKAGE_NAME = "com.termux"
+        manifestPlaceholders.TERMUX_APP_NAME = "Termux"
+        manifestPlaceholders.TERMUX_FLOAT_APP_NAME = "Termux:Float"
     }
 
     signingConfigs {
@@ -49,7 +53,8 @@ android {
 
 dependencies {
     implementation 'androidx.annotation:annotation:1.2.0'
-    implementation 'com.termux:terminal-view:0.106'
+    implementation 'com.termux.termux-app:termux-shared:9f1203f049'
+    implementation 'com.termux.termux-app:terminal-view:9f1203f049'
 
     testImplementation 'junit:junit:4.13.2'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 45b020c..50f8976 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.termux.window"
-    android:sharedUserId="com.termux">
+    android:sharedUserId="${TERMUX_PACKAGE_NAME}">
 
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
 
@@ -11,6 +11,7 @@
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <application
+        android:name=".TermuxFloatApplication"
         android:allowBackup="true"
         android:extractNativeLibs="true"
         android:icon="@drawable/ic_launcher"
diff --git a/app/src/main/java/com/termux/window/TermuxFloatApplication.java b/app/src/main/java/com/termux/window/TermuxFloatApplication.java
new file mode 100644
index 0000000..524a4c8
--- /dev/null
+++ b/app/src/main/java/com/termux/window/TermuxFloatApplication.java
@@ -0,0 +1,31 @@
+package com.termux.window;
+
+import android.app.Application;
+import android.content.Context;
+
+import com.termux.shared.crash.TermuxCrashUtils;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.settings.preferences.TermuxFloatAppSharedPreferences;
+
+
+public class TermuxFloatApplication extends Application {
+    public void onCreate() {
+        super.onCreate();
+
+        // Set crash handler for the app
+        TermuxCrashUtils.setCrashHandler(this);
+
+        // Set log level for the app
+        setLogLevel(getApplicationContext());
+
+        Logger.logDebug("Starting Application");
+    }
+
+    public static void setLogLevel(Context context) {
+        // Load the log level from shared preferences and set it to the {@link Logger.CURRENT_LOG_LEVEL}
+        TermuxFloatAppSharedPreferences preferences = TermuxFloatAppSharedPreferences.build(context);
+        if (preferences == null) return;
+        preferences.setLogLevel(null, preferences.getLogLevel(true), true);
+    }
+}
+
diff --git a/app/src/main/java/com/termux/window/TermuxFloatPrefs.java b/app/src/main/java/com/termux/window/TermuxFloatPrefs.java
deleted file mode 100644
index 282dab4..0000000
--- a/app/src/main/java/com/termux/window/TermuxFloatPrefs.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.termux.window;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-import android.view.WindowManager;
-
-public class TermuxFloatPrefs {
-
-    private static final String PREF_X = "window_x";
-    private static final String PREF_Y = "window_y";
-    private static final String PREF_WIDTH = "window_width";
-    private static final String PREF_HEIGHT = "window_height";
-
-    public static void saveWindowSize(Context context, int width, int height) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        prefs.edit().putInt(PREF_WIDTH, width).putInt(PREF_HEIGHT, height).apply();
-    }
-
-    public static void saveWindowPosition(Context context, int x, int y) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        prefs.edit().putInt(PREF_X, x).putInt(PREF_Y, y).apply();
-    }
-
-    public static void applySavedGeometry(Context context, WindowManager.LayoutParams layout) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        layout.x = prefs.getInt(PREF_X, 200);
-        layout.y = prefs.getInt(PREF_Y, 200);
-        layout.width = prefs.getInt(PREF_WIDTH, 500);
-        layout.height = prefs.getInt(PREF_HEIGHT, 800);
-    }
-}
diff --git a/app/src/main/java/com/termux/window/TermuxFloatService.java b/app/src/main/java/com/termux/window/TermuxFloatService.java
index aa64e68..2551ab8 100644
--- a/app/src/main/java/com/termux/window/TermuxFloatService.java
+++ b/app/src/main/java/com/termux/window/TermuxFloatService.java
@@ -2,273 +2,241 @@
 
 import android.annotation.SuppressLint;
 import android.app.Notification;
-import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
-import android.content.ClipData;
-import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Build;
 import android.os.IBinder;
-import android.os.Vibrator;
-import android.preference.PreferenceManager;
-import android.util.TypedValue;
-import androidx.annotation.RequiresApi;
-import android.view.Gravity;
+
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.TextView;
-import android.widget.Toast;
 
+import com.termux.shared.logger.Logger;
+import com.termux.shared.models.ExecutionCommand;
+import com.termux.shared.notification.NotificationUtils;
+import com.termux.shared.shell.TermuxSession;
+import com.termux.shared.shell.TermuxShellEnvironmentClient;
+import com.termux.shared.termux.TermuxConstants;
+import com.termux.shared.termux.TermuxConstants.TERMUX_FLOAT_APP.TERMUX_FLOAT_SERVICE;
 import com.termux.terminal.TerminalSession;
-
-import java.io.File;
+import com.termux.terminal.TerminalSessionClient;
 
 public class TermuxFloatService extends Service {
 
-    private static final String NOTIFICATION_CHANNEL_ID = "termux_notification_channel";
-
-    public static final String ACTION_HIDE = "com.termux.float.hide";
-    public static final String ACTION_SHOW = "com.termux.float.show";
-
     /**
-     * Note that this is a symlink on the Android M preview.
+     *  The {@link TerminalSessionClient} interface implementation to allow for communication between
+     *  {@link TerminalSession} and {@link TermuxFloatService}.
      */
-    @SuppressLint("SdCardPath")
-    public static final String FILES_PATH = "/data/data/com.termux/files";
-    public static final String PREFIX_PATH = FILES_PATH + "/usr";
-    public static final String HOME_PATH = FILES_PATH + "/home";
+    TermuxFloatSessionClient mTermuxFloatSessionClient;
 
-    /**
-     * The notification id supplied to {@link #startForeground(int, Notification)}.
-     * <p/>
-     * Note that the javadoc for that method says it cannot be zero.
-     */
-    private static final int NOTIFICATION_ID = 0xdead1337;
-
-    private int MIN_FONTSIZE;
-    private static final int MAX_FONTSIZE = 256;
-    private static final String FONTSIZE_KEY = "fontsize";
     private TermuxFloatView mFloatingWindow;
-    private int mFontSize;
 
     private boolean mVisibleWindow = true;
 
+    private static final String LOG_TAG = "TermuxFloatService";
+
     @Override
     public IBinder onBind(Intent intent) {
         return null;
     }
 
-    /**
-     * If value is not in the range [min, max], set it to either min or max.
-     */
-    static int clamp(int value, int min, int max) {
-        return Math.min(Math.max(value, min), max);
+    @Override
+    public void onCreate() {
+        runStartForeground();
+        TermuxFloatApplication.setLogLevel(this);
+        Logger.logVerbose(LOG_TAG, "onCreate");
     }
 
-    @SuppressLint({"InflateParams"})
     @Override
-    public void onCreate() {
-        super.onCreate();
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        Logger.logDebug(LOG_TAG, "onStartCommand");
 
-        float dipInPixels = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 1, getApplicationContext().getResources().getDisplayMetrics());
+        // Run again in case service is already started and onCreate() is not called
+        runStartForeground();
 
-        // This is a bit arbitrary and sub-optimal. We want to give a sensible default for minimum font size
-        // to prevent invisible text due to zoom be mistake:
-        MIN_FONTSIZE = (int) (4f * dipInPixels);
+        if (!initializeFloatView())
+            return Service.START_NOT_STICKY;
 
-        // http://www.google.com/design/spec/style/typography.html#typography-line-height
-        int defaultFontSize = Math.round(12 * dipInPixels);
-        // Make it divisible by 2 since that is the minimal adjustment step:
-        if (defaultFontSize % 2 == 1) defaultFontSize--;
+        String action = intent.getAction();
 
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        try {
-            mFontSize = Integer.parseInt(prefs.getString(FONTSIZE_KEY, Integer.toString(defaultFontSize)));
-        } catch (NumberFormatException | ClassCastException e) {
-            mFontSize = defaultFontSize;
+        if (action != null) {
+            switch (action) {
+                case TERMUX_FLOAT_SERVICE.ACTION_STOP_SERVICE:
+                    Logger.logDebug(LOG_TAG, "ACTION_STOP_SERVICE intent received");
+                    requestStopService();
+                    break;
+                case TERMUX_FLOAT_SERVICE.ACTION_SHOW:
+                    Logger.logDebug(LOG_TAG, "ACTION_SHOW intent received");
+                    setVisible(true);
+                    break;
+                case TERMUX_FLOAT_SERVICE.ACTION_HIDE:
+                    Logger.logDebug(LOG_TAG, "ACTION_HIDE intent received");
+                    setVisible(false);
+                    break;
+                default:
+                    Logger.logError(LOG_TAG, "Invalid action: \"" + action + "\"");
+                    break;
+            }
+        } else if (!mVisibleWindow) {
+            // Show window if hidden when launched through launcher icon.
+            setVisible(true);
         }
 
-        mFontSize = clamp(mFontSize, MIN_FONTSIZE, MAX_FONTSIZE);
+        return Service.START_NOT_STICKY;
 
-        TermuxFloatView floatingWindow = (TermuxFloatView) ((LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE)).inflate(R.layout.activity_main, null);
-        floatingWindow.initializeFloatingWindow();
-        floatingWindow.mTerminalView.setTextSize(mFontSize);
+    }
 
-        TerminalSession session = createTermSession();
-        floatingWindow.mTerminalView.attachSession(session);
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        Logger.logVerbose(LOG_TAG, "onDestroy");
 
-        try {
-            floatingWindow.launchFloatingWindow();
-        } catch (Exception e) {
-            // Settings.canDrawOverlays() does not work (always returns false, perhaps due to sharedUserId?).
-            // So instead we catch the exception and prompt here.
-            startActivity(new Intent(this, TermuxFloatPermissionActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
-            stopSelf();
-            return;
-        }
+        if (mFloatingWindow != null)
+            mFloatingWindow.closeFloatingWindow();
 
-        mFloatingWindow = floatingWindow;
+        runStopForeground();
+    }
+    /** Request to stop service. */
+    public void requestStopService() {
+        Logger.logDebug(LOG_TAG, "Requesting to stop service");
+        runStopForeground();
+        stopSelf();
+    }
 
-        Toast toast = Toast.makeText(this, R.string.initial_instruction_toast, Toast.LENGTH_LONG);
-        toast.setGravity(Gravity.CENTER, 0, 0);
-        TextView v = toast.getView().findViewById(android.R.id.message);
-        if (v != null) v.setGravity(Gravity.CENTER);
-        toast.show();
+    /** Make service run in foreground mode. */
+    private void runStartForeground() {
+        setupNotificationChannel();
+        startForeground(TermuxConstants.TERMUX_FLOAT_APP_NOTIFICATION_ID, buildNotification());
+    }
 
-        startForeground(NOTIFICATION_ID, buildNotification());
+    /** Make service leave foreground mode. */
+    private void runStopForeground() {
+        stopForeground(true);
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.O)
+
+
     private void setupNotificationChannel() {
-        String channelName = "Termux";
-        String channelDescription = "Notifications from Termux";
-        int importance = NotificationManager.IMPORTANCE_LOW;
-
-        NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, channelName, importance);
-        channel.setDescription(channelDescription);
-        NotificationManager manager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
-        manager.createNotificationChannel(channel);
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return;
+
+        NotificationUtils.setupNotificationChannel(this, TermuxConstants.TERMUX_FLOAT_APP_NOTIFICATION_CHANNEL_ID,
+                TermuxConstants.TERMUX_FLOAT_APP_NOTIFICATION_CHANNEL_NAME, NotificationManager.IMPORTANCE_LOW);
     }
 
     private Notification buildNotification() {
         final Resources res = getResources();
-        final String contentTitle = res.getString(R.string.notification_title);
-        final String contentText = res.getString(mVisibleWindow ? R.string.notification_message_visible : R.string.notification_message_hidden);
-
-        final String intentAction = mVisibleWindow ? ACTION_HIDE : ACTION_SHOW;
-        Intent actionIntent = new Intent(this, TermuxFloatService.class).setAction(intentAction);
-
-        Notification.Builder builder = new Notification.Builder(this).setContentTitle(contentTitle).setContentText(contentText)
-            .setPriority(Notification.PRIORITY_MIN).setSmallIcon(R.mipmap.ic_service_notification)
-            .setColor(0xFF000000)
-            .setContentIntent(PendingIntent.getService(this, 0, actionIntent, 0))
-            .setOngoing(true)
-            .setShowWhen(false);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            setupNotificationChannel();
-            builder.setChannelId(NOTIFICATION_CHANNEL_ID);
-        }
 
-        //final int messageId = mVisibleWindow ? R.string.toggle_hide : R.string.toggle_show;
-        //builder.addAction(android.R.drawable.ic_menu_preferences, res.getString(messageId), PendingIntent.getService(this, 0, actionIntent, 0));
+        final String notificationText = res.getString(mVisibleWindow ? R.string.notification_message_visible : R.string.notification_message_hidden);
+
+        final String intentAction = mVisibleWindow ? TERMUX_FLOAT_SERVICE.ACTION_HIDE : TERMUX_FLOAT_SERVICE.ACTION_SHOW;
+        Intent notificationIntent = new Intent(this, TermuxFloatService.class).setAction(intentAction);
+        PendingIntent contentIntent = PendingIntent.getService(this, 0, notificationIntent, 0);
+
+        // Build the notification
+        Notification.Builder builder =  NotificationUtils.geNotificationBuilder(this,
+                TermuxConstants.TERMUX_FLOAT_APP_NOTIFICATION_CHANNEL_ID, Notification.PRIORITY_MIN,
+                TermuxConstants.TERMUX_FLOAT_APP_NAME, notificationText, null,
+                contentIntent, null, NotificationUtils.NOTIFICATION_MODE_SILENT);
+        if (builder == null)  return null;
+
+        // No need to show a timestamp:
+        builder.setShowWhen(false);
+
+        // Set notification icon
+        builder.setSmallIcon(R.mipmap.ic_service_notification);
+
+        // Set background color for small notification icon
+        builder.setColor(0xFF000000);
+
+        // TermuxSessions are always ongoing
+        builder.setOngoing(true);
+
         return builder.build();
     }
 
 
-    @SuppressLint("Wakelock")
-    @Override
-    public int onStartCommand(Intent intent, int flags, int startId) {
-        String action = intent.getAction();
-        if (ACTION_HIDE.equals(action)) {
-            setVisible(false);
-        } else if (ACTION_SHOW.equals(action)) {
-            setVisible(true);
-        } else if (!mVisibleWindow) {
-            // Show window if hidden when launched through launcher icon.
-            setVisible(true);
+
+    @SuppressLint("InflateParams")
+    private boolean initializeFloatView() {
+        mTermuxFloatSessionClient = new TermuxFloatSessionClient(this);
+
+        boolean floatWindowWasNull = false;
+        if (mFloatingWindow == null) {
+            mFloatingWindow = (TermuxFloatView) ((LayoutInflater)
+                    getSystemService(Context.LAYOUT_INFLATER_SERVICE)).inflate(R.layout.activity_main, null);
+            floatWindowWasNull = true;
         }
-        return Service.START_NOT_STICKY;
-    }
 
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        if (mFloatingWindow != null) mFloatingWindow.closeFloatingWindow();
+        mFloatingWindow.initFloatView();
+
+        TermuxSession session = createTermuxSession(
+                new ExecutionCommand(0, null, null, null, null, false, false), null);
+        if (session == null)
+            return false;
+        mFloatingWindow.mTerminalView.attachSession(session.getTerminalSession());
+
+        try {
+            mFloatingWindow.launchFloatingWindow();
+        } catch (Exception e) {
+            Logger.logStackTrace(LOG_TAG, e);
+            // Settings.canDrawOverlays() does not work (always returns false, perhaps due to sharedUserId?).
+            // So instead we catch the exception and prompt here.
+            startActivity(new Intent(this, TermuxFloatPermissionActivity.class).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+            requestStopService();
+            return false;
+        }
+
+        if (floatWindowWasNull)
+            Logger.showToast(this, getString(R.string.initial_instruction_toast), true);
+
+        return true;
     }
 
     private void setVisible(boolean newVisibility) {
         mVisibleWindow = newVisibility;
         mFloatingWindow.setVisibility(newVisibility ? View.VISIBLE : View.GONE);
-        ((NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE)).notify(NOTIFICATION_ID, buildNotification());
+        ((NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE)).notify(TermuxConstants.TERMUX_FLOAT_APP_NOTIFICATION_ID, buildNotification());
     }
 
-    public void changeFontSize(boolean increase) {
-        mFontSize += (increase ? 1 : -1) * 2;
-        mFontSize = Math.max(MIN_FONTSIZE, mFontSize);
 
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-        prefs.edit().putString(FONTSIZE_KEY, Integer.toString(mFontSize)).apply();
 
-        mFloatingWindow.mTerminalView.setTextSize(mFontSize);
-    }
+    /** Create a {@link TermuxSession}. */
+    @Nullable
+    public synchronized TermuxSession createTermuxSession(ExecutionCommand executionCommand, String sessionName) {
+        if (executionCommand == null) return null;
 
-    // XXX: Keep in sync with TermuxService.java.
-    @SuppressLint("SdCardPath")
-    TerminalSession createTermSession() {
-        new File(HOME_PATH).mkdirs();
-
-        final String termEnv = "TERM=xterm-256color";
-        final String homeEnv = "HOME=" + TermuxFloatService.HOME_PATH;
-        final String prefixEnv = "PREFIX=" + TermuxFloatService.PREFIX_PATH;
-        final String androidRootEnv = "ANDROID_ROOT=" + System.getenv("ANDROID_ROOT");
-        final String androidDataEnv = "ANDROID_DATA=" + System.getenv("ANDROID_DATA");
-        // EXTERNAL_STORAGE is needed for /system/bin/am to work on at least
-        // Samsung S7 - see https://plus.google.com/110070148244138185604/posts/gp8Lk3aCGp3.
-        final String externalStorageEnv = "EXTERNAL_STORAGE=" + System.getenv("EXTERNAL_STORAGE");
-        final String ps1Env = "PS1=$ ";
-        final String ldEnv = "LD_LIBRARY_PATH=" + TermuxFloatService.PREFIX_PATH + "/lib";
-        final String langEnv = "LANG=en_US.UTF-8";
-        final String pathEnv = "PATH=" + TermuxFloatService.PREFIX_PATH + "/bin:" + TermuxFloatService.PREFIX_PATH + "/bin/applets";
-        String[] env = new String[]{termEnv, homeEnv, prefixEnv, ps1Env, ldEnv, langEnv, pathEnv, androidRootEnv, androidDataEnv, externalStorageEnv};
-
-        String executablePath = null;
-        String[] args;
-        String shellName = null;
-
-        for (String shellBinary : new String[]{"login", "bash", "zsh"}) {
-            File shellFile = new File(PREFIX_PATH + "/bin/" + shellBinary);
-            if (shellFile.canExecute()) {
-                executablePath = shellFile.getAbsolutePath();
-                shellName = "-" + shellBinary;
-                break;
-            }
-        }
+        Logger.logDebug(LOG_TAG, "Creating \"" + executionCommand.getCommandIdAndLabelLogString() + "\" TermuxSession");
 
-        if (executablePath == null) {
-            // Fall back to system shell as last resort:
-            executablePath = "/system/bin/sh";
-            shellName = "-sh";
+        if (executionCommand.inBackground) {
+            Logger.logDebug(LOG_TAG, "Ignoring a background execution command passed to createTermuxSession()");
+            return null;
         }
 
-        args = new String[]{shellName};
-
-        return new TerminalSession(executablePath, HOME_PATH, args, env, new TerminalSession.SessionChangedCallback() {
-            @Override
-            public void onTitleChanged(TerminalSession changedSession) {
-                // Ignore for now.
-            }
-
-            @Override
-            public void onTextChanged(TerminalSession changedSession) {
-                mFloatingWindow.mTerminalView.onScreenUpdated();
-            }
+        if (Logger.getLogLevel() >= Logger.LOG_LEVEL_VERBOSE)
+            Logger.logVerboseExtended(LOG_TAG, executionCommand.toString());
+
+        // If the execution command was started for a plugin, only then will the stdout be set
+        // Otherwise if command was manually started by the user like by adding a new terminal session,
+        // then no need to set stdout
+        TermuxSession newTermuxSession = TermuxSession.execute(this, executionCommand,
+                mTermuxFloatSessionClient, null, new TermuxShellEnvironmentClient(),
+                sessionName, executionCommand.isPluginExecutionCommand);
+        if (newTermuxSession == null) {
+            Logger.logError(LOG_TAG, "Failed to execute new TermuxSession command for:\n" + executionCommand.getCommandIdAndLabelLogString());
+            return null;
+        }
 
-            @Override
-            public void onSessionFinished(TerminalSession finishedSession) {
-                stopSelf();
-            }
+        return newTermuxSession;
+    }
 
-            @Override
-            public void onClipboardText(TerminalSession pastingSession, String text) {
-                ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-                clipboard.setPrimaryClip(new ClipData(null, new String[]{"text/plain"}, new ClipData.Item(text)));
-            }
 
-            @Override
-            public void onBell(TerminalSession riningSession) {
-                ((Vibrator) getSystemService(Context.VIBRATOR_SERVICE)).vibrate(50);
-            }
 
-            @Override
-            public void onColorsChanged(TerminalSession session) {
-            }
-        });
+    public TermuxFloatView getFloatingWindow() {
+        return mFloatingWindow;
     }
 
 }
diff --git a/app/src/main/java/com/termux/window/TermuxFloatSessionClient.java b/app/src/main/java/com/termux/window/TermuxFloatSessionClient.java
new file mode 100644
index 0000000..2540eba
--- /dev/null
+++ b/app/src/main/java/com/termux/window/TermuxFloatSessionClient.java
@@ -0,0 +1,44 @@
+package com.termux.window;
+
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.os.Vibrator;
+
+import com.termux.shared.terminal.TermuxTerminalSessionClientBase;
+import com.termux.terminal.TerminalSession;
+
+public class TermuxFloatSessionClient extends TermuxTerminalSessionClientBase {
+
+    private final TermuxFloatService mService;
+
+    private static final String LOG_TAG = "TermuxFloatSessionClient";
+
+    public TermuxFloatSessionClient(TermuxFloatService service) {
+        this.mService = service;
+    }
+
+    @Override
+    public void onTextChanged(TerminalSession changedSession) {
+        TermuxFloatView floatingWindow = mService.getFloatingWindow();
+        if (floatingWindow != null)
+            floatingWindow.mTerminalView.onScreenUpdated();
+    }
+
+    @Override
+    public void onSessionFinished(TerminalSession finishedSession) {
+        mService.requestStopService();
+    }
+
+    @Override
+    public void onCopyTextToClipboard(TerminalSession pastingSession, String text) {
+        ClipboardManager clipboard = (ClipboardManager) mService.getSystemService(Context.CLIPBOARD_SERVICE);
+        clipboard.setPrimaryClip(new ClipData(null, new String[]{"text/plain"}, new ClipData.Item(text)));
+    }
+
+    @Override
+    public void onBell(TerminalSession riningSession) {
+        ((Vibrator) mService.getSystemService(Context.VIBRATOR_SERVICE)).vibrate(50);
+    }
+
+}
diff --git a/app/src/main/java/com/termux/window/TermuxFloatView.java b/app/src/main/java/com/termux/window/TermuxFloatView.java
index 5b0f4df..08f2d29 100644
--- a/app/src/main/java/com/termux/window/TermuxFloatView.java
+++ b/app/src/main/java/com/termux/window/TermuxFloatView.java
@@ -8,7 +8,6 @@
 import android.graphics.Typeface;
 import android.os.Build;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;
@@ -16,13 +15,16 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.LinearLayout;
-import android.widget.Toast;
 
-import com.termux.terminal.EmulatorDebug;
+import com.termux.shared.logger.Logger;
+import com.termux.shared.settings.preferences.TermuxFloatAppSharedPreferences;
+import com.termux.shared.settings.properties.TermuxSharedProperties;
+import com.termux.shared.termux.TermuxConstants;
+import com.termux.shared.view.KeyboardUtils;
 import com.termux.view.TerminalView;
+import com.termux.view.TerminalViewClient;
 
 import java.io.File;
 
@@ -36,12 +38,27 @@ public class TermuxFloatView extends LinearLayout {
 
     final WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams();
     WindowManager mWindowManager;
-    InputMethodManager imm;
 
     TerminalView mTerminalView;
     ViewGroup mWindowControls;
     FloatingBubbleManager mFloatingBubbleManager;
 
+    /**
+     *  The {@link TerminalViewClient} interface implementation to allow for communication between
+     *  {@link TerminalView} and {@link TermuxFloatView}.
+     */
+    TermuxFloatViewClient mTermuxFloatViewClient;
+
+    /**
+     * Termux Float app shared preferences manager.
+     */
+    private TermuxFloatAppSharedPreferences mPreferences;
+
+    /**
+     * Termux app shared properties manager, loaded from termux.properties
+     */
+    private TermuxSharedProperties mProperties;
+
     private boolean withFocus = true;
     int initialX;
     int initialY;
@@ -54,6 +71,8 @@ public class TermuxFloatView extends LinearLayout {
 
     final int[] windowControlsLocation = new int[2];
 
+    private static final String LOG_TAG = "TermuxFloatView";
+
     final ScaleGestureDetector mScaleDetector = new ScaleGestureDetector(getContext(), new OnScaleGestureListener() {
         private static final int MIN_SIZE = 50;
 
@@ -71,7 +90,10 @@ public boolean onScale(ScaleGestureDetector detector) {
             layoutParams.width = Math.max(MIN_SIZE, layoutParams.width);
             layoutParams.height = Math.max(MIN_SIZE, layoutParams.height);
             mWindowManager.updateViewLayout(TermuxFloatView.this, layoutParams);
-            TermuxFloatPrefs.saveWindowSize(getContext(), layoutParams.width, layoutParams.height);
+            if (mPreferences != null) {
+                mPreferences.setWindowWidth(layoutParams.width);
+                mPreferences.setWindowHeight(layoutParams.height);
+            }
             return true;
         }
 
@@ -94,9 +116,24 @@ private static int computeLayoutFlags(boolean withFocus) {
         }
     }
 
-    public void initializeFloatingWindow() {
+    public void initFloatView() {
+        Logger.logDebug(LOG_TAG, "initFloatView");
+
+        // Load termux shared properties
+        mProperties = new TermuxSharedProperties(getContext());
+
+        // Load termux float shared preferences
+        // This will also fail if TermuxConstants.TERMUX_FLOAT_PACKAGE_NAME does not equal applicationId
+        mPreferences = TermuxFloatAppSharedPreferences.build(getContext(), true);
+        if (mPreferences == null) {
+            return;
+        }
+
         mTerminalView = findViewById(R.id.terminal_view);
-        mTerminalView.setOnKeyListener(new TermuxFloatViewClient(this));
+        mTermuxFloatViewClient = new TermuxFloatViewClient(this);
+        mTerminalView.setTerminalViewClient(mTermuxFloatViewClient);
+        mTermuxFloatViewClient.initFloatView();
+
         mFloatingBubbleManager = new FloatingBubbleManager(this);
         initWindowControls();
     }
@@ -126,11 +163,11 @@ protected void onAttachedToWindow() {
 
     void checkForFont() {
         try {
-            @SuppressLint("SdCardPath") File fontFile = new File("/data/data/com.termux/files/home/.termux/font.ttf");
+            @SuppressLint("SdCardPath") File fontFile = TermuxConstants.TERMUX_FONT_FILE;
             final Typeface newTypeface = (fontFile.exists() && fontFile.length() > 0) ? Typeface.createFromFile(fontFile) : Typeface.MONOSPACE;
             mTerminalView.setTypeface(newTypeface);
         } catch (Exception e) {
-            Log.e(EmulatorDebug.LOG_TAG, "Error in checkForFont()", e);
+            Logger.logStackTraceWithMessage(LOG_TAG, "Error in checkForFont()", e);
         }
     }
 
@@ -148,11 +185,17 @@ public void launchFloatingWindow() {
         layoutParams.format = PixelFormat.RGBA_8888;
 
         layoutParams.gravity = Gravity.TOP | Gravity.LEFT;
-        TermuxFloatPrefs.applySavedGeometry(getContext(), layoutParams);
+
+        if (mPreferences != null) {
+            layoutParams.x = mPreferences.getWindowX();
+            layoutParams.y = mPreferences.getWindowY();
+            layoutParams.width = mPreferences.getWindowWidth();
+            layoutParams.height = mPreferences.getWindowHeight();
+        }
 
         mWindowManager = (WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE);
-        mWindowManager.addView(this, layoutParams);
-        imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+        if (getWindowToken() == null)
+            mWindowManager.addView(this, layoutParams);
         showTouchKeyboard();
     }
 
@@ -204,22 +247,20 @@ private boolean didClickInsideWindowControls(float touchX, float touchY) {
     }
 
     void showTouchKeyboard() {
-        mTerminalView.post(() -> imm.showSoftInput(mTerminalView, InputMethodManager.SHOW_IMPLICIT));
+        mTerminalView.post(() -> KeyboardUtils.showSoftKeyboard(getContext(), mTerminalView));
+
     }
 
     void hideTouchKeyboard() {
-        mTerminalView.post(() -> imm.hideSoftInputFromWindow(mTerminalView.getWindowToken(), InputMethodManager.HIDE_IMPLICIT_ONLY));
+        mTerminalView.post(() -> KeyboardUtils.hideSoftKeyboard(getContext(), mTerminalView));
     }
 
     void updateLongPressMode(boolean newValue) {
         isInLongPressState = newValue;
         mFloatingBubbleManager.updateLongPressBackgroundResource(isInLongPressState);
         setAlpha(newValue ? ALPHA_MOVING : (withFocus ? ALPHA_FOCUS : ALPHA_NOT_FOCUS));
-        if (newValue && !mFloatingBubbleManager.isMinimized()) {
-            Toast toast = Toast.makeText(getContext(), R.string.after_long_press, Toast.LENGTH_SHORT);
-            toast.setGravity(Gravity.CENTER, 0, 0);
-            toast.show();
-        }
+        if (newValue && !mFloatingBubbleManager.isMinimized())
+            Logger.showToast(getContext(), getContext().getString(R.string.after_long_press), false);
     }
 
     /**
@@ -236,7 +277,10 @@ public boolean onTouchEvent(MotionEvent event) {
                     layoutParams.x = Math.min(DISPLAY_WIDTH - layoutParams.width, Math.max(0, initialX + (int) (event.getRawX() - initialTouchX)));
                     layoutParams.y = Math.min(DISPLAY_HEIGHT - layoutParams.height, Math.max(0, initialY + (int) (event.getRawY() - initialTouchY)));
                     mWindowManager.updateViewLayout(TermuxFloatView.this, layoutParams);
-                    TermuxFloatPrefs.saveWindowPosition(getContext(), layoutParams.x, layoutParams.y);
+                    if (mPreferences != null) {
+                        mPreferences.setWindowX(layoutParams.x);
+                        mPreferences.setWindowY(layoutParams.y);
+                    }
                     break;
                 case MotionEvent.ACTION_UP:
                     updateLongPressMode(false);
@@ -260,18 +304,34 @@ void changeFocus(boolean newFocus) {
         }
         withFocus = newFocus;
         layoutParams.flags = computeLayoutFlags(withFocus);
-        mWindowManager.updateViewLayout(this, layoutParams);
+        if (getWindowToken() != null)
+            mWindowManager.updateViewLayout(this, layoutParams);
         setAlpha(newFocus ? ALPHA_FOCUS : ALPHA_NOT_FOCUS);
     }
 
     public void closeFloatingWindow() {
-        mWindowManager.removeView(this);
+        if (getWindowToken() != null)
+            mWindowManager.removeView(this);
+
         mFloatingBubbleManager.cleanup();
         mFloatingBubbleManager = null;
     }
 
     private void exit() {
-        Intent intent = new Intent(getContext(), TermuxFloatService.class);
-        getContext().stopService(intent);
+        Intent exitIntent = new Intent(getContext(), TermuxFloatService.class).setAction(TermuxConstants.TERMUX_FLOAT_APP.TERMUX_FLOAT_SERVICE.ACTION_STOP_SERVICE);
+        getContext().startService(exitIntent);
+    }
+
+
+    public TerminalView getTerminalView() {
+        return mTerminalView;
+    }
+
+    public TermuxFloatAppSharedPreferences getPreferences() {
+        return mPreferences;
+    }
+
+    public TermuxSharedProperties getProperties() {
+        return mProperties;
     }
 }
diff --git a/app/src/main/java/com/termux/window/TermuxFloatViewClient.java b/app/src/main/java/com/termux/window/TermuxFloatViewClient.java
index bf9995a..fbdd479 100644
--- a/app/src/main/java/com/termux/window/TermuxFloatViewClient.java
+++ b/app/src/main/java/com/termux/window/TermuxFloatViewClient.java
@@ -5,30 +5,41 @@
 import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
-import android.view.inputmethod.InputMethodManager;
 
+import com.termux.shared.terminal.TermuxTerminalViewClientBase;
+import com.termux.shared.view.KeyboardUtils;
 import com.termux.terminal.KeyHandler;
 import com.termux.terminal.TerminalEmulator;
 import com.termux.terminal.TerminalSession;
-import com.termux.view.TerminalViewClient;
 
-public class TermuxFloatViewClient implements TerminalViewClient {
+public class TermuxFloatViewClient extends TermuxTerminalViewClientBase {
 
-    private final TermuxFloatView view;
+    private final TermuxFloatView mView;
     /**
      * Keeping track of the special keys acting as Ctrl and Fn for the soft keyboard and other hardware keys.
      */
     boolean mVirtualControlKeyDown, mVirtualFnKeyDown;
 
     public TermuxFloatViewClient(TermuxFloatView view) {
-        this.view = view;
+        this.mView = view;
+    }
+
+    /**
+     * Should be called when TermuxFloatView.initFloatView() is called
+     */
+    public void initFloatView() {
+        mView.getTerminalView().setTextSize(mView.getPreferences().getFontSize());
+
+        // Set {@link TerminalView#TERMINAL_VIEW_KEY_LOGGING_ENABLED} value
+        boolean isTerminalViewKeyLoggingEnabled = mView.getPreferences().isTerminalViewKeyLoggingEnabled(true);
+        mView.getTerminalView().setIsTerminalViewKeyLoggingEnabled(isTerminalViewKeyLoggingEnabled);
     }
 
     @Override
     public float onScale(float scale) {
         if (scale < 0.9f || scale > 1.1f) {
             boolean increase = scale > 1.f;
-            ((TermuxFloatService) view.getContext()).changeFontSize(increase);
+            changeFontSize(increase);
             return 1.0f;
         }
         return scale;
@@ -36,12 +47,12 @@ public float onScale(float scale) {
 
     @Override
     public boolean onLongPress(MotionEvent event) {
-        view.updateLongPressMode(true);
-        view.getLocationOnScreen(view.location);
-        view.initialX = view.location[0];
-        view.initialY = view.location[1];
-        view.initialTouchX = event.getRawX();
-        view.initialTouchY = event.getRawY();
+        mView.updateLongPressMode(true);
+        mView.getLocationOnScreen(mView.location);
+        mView.initialX = mView.location[0];
+        mView.initialY = mView.location[1];
+        mView.initialTouchX = event.getRawX();
+        mView.initialTouchY = event.getRawY();
         return true;
     }
 
@@ -64,7 +75,8 @@ public void copyModeChanged(boolean copyMode) {
     public boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession session) {
         if (handleVirtualKeys(keyCode, e, true)) return true;
 
-        if (e.isCtrlPressed() && e.isAltPressed()) {
+        if (!mView.getProperties().areHardwareKeyboardShortcutsDisabled() &&
+                e.isCtrlPressed() && e.isAltPressed()) {
             // Get the unmodified code point:
             int unicodeChar = e.getUnicodeChar(0);
 
@@ -73,8 +85,13 @@ public boolean onKeyDown(int keyCode, KeyEvent e, TerminalSession session) {
             } else if (unicodeChar == 'f'/* full screen */) {
                 // TODO: Toggle full screen.
             } else if (unicodeChar == 'k'/* keyboard */) {
-                InputMethodManager imm = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
-                imm.toggleSoftInput(InputMethodManager.SHOW_FORCED, 0);
+                KeyboardUtils.toggleSoftKeyboard(mView.getContext());
+            } else if (unicodeChar == '+' || e.getUnicodeChar(KeyEvent.META_SHIFT_ON) == '+') {
+                // We also check for the shifted char here since shift may be required to produce '+',
+                // see https://github.com/termux/termux-api/issues/2
+                changeFontSize(true);
+            } else if (unicodeChar == '-') {
+                changeFontSize(false);
             }
             return true;
         }
@@ -181,7 +198,7 @@ public boolean onCodePoint(int codePoint, boolean ctrlDown, TerminalSession sess
                 // Volume control.
                 case 'v':
                     resultingCodePoint = -1;
-                    AudioManager audio = (AudioManager) view.getContext().getSystemService(Context.AUDIO_SERVICE);
+                    AudioManager audio = (AudioManager) mView.getContext().getSystemService(Context.AUDIO_SERVICE);
                     audio.adjustSuggestedStreamVolume(AudioManager.ADJUST_SAME, AudioManager.USE_DEFAULT_STREAM_TYPE, AudioManager.FLAG_SHOW_UI);
                     break;
             }
@@ -215,4 +232,11 @@ private boolean handleVirtualKeys(int keyCode, KeyEvent event, boolean down) {
         }
         return false;
     }
+
+
+
+    public void changeFontSize(boolean increase) {
+        mView.getPreferences().changeFontSize(increase);
+        mView.getTerminalView().setTextSize(mView.getPreferences().getFontSize());
+    }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f0af058..77412de 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
 
-    <string name="app_name">Termux:Float</string>
+<!DOCTYPE resources [
+    <!ENTITY TERMUX_PACKAGE_NAME "com.termux">
+    <!ENTITY TERMUX_APP_NAME "Termux">
+    <!ENTITY TERMUX_FLOAT_APP_NAME "Termux:Float">
+    ]>
+
+<resources>
+    <string name="app_name">&TERMUX_FLOAT_APP_NAME;</string>
 	<string name="initial_instruction_toast">Long press on window to move or resize\n\nDouble tap and drag finger up or down to change font size</string>
 	<string name="after_long_press">Drag to position and pinch to resize</string>
 
     <string name="draw_overlay_permission_explanation">This app requires permission to draw overlays.</string>
     <string name="grant_permission">Grant permission</string>
 
-	<string name="notification_title">Termux:Float</string>
 	<string name="notification_message_visible">Touch to hide window.</string>
     <string name="notification_message_hidden">Touch to show window.</string>
-
-    <string name="paste_text">Paste</string>
-    <string name="copy_text">Copy</string>
-    <string name="text_selection_more">More…</string>
-
 </resources>
diff --git a/build.gradle b/build.gradle
index f9d31a0..edfafa6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
 
@@ -11,8 +11,9 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
+        maven { url "https://jitpack.io" }
     }
 }
 

From 46a48706b946a0880870106c2fbcba44ebf3d65f Mon Sep 17 00:00:00 2001
From: agnostic-apollo <31106828+agnostic-apollo@users.noreply.github.com>
Date: Thu, 2 Sep 2021 07:08:42 +0500
Subject: [PATCH 10/27] Update debug_build.yml

---
 .github/workflows/debug_build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
index b13d07a..51940ac 100644
--- a/.github/workflows/debug_build.yml
+++ b/.github/workflows/debug_build.yml
@@ -15,4 +15,4 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: termux-float
-        path: ./app/build/outputs/apk/debug/app-debug.apk
+        path: ./app/build/outputs/apk/debug/termux-float-debug.apk

From 90f908d0a02ec37cb2593d7fb1216c09ad60780f Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 2 Sep 2021 13:49:07 +0500
Subject: [PATCH 11/27] Added/Fixed: Use ~/.termux/termux.float.properties and
 fix bug created in a46762a8

- Fixed termux session being recreated on showing from notification.
- Added exit button to notification.
- Increased notification priority so its easier to show/hide/exit.
- Ensure session is killed on exit like `TermuxService` does it.
- Added support for `~/.termux/color.properties` and `~/.termux/font.ttf` to set colors and font.
- Added support for bell.
- Added support for `~/.termux/termux.float.properties` which supports the following properties: `enforce-char-based-input`, `ctrl-space-workaround`, `bell-character`, `terminal-cursor-style`, `terminal-transcript-rows`, `back-key`, `default-working-directory`, `volume-keys`.
---
 app/build.gradle                              |  10 +-
 .../termux/window/FloatingBubbleManager.java  |   2 +-
 .../com/termux/window/TermuxFloatService.java |  54 +++---
 .../window/TermuxFloatSessionClient.java      | 159 +++++++++++++++++-
 .../com/termux/window/TermuxFloatView.java    |  64 ++++---
 .../termux/window/TermuxFloatViewClient.java  |  35 +++-
 .../TermuxFloatAppSharedProperties.java       |  28 +++
 app/src/main/res/values/strings.xml           |   3 +-
 build.gradle                                  |   1 +
 9 files changed, 292 insertions(+), 64 deletions(-)
 create mode 100644 app/src/main/java/com/termux/window/settings/properties/TermuxFloatAppSharedProperties.java

diff --git a/app/build.gradle b/app/build.gradle
index 1eff812..ade2718 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -53,8 +53,14 @@ android {
 
 dependencies {
     implementation 'androidx.annotation:annotation:1.2.0'
-    implementation 'com.termux.termux-app:termux-shared:9f1203f049'
-    implementation 'com.termux.termux-app:terminal-view:9f1203f049'
+
+    implementation 'com.termux.termux-app:termux-shared:bc779d2ffb'
+    implementation 'com.termux.termux-app:terminal-view:bc779d2ffb'
+
+    // Use if below libraries are published locally by termux-app with `./gradlew publishReleasePublicationToMavenLocal` and used with `mavenLocal()`.
+    // If updates are done, republish there and sync project with gradle files here
+    //implementation 'com.termux:termux-shared:0.117'
+    //implementation 'com.termux:terminal-view:0.117'
 
     testImplementation 'junit:junit:4.13.2'
 }
diff --git a/app/src/main/java/com/termux/window/FloatingBubbleManager.java b/app/src/main/java/com/termux/window/FloatingBubbleManager.java
index 11e0ce3..1c9985d 100644
--- a/app/src/main/java/com/termux/window/FloatingBubbleManager.java
+++ b/app/src/main/java/com/termux/window/FloatingBubbleManager.java
@@ -122,7 +122,7 @@ private TermuxFloatView getTermuxFloatView() {
     }
 
     private TerminalView getTerminalView() {
-        return mTermuxFloatView.mTerminalView;
+        return mTermuxFloatView.getTerminalView();
     }
 
     private WindowManager getWindowManager() {
diff --git a/app/src/main/java/com/termux/window/TermuxFloatService.java b/app/src/main/java/com/termux/window/TermuxFloatService.java
index 2551ab8..c22b568 100644
--- a/app/src/main/java/com/termux/window/TermuxFloatService.java
+++ b/app/src/main/java/com/termux/window/TermuxFloatService.java
@@ -22,19 +22,13 @@
 import com.termux.shared.shell.TermuxShellEnvironmentClient;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.termux.TermuxConstants.TERMUX_FLOAT_APP.TERMUX_FLOAT_SERVICE;
-import com.termux.terminal.TerminalSession;
-import com.termux.terminal.TerminalSessionClient;
 
 public class TermuxFloatService extends Service {
 
-    /**
-     *  The {@link TerminalSessionClient} interface implementation to allow for communication between
-     *  {@link TerminalSession} and {@link TermuxFloatService}.
-     */
-    TermuxFloatSessionClient mTermuxFloatSessionClient;
-
     private TermuxFloatView mFloatingWindow;
 
+    private TermuxSession mSession;
+
     private boolean mVisibleWindow = true;
 
     private static final String LOG_TAG = "TermuxFloatService";
@@ -58,7 +52,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         // Run again in case service is already started and onCreate() is not called
         runStartForeground();
 
-        if (!initializeFloatView())
+        if (mFloatingWindow == null && !initializeFloatView())
             return Service.START_NOT_STICKY;
 
         String action = intent.getAction();
@@ -67,7 +61,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             switch (action) {
                 case TERMUX_FLOAT_SERVICE.ACTION_STOP_SERVICE:
                     Logger.logDebug(LOG_TAG, "ACTION_STOP_SERVICE intent received");
-                    requestStopService();
+                    actionStopService();
                     break;
                 case TERMUX_FLOAT_SERVICE.ACTION_SHOW:
                     Logger.logDebug(LOG_TAG, "ACTION_SHOW intent received");
@@ -107,6 +101,13 @@ public void requestStopService() {
         stopSelf();
     }
 
+    /** Process action to stop service. */
+    private void actionStopService() {
+        if (mSession != null)
+            mSession.killIfExecuting(this, false);
+        requestStopService();
+    }
+
     /** Make service run in foreground mode. */
     private void runStartForeground() {
         setupNotificationChannel();
@@ -138,7 +139,7 @@ private Notification buildNotification() {
 
         // Build the notification
         Notification.Builder builder =  NotificationUtils.geNotificationBuilder(this,
-                TermuxConstants.TERMUX_FLOAT_APP_NOTIFICATION_CHANNEL_ID, Notification.PRIORITY_MIN,
+                TermuxConstants.TERMUX_FLOAT_APP_NOTIFICATION_CHANNEL_ID, Notification.PRIORITY_LOW,
                 TermuxConstants.TERMUX_FLOAT_APP_NAME, notificationText, null,
                 contentIntent, null, NotificationUtils.NOTIFICATION_MODE_SILENT);
         if (builder == null)  return null;
@@ -155,6 +156,10 @@ private Notification buildNotification() {
         // TermuxSessions are always ongoing
         builder.setOngoing(true);
 
+        // Set Exit button action
+        Intent exitIntent = new Intent(this, TermuxFloatService.class).setAction(TERMUX_FLOAT_SERVICE.ACTION_STOP_SERVICE);
+        builder.addAction(android.R.drawable.ic_delete, res.getString(R.string.notification_action_exit), PendingIntent.getService(this, 0, exitIntent, 0));
+
         return builder.build();
     }
 
@@ -162,8 +167,6 @@ private Notification buildNotification() {
 
     @SuppressLint("InflateParams")
     private boolean initializeFloatView() {
-        mTermuxFloatSessionClient = new TermuxFloatSessionClient(this);
-
         boolean floatWindowWasNull = false;
         if (mFloatingWindow == null) {
             mFloatingWindow = (TermuxFloatView) ((LayoutInflater)
@@ -171,13 +174,13 @@ private boolean initializeFloatView() {
             floatWindowWasNull = true;
         }
 
-        mFloatingWindow.initFloatView();
+        mFloatingWindow.initFloatView(this);
 
-        TermuxSession session = createTermuxSession(
-                new ExecutionCommand(0, null, null, null, null, false, false), null);
-        if (session == null)
+        mSession = createTermuxSession(
+                new ExecutionCommand(0, null, null, null, mFloatingWindow.getProperties().getDefaultWorkingDirectory(), false, false), null);
+        if (mSession == null)
             return false;
-        mFloatingWindow.mTerminalView.attachSession(session.getTerminalSession());
+        mFloatingWindow.getTerminalView().attachSession(mSession.getTerminalSession());
 
         try {
             mFloatingWindow.launchFloatingWindow();
@@ -219,24 +222,23 @@ public synchronized TermuxSession createTermuxSession(ExecutionCommand execution
         if (Logger.getLogLevel() >= Logger.LOG_LEVEL_VERBOSE)
             Logger.logVerboseExtended(LOG_TAG, executionCommand.toString());
 
-        // If the execution command was started for a plugin, only then will the stdout be set
-        // Otherwise if command was manually started by the user like by adding a new terminal session,
-        // then no need to set stdout
+        executionCommand.terminalTranscriptRows = mFloatingWindow.getProperties().getTerminalTranscriptRows();
         TermuxSession newTermuxSession = TermuxSession.execute(this, executionCommand,
-                mTermuxFloatSessionClient, null, new TermuxShellEnvironmentClient(),
+                mFloatingWindow.getTermuxFloatSessionClient(), null, new TermuxShellEnvironmentClient(),
                 sessionName, executionCommand.isPluginExecutionCommand);
         if (newTermuxSession == null) {
             Logger.logError(LOG_TAG, "Failed to execute new TermuxSession command for:\n" + executionCommand.getCommandIdAndLabelLogString());
             return null;
         }
 
+        // Emulator won't be set at this point so colors won't be set by TermuxFloatSessionClient.checkForFontAndColors()
+        mFloatingWindow.reloadViewStyling();
+
         return newTermuxSession;
     }
 
-
-
-    public TermuxFloatView getFloatingWindow() {
-        return mFloatingWindow;
+    public TermuxSession getSession() {
+        return mSession;
     }
 
 }
diff --git a/app/src/main/java/com/termux/window/TermuxFloatSessionClient.java b/app/src/main/java/com/termux/window/TermuxFloatSessionClient.java
index 2540eba..6891a0a 100644
--- a/app/src/main/java/com/termux/window/TermuxFloatSessionClient.java
+++ b/app/src/main/java/com/termux/window/TermuxFloatSessionClient.java
@@ -3,26 +3,76 @@
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
-import android.os.Vibrator;
+import android.graphics.Typeface;
+import android.media.AudioAttributes;
+import android.media.SoundPool;
+import android.text.TextUtils;
 
+import com.termux.shared.logger.Logger;
+import com.termux.shared.settings.properties.TermuxPropertyConstants;
 import com.termux.shared.terminal.TermuxTerminalSessionClientBase;
+import com.termux.shared.terminal.io.BellHandler;
+import com.termux.shared.termux.TermuxConstants;
+import com.termux.terminal.TerminalColors;
 import com.termux.terminal.TerminalSession;
+import com.termux.terminal.TextStyle;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.Properties;
 
 public class TermuxFloatSessionClient extends TermuxTerminalSessionClientBase {
 
     private final TermuxFloatService mService;
+    private final TermuxFloatView mView;
+
+    private SoundPool mBellSoundPool;
+
+    private int mBellSoundId;
 
     private static final String LOG_TAG = "TermuxFloatSessionClient";
 
-    public TermuxFloatSessionClient(TermuxFloatService service) {
-        this.mService = service;
+    public TermuxFloatSessionClient(TermuxFloatService service, TermuxFloatView view) {
+        mService = service;
+        mView = view;
     }
 
+    /**
+     * Should be called when TermuxFloatView.onAttachedToWindow() is called
+     */
+    public void onAttachedToWindow() {
+        // Just initialize the mBellSoundPool and load the sound, otherwise bell might not run
+        // the first time bell key is pressed and play() is called, since sound may not be loaded
+        // quickly enough before the call to play(). https://stackoverflow.com/questions/35435625
+        getBellSoundPool();
+    }
+
+    /**
+     * Should be called when TermuxFloatView.onDetachedFromWindow() is called
+     */
+    public void onDetachedFromWindow() {
+        // Release mBellSoundPool resources, specially to prevent exceptions like the following to be thrown
+        // java.util.concurrent.TimeoutException: android.media.SoundPool.finalize() timed out after 10 seconds
+        // Bell is not played in background anyways
+        // Related: https://stackoverflow.com/a/28708351/14686958
+        releaseBellSoundPool();
+    }
+
+    /**
+     * Should be called when TermuxFloatView.onReload() is called
+     */
+    public void onReload() {
+        checkForFontAndColors();
+    }
+
+
+
     @Override
     public void onTextChanged(TerminalSession changedSession) {
-        TermuxFloatView floatingWindow = mService.getFloatingWindow();
-        if (floatingWindow != null)
-            floatingWindow.mTerminalView.onScreenUpdated();
+        if (!mView.isVisible()) return;
+
+        mView.getTerminalView().onScreenUpdated();
     }
 
     @Override
@@ -37,8 +87,101 @@ public void onCopyTextToClipboard(TerminalSession pastingSession, String text) {
     }
 
     @Override
-    public void onBell(TerminalSession riningSession) {
-        ((Vibrator) mService.getSystemService(Context.VIBRATOR_SERVICE)).vibrate(50);
+    public void onPasteTextFromClipboard(TerminalSession session) {
+        if (!mView.isVisible()) return;
+
+        ClipboardManager clipboard = (ClipboardManager) mService.getSystemService(Context.CLIPBOARD_SERVICE);
+        ClipData clipData = clipboard.getPrimaryClip();
+        if (clipData != null) {
+            CharSequence paste = clipData.getItemAt(0).coerceToText(mService);
+            if (!TextUtils.isEmpty(paste)) mView.getTerminalView().mEmulator.paste(paste.toString());
+        }
+    }
+
+    @Override
+    public void onBell(TerminalSession session) {
+        if (!mView.isVisible()) return;
+
+        switch (mView.getProperties().getBellBehaviour()) {
+            case TermuxPropertyConstants.IVALUE_BELL_BEHAVIOUR_VIBRATE:
+                BellHandler.getInstance(mService).doBell();
+                break;
+            case TermuxPropertyConstants.IVALUE_BELL_BEHAVIOUR_BEEP:
+                getBellSoundPool().play(mBellSoundId, 1.f, 1.f, 1, 0, 1.f);
+                break;
+            case TermuxPropertyConstants.IVALUE_BELL_BEHAVIOUR_IGNORE:
+                // Ignore the bell character.
+                break;
+        }
+    }
+
+    @Override
+    public void onColorsChanged(TerminalSession changedSession) {
+        updateBackgroundColor();
+    }
+
+
+    @Override
+    public Integer getTerminalCursorStyle() {
+        return mView.getProperties().getTerminalCursorStyle();
+    }
+
+
+    /** Initialize and get mBellSoundPool */
+    private synchronized SoundPool getBellSoundPool() {
+        if (mBellSoundPool == null) {
+            mBellSoundPool = new SoundPool.Builder().setMaxStreams(1).setAudioAttributes(
+                    new AudioAttributes.Builder().setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+                            .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION).build()).build();
+
+            mBellSoundId = mBellSoundPool.load(mService, R.raw.bell, 1);
+        }
+
+        return mBellSoundPool;
+    }
+
+    /** Release mBellSoundPool resources */
+    private synchronized void releaseBellSoundPool() {
+        if (mBellSoundPool != null) {
+            mBellSoundPool.release();
+            mBellSoundPool = null;
+        }
+    }
+
+
+
+    public void checkForFontAndColors() {
+        try {
+            File colorsFile = TermuxConstants.TERMUX_COLOR_PROPERTIES_FILE;
+            File fontFile = TermuxConstants.TERMUX_FONT_FILE;
+
+            final Properties props = new Properties();
+            if (colorsFile.isFile()) {
+                try (InputStream in = new FileInputStream(colorsFile)) {
+                    props.load(in);
+                }
+            }
+
+            TerminalColors.COLOR_SCHEME.updateWith(props);
+            TerminalSession session = mService.getSession().getTerminalSession();
+            if (session != null && session.getEmulator() != null) {
+                session.getEmulator().mColors.reset();
+            }
+            updateBackgroundColor();
+
+            final Typeface newTypeface = (fontFile.exists() && fontFile.length() > 0) ? Typeface.createFromFile(fontFile) : Typeface.MONOSPACE;
+            mView.getTerminalView().setTypeface(newTypeface);
+        } catch (Exception e) {
+            Logger.logStackTraceWithMessage(LOG_TAG, "Error in checkForFontAndColors()", e);
+        }
+    }
+
+    public void updateBackgroundColor() {
+        //if (!mView.isVisible()) return;
+        TerminalSession session = mService.getSession().getTerminalSession();
+        if (session != null && session.getEmulator() != null) {
+            mView.getTerminalView().setBackgroundColor(session.getEmulator().mColors.mCurrentColors[TextStyle.COLOR_INDEX_BACKGROUND]);
+        }
     }
 
 }
diff --git a/app/src/main/java/com/termux/window/TermuxFloatView.java b/app/src/main/java/com/termux/window/TermuxFloatView.java
index 08f2d29..629c279 100644
--- a/app/src/main/java/com/termux/window/TermuxFloatView.java
+++ b/app/src/main/java/com/termux/window/TermuxFloatView.java
@@ -5,7 +5,6 @@
 import android.content.Intent;
 import android.graphics.PixelFormat;
 import android.graphics.Point;
-import android.graphics.Typeface;
 import android.os.Build;
 import android.util.AttributeSet;
 import android.view.Gravity;
@@ -20,13 +19,13 @@
 
 import com.termux.shared.logger.Logger;
 import com.termux.shared.settings.preferences.TermuxFloatAppSharedPreferences;
-import com.termux.shared.settings.properties.TermuxSharedProperties;
 import com.termux.shared.termux.TermuxConstants;
 import com.termux.shared.view.KeyboardUtils;
+import com.termux.terminal.TerminalSession;
+import com.termux.terminal.TerminalSessionClient;
 import com.termux.view.TerminalView;
 import com.termux.view.TerminalViewClient;
-
-import java.io.File;
+import com.termux.window.settings.properties.TermuxFloatAppSharedProperties;
 
 public class TermuxFloatView extends LinearLayout {
 
@@ -39,7 +38,7 @@ public class TermuxFloatView extends LinearLayout {
     final WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams();
     WindowManager mWindowManager;
 
-    TerminalView mTerminalView;
+    private TerminalView mTerminalView;
     ViewGroup mWindowControls;
     FloatingBubbleManager mFloatingBubbleManager;
 
@@ -49,6 +48,12 @@ public class TermuxFloatView extends LinearLayout {
      */
     TermuxFloatViewClient mTermuxFloatViewClient;
 
+    /**
+     *  The {@link TerminalSessionClient} interface implementation to allow for communication between
+     *  {@link TerminalSession} and {@link TermuxFloatService}.
+     */
+    TermuxFloatSessionClient mTermuxFloatSessionClient;
+
     /**
      * Termux Float app shared preferences manager.
      */
@@ -57,7 +62,7 @@ public class TermuxFloatView extends LinearLayout {
     /**
      * Termux app shared properties manager, loaded from termux.properties
      */
-    private TermuxSharedProperties mProperties;
+    private TermuxFloatAppSharedProperties mProperties;
 
     private boolean withFocus = true;
     int initialX;
@@ -116,11 +121,11 @@ private static int computeLayoutFlags(boolean withFocus) {
         }
     }
 
-    public void initFloatView() {
+    public void initFloatView(TermuxFloatService service) {
         Logger.logDebug(LOG_TAG, "initFloatView");
 
         // Load termux shared properties
-        mProperties = new TermuxSharedProperties(getContext());
+        mProperties = new TermuxFloatAppSharedProperties(getContext());
 
         // Load termux float shared preferences
         // This will also fail if TermuxConstants.TERMUX_FLOAT_PACKAGE_NAME does not equal applicationId
@@ -129,8 +134,10 @@ public void initFloatView() {
             return;
         }
 
+        mTermuxFloatSessionClient = new TermuxFloatSessionClient(service, this);
+
         mTerminalView = findViewById(R.id.terminal_view);
-        mTermuxFloatViewClient = new TermuxFloatViewClient(this);
+        mTermuxFloatViewClient = new TermuxFloatViewClient(this, mTermuxFloatSessionClient);
         mTerminalView.setTerminalViewClient(mTermuxFloatViewClient);
         mTermuxFloatViewClient.initFloatView();
 
@@ -158,17 +165,16 @@ protected void onAttachedToWindow() {
         DISPLAY_WIDTH = displaySize.x;
         DISPLAY_HEIGHT = displaySize.y;
 
-        checkForFont();
+        if (mTermuxFloatSessionClient != null)
+            mTermuxFloatSessionClient.onAttachedToWindow();
     }
 
-    void checkForFont() {
-        try {
-            @SuppressLint("SdCardPath") File fontFile = TermuxConstants.TERMUX_FONT_FILE;
-            final Typeface newTypeface = (fontFile.exists() && fontFile.length() > 0) ? Typeface.createFromFile(fontFile) : Typeface.MONOSPACE;
-            mTerminalView.setTypeface(newTypeface);
-        } catch (Exception e) {
-            Logger.logStackTraceWithMessage(LOG_TAG, "Error in checkForFont()", e);
-        }
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+
+        if (mTermuxFloatSessionClient != null)
+            mTermuxFloatSessionClient.onDetachedFromWindow();
     }
 
     @SuppressLint("RtlHardcoded")
@@ -323,15 +329,35 @@ private void exit() {
     }
 
 
+
+    public boolean isVisible() {
+        return isAttachedToWindow() && isShown();
+    }
+
     public TerminalView getTerminalView() {
         return mTerminalView;
     }
 
+    public TermuxFloatViewClient getTermuxFloatViewClient() {
+        return mTermuxFloatViewClient;
+    }
+
+    public TermuxFloatSessionClient getTermuxFloatSessionClient() {
+        return mTermuxFloatSessionClient;
+    }
+
     public TermuxFloatAppSharedPreferences getPreferences() {
         return mPreferences;
     }
 
-    public TermuxSharedProperties getProperties() {
+    public TermuxFloatAppSharedProperties getProperties() {
         return mProperties;
     }
+
+
+    public void reloadViewStyling() {
+        // Leaving here for future support for termux-reload-settings
+        if (mTermuxFloatSessionClient != null)
+            mTermuxFloatSessionClient.onReload();
+    }
 }
diff --git a/app/src/main/java/com/termux/window/TermuxFloatViewClient.java b/app/src/main/java/com/termux/window/TermuxFloatViewClient.java
index fbdd479..c52906b 100644
--- a/app/src/main/java/com/termux/window/TermuxFloatViewClient.java
+++ b/app/src/main/java/com/termux/window/TermuxFloatViewClient.java
@@ -15,13 +15,16 @@
 public class TermuxFloatViewClient extends TermuxTerminalViewClientBase {
 
     private final TermuxFloatView mView;
+    private final TermuxFloatSessionClient mTermuxFloatSessionClient;
+
     /**
      * Keeping track of the special keys acting as Ctrl and Fn for the soft keyboard and other hardware keys.
      */
     boolean mVirtualControlKeyDown, mVirtualFnKeyDown;
 
-    public TermuxFloatViewClient(TermuxFloatView view) {
-        this.mView = view;
+    public TermuxFloatViewClient(TermuxFloatView view, TermuxFloatSessionClient termuxFloatSessionClient) {
+        mView = view;
+        mTermuxFloatSessionClient = termuxFloatSessionClient;
     }
 
     /**
@@ -35,6 +38,17 @@ public void initFloatView() {
         mView.getTerminalView().setIsTerminalViewKeyLoggingEnabled(isTerminalViewKeyLoggingEnabled);
     }
 
+    /**
+     * Should be called when {@link com.termux.view.TerminalView#mEmulator} is set
+     */
+    @Override
+    public void onEmulatorSet() {
+        // This is being called every time float bubble is maximized
+        mTermuxFloatSessionClient.checkForFontAndColors();
+    }
+
+
+
     @Override
     public float onScale(float scale) {
         if (scale < 0.9f || scale > 1.1f) {
@@ -57,13 +71,18 @@ public boolean onLongPress(MotionEvent event) {
     }
 
     @Override
-    public void onSingleTapUp(MotionEvent e) {
-        // Do nothing.
+    public boolean shouldBackButtonBeMappedToEscape() {
+        return mView.getProperties().isBackKeyTheEscapeKey();
     }
 
     @Override
-    public boolean shouldBackButtonBeMappedToEscape() {
-        return false;
+    public boolean shouldEnforceCharBasedInput() {
+        return mView.getProperties().isEnforcingCharBasedInput();
+    }
+
+    @Override
+    public boolean shouldUseCtrlSpaceWorkaround() {
+        return mView.getProperties().isUsingCtrlSpaceWorkaround();
     }
 
     @Override
@@ -220,7 +239,9 @@ public boolean onCodePoint(int codePoint, boolean ctrlDown, TerminalSession sess
      */
     private boolean handleVirtualKeys(int keyCode, KeyEvent event, boolean down) {
         InputDevice inputDevice = event.getDevice();
-        if (inputDevice != null && inputDevice.getKeyboardType() == InputDevice.KEYBOARD_TYPE_ALPHABETIC) {
+        if (mView.getProperties().areVirtualVolumeKeysDisabled()) {
+            return false;
+        } else if (inputDevice != null && inputDevice.getKeyboardType() == InputDevice.KEYBOARD_TYPE_ALPHABETIC) {
             // Do not steal dedicated buttons from a full external keyboard.
             return false;
         } else if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
diff --git a/app/src/main/java/com/termux/window/settings/properties/TermuxFloatAppSharedProperties.java b/app/src/main/java/com/termux/window/settings/properties/TermuxFloatAppSharedProperties.java
new file mode 100644
index 0000000..2690c33
--- /dev/null
+++ b/app/src/main/java/com/termux/window/settings/properties/TermuxFloatAppSharedProperties.java
@@ -0,0 +1,28 @@
+package com.termux.window.settings.properties;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+
+import com.termux.shared.settings.properties.TermuxPropertyConstants;
+import com.termux.shared.settings.properties.TermuxSharedProperties;
+import com.termux.shared.termux.TermuxConstants;
+
+public class TermuxFloatAppSharedProperties extends TermuxSharedProperties {
+
+    private static final String LOG_TAG = "TermuxFloatAppSharedProperties";
+
+    public TermuxFloatAppSharedProperties(@NonNull Context context) {
+        super(context, TermuxConstants.TERMUX_FLOAT_APP_NAME, TermuxPropertyConstants.getTermuxFloatPropertiesFile(),
+            TermuxPropertyConstants.TERMUX_PROPERTIES_LIST, new SharedPropertiesParserClient());
+    }
+
+    /**
+     * Load the {@link TermuxPropertyConstants#KEY_TERMINAL_TRANSCRIPT_ROWS} value from termux properties file on disk.
+     */
+    public static int getTerminalTranscriptRows(Context context) {
+        return  (int) TermuxSharedProperties.getInternalPropertyValue(context, TermuxPropertyConstants.getTermuxFloatPropertiesFile(),
+            TermuxPropertyConstants.KEY_TERMINAL_TRANSCRIPT_ROWS, new SharedPropertiesParserClient());
+    }
+
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 77412de..8530161 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,6 +14,7 @@
     <string name="draw_overlay_permission_explanation">This app requires permission to draw overlays.</string>
     <string name="grant_permission">Grant permission</string>
 
-	<string name="notification_message_visible">Touch to hide window.</string>
+    <string name="notification_action_exit">Exit</string>
+    <string name="notification_message_visible">Touch to hide window.</string>
     <string name="notification_message_hidden">Touch to show window.</string>
 </resources>
diff --git a/build.gradle b/build.gradle
index edfafa6..565c865 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,6 +13,7 @@ allprojects {
     repositories {
         mavenCentral()
         google()
+        //mavenLocal()
         maven { url "https://jitpack.io" }
     }
 }

From c83cddaf9d72ba7605349ad2168db37b16ab76c9 Mon Sep 17 00:00:00 2001
From: David Kramer <daveskypilot@gmail.com>
Date: Thu, 2 Sep 2021 18:11:22 -0500
Subject: [PATCH 12/27] Fixed: Use dp sizing for bubble size to support
 different display densities

---
 .../java/com/termux/window/FloatingBubbleManager.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/termux/window/FloatingBubbleManager.java b/app/src/main/java/com/termux/window/FloatingBubbleManager.java
index 1c9985d..ed49bf0 100644
--- a/app/src/main/java/com/termux/window/FloatingBubbleManager.java
+++ b/app/src/main/java/com/termux/window/FloatingBubbleManager.java
@@ -5,6 +5,7 @@
 import android.view.ViewGroup;
 import android.view.WindowManager;
 
+import com.termux.shared.view.ViewUtils;
 import com.termux.view.TerminalView;
 
 /**
@@ -12,9 +13,10 @@
  * to its original display.
  */
 public class FloatingBubbleManager {
-    private static final int BUBBLE_SIZE = 200;
+    private static final int DEFAULT_BUBBLE_SIZE_DP = 80;
 
     private TermuxFloatView mTermuxFloatView;
+    private final int BUBBLE_SIZE_PX;
 
     private boolean mIsMinimized;
 
@@ -26,9 +28,9 @@ public class FloatingBubbleManager {
     private Drawable mOriginalTerminalViewBackground;
     private Drawable mOriginalFloatViewBackground;
 
-
     public FloatingBubbleManager(TermuxFloatView termuxFloatView) {
         mTermuxFloatView = termuxFloatView;
+        BUBBLE_SIZE_PX = ViewUtils.dpToPx(mTermuxFloatView.getContext(), DEFAULT_BUBBLE_SIZE_DP);
     }
 
     public void toggleBubble() {
@@ -50,8 +52,9 @@ public void displayAsFloatingBubble() {
         captureOriginalLayoutValues();
 
         WindowManager.LayoutParams layoutParams = getLayoutParams();
-        layoutParams.width = BUBBLE_SIZE;
-        layoutParams.height = BUBBLE_SIZE;
+
+        layoutParams.width = BUBBLE_SIZE_PX;
+        layoutParams.height = BUBBLE_SIZE_PX;
 
         TerminalView terminalView = getTerminalView();
         terminalView.setBackgroundResource(R.drawable.round_button);

From 886399565c3868a9015fc93c96484513dcd167fd Mon Sep 17 00:00:00 2001
From: David Kramer <daveskypilot@gmail.com>
Date: Thu, 2 Sep 2021 18:32:24 -0500
Subject: [PATCH 13/27] Fixed: Fix bubble outline being cut off

---
 .../com/termux/window/FloatingBubbleManager.java    | 13 ++++++++++++-
 app/src/main/res/drawable/round_button.xml          |  8 --------
 .../main/res/drawable/round_button_with_outline.xml |  2 +-
 app/src/main/res/values/dimens.xml                  |  4 ++++
 4 files changed, 17 insertions(+), 10 deletions(-)
 delete mode 100644 app/src/main/res/drawable/round_button.xml
 create mode 100644 app/src/main/res/values/dimens.xml

diff --git a/app/src/main/java/com/termux/window/FloatingBubbleManager.java b/app/src/main/java/com/termux/window/FloatingBubbleManager.java
index ed49bf0..ae30b39 100644
--- a/app/src/main/java/com/termux/window/FloatingBubbleManager.java
+++ b/app/src/main/java/com/termux/window/FloatingBubbleManager.java
@@ -1,8 +1,10 @@
 package com.termux.window;
 
+import android.graphics.Outline;
 import android.graphics.drawable.Drawable;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewOutlineProvider;
 import android.view.WindowManager;
 
 import com.termux.shared.view.ViewUtils;
@@ -57,7 +59,15 @@ public void displayAsFloatingBubble() {
         layoutParams.height = BUBBLE_SIZE_PX;
 
         TerminalView terminalView = getTerminalView();
-        terminalView.setBackgroundResource(R.drawable.round_button);
+        final int strokeWidth = (int) terminalView.getResources().getDimension(R.dimen.bubble_outline_stroke_width);
+        terminalView.setOutlineProvider(new ViewOutlineProvider() {
+            @SuppressWarnings("SuspiciousNameCombination")
+            @Override
+            public void getOutline(View view, Outline outline) {
+                // shrink TerminalView clipping a bit so it doesn't cut off our bubble outline
+                outline.setOval(strokeWidth, strokeWidth, view.getWidth() - strokeWidth, view.getHeight() - strokeWidth);
+            }
+        });
         terminalView.setClipToOutline(true);
 
         TermuxFloatView termuxFloatView = getTermuxFloatView();
@@ -82,6 +92,7 @@ public void displayAsFloatingWindow() {
 
         TerminalView terminalView = getTerminalView();
         terminalView.setBackground(mOriginalTerminalViewBackground);
+        terminalView.setOutlineProvider(null);
         terminalView.setClipToOutline(false);
 
         TermuxFloatView termuxFloatView = getTermuxFloatView();
diff --git a/app/src/main/res/drawable/round_button.xml b/app/src/main/res/drawable/round_button.xml
deleted file mode 100644
index c5f59c9..0000000
--- a/app/src/main/res/drawable/round_button.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <solid android:color="@android:color/black" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/round_button_with_outline.xml b/app/src/main/res/drawable/round_button_with_outline.xml
index 0a14446..79b8df4 100644
--- a/app/src/main/res/drawable/round_button_with_outline.xml
+++ b/app/src/main/res/drawable/round_button_with_outline.xml
@@ -4,7 +4,7 @@
         <shape android:shape="oval">
             <solid android:color="@android:color/black" />
             <stroke android:color="@android:color/white"
-                android:width="1dp" />
+                android:width="@dimen/bubble_outline_stroke_width" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..289703c
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="bubble_outline_stroke_width">1dp</dimen>
+</resources>
\ No newline at end of file

From f7c212a5ef7f0312c1b7e55873a9b6a254325ef5 Mon Sep 17 00:00:00 2001
From: David Kramer <daveskypilot@gmail.com>
Date: Fri, 3 Sep 2021 17:33:23 -0500
Subject: [PATCH 14/27] fixed: Use standard size for bubble

---
 app/src/main/java/com/termux/window/FloatingBubbleManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/termux/window/FloatingBubbleManager.java b/app/src/main/java/com/termux/window/FloatingBubbleManager.java
index ae30b39..639e514 100644
--- a/app/src/main/java/com/termux/window/FloatingBubbleManager.java
+++ b/app/src/main/java/com/termux/window/FloatingBubbleManager.java
@@ -15,7 +15,7 @@
  * to its original display.
  */
 public class FloatingBubbleManager {
-    private static final int DEFAULT_BUBBLE_SIZE_DP = 80;
+    private static final int DEFAULT_BUBBLE_SIZE_DP = 56;
 
     private TermuxFloatView mTermuxFloatView;
     private final int BUBBLE_SIZE_PX;

From 534a09815713a877bf41c09cf8e4baf64d1e5a89 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 6 Sep 2021 04:07:15 +0500
Subject: [PATCH 15/27] Changed: Update .gitignore

---
 .gitignore | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 466b131..9da7ecf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,8 @@
 build/
-local.properties
+release/
 .gradle/
 .idea/
-*.iml
\ No newline at end of file
+*.iml
+
+local.properties
+github.properties

From c04d12666538854d70148b3ed6126a8595d72682 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 6 Sep 2021 04:08:05 +0500
Subject: [PATCH 16/27] Changed: Disable shrinkResources and obfuscation for
 testing reproducible builds and maintaining stacktraces of crashes

---
 app/build.gradle       |  2 +-
 app/proguard-rules.pro | 17 +----------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ade2718..14d29ca 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,7 +26,7 @@ android {
     buildTypes {
         release {
             minifyEnabled true
-            shrinkResources true
+            shrinkResources false // Reproducible builds
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
 
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 2e56e60..3ebfa45 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -7,19 +7,4 @@
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html
 
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
+-dontobfuscate

From b0d67158113897a31d8e706bad60555f1f78bae6 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 6 Sep 2021 04:08:41 +0500
Subject: [PATCH 17/27] Changed: Update logger functions

---
 .../java/com/termux/window/TermuxFloatApplication.java | 10 +++++-----
 .../java/com/termux/window/TermuxFloatService.java     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/termux/window/TermuxFloatApplication.java b/app/src/main/java/com/termux/window/TermuxFloatApplication.java
index 524a4c8..c434367 100644
--- a/app/src/main/java/com/termux/window/TermuxFloatApplication.java
+++ b/app/src/main/java/com/termux/window/TermuxFloatApplication.java
@@ -7,8 +7,8 @@
 import com.termux.shared.logger.Logger;
 import com.termux.shared.settings.preferences.TermuxFloatAppSharedPreferences;
 
-
 public class TermuxFloatApplication extends Application {
+
     public void onCreate() {
         super.onCreate();
 
@@ -16,16 +16,16 @@ public void onCreate() {
         TermuxCrashUtils.setCrashHandler(this);
 
         // Set log level for the app
-        setLogLevel(getApplicationContext());
+        setLogLevel(getApplicationContext(), true);
 
         Logger.logDebug("Starting Application");
     }
 
-    public static void setLogLevel(Context context) {
+    public static void setLogLevel(Context context, boolean commitToFile) {
         // Load the log level from shared preferences and set it to the {@link Logger.CURRENT_LOG_LEVEL}
         TermuxFloatAppSharedPreferences preferences = TermuxFloatAppSharedPreferences.build(context);
         if (preferences == null) return;
-        preferences.setLogLevel(null, preferences.getLogLevel(true), true);
+        preferences.setLogLevel(null, preferences.getLogLevel(true), commitToFile);
     }
-}
 
+}
diff --git a/app/src/main/java/com/termux/window/TermuxFloatService.java b/app/src/main/java/com/termux/window/TermuxFloatService.java
index c22b568..58a8bed 100644
--- a/app/src/main/java/com/termux/window/TermuxFloatService.java
+++ b/app/src/main/java/com/termux/window/TermuxFloatService.java
@@ -41,7 +41,7 @@ public IBinder onBind(Intent intent) {
     @Override
     public void onCreate() {
         runStartForeground();
-        TermuxFloatApplication.setLogLevel(this);
+        TermuxFloatApplication.setLogLevel(this, false);
         Logger.logVerbose(LOG_TAG, "onCreate");
     }
 

From 6d7632e02255861c709e2338bfd07e7d487dce95 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 6 Sep 2021 04:11:02 +0500
Subject: [PATCH 18/27] Changed: Include output-metadata.json in debug build
 artifacts

---
 .github/workflows/debug_build.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
index 51940ac..1c49e12 100644
--- a/.github/workflows/debug_build.yml
+++ b/.github/workflows/debug_build.yml
@@ -15,4 +15,6 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: termux-float
-        path: ./app/build/outputs/apk/debug/termux-float-debug.apk
+        path: |
+          ./app/build/outputs/apk/debug/termux-float-debug.apk
+          ./app/build/outputs/apk/debug/output-metadata.json

From 2b9ad06d8ab0d8a5db5cb3c21d93d89ff2eed515 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Mon, 6 Sep 2021 05:13:02 +0500
Subject: [PATCH 19/27] Changed: Bump termux-shared version to use latest
 changes from termux/termux-app@da07826a

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 14d29ca..e4e9729 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -54,8 +54,8 @@ android {
 dependencies {
     implementation 'androidx.annotation:annotation:1.2.0'
 
-    implementation 'com.termux.termux-app:termux-shared:bc779d2ffb'
-    implementation 'com.termux.termux-app:terminal-view:bc779d2ffb'
+    implementation 'com.termux.termux-app:termux-shared:dd952a90ad'
+    implementation 'com.termux.termux-app:terminal-view:dd952a90ad'
 
     // Use if below libraries are published locally by termux-app with `./gradlew publishReleasePublicationToMavenLocal` and used with `mavenLocal()`.
     // If updates are done, republish there and sync project with gradle files here

From df2c94f0860092e4e12b54aaae1ede3d9be247a3 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Thu, 9 Sep 2021 04:46:01 +0500
Subject: [PATCH 20/27] Changed: Bump termux-shared version to use latest
 changes from termux/termux-app@7b10a35f and termux/termux-app@0cf3cef7

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e4e9729..ae676b0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -54,8 +54,8 @@ android {
 dependencies {
     implementation 'androidx.annotation:annotation:1.2.0'
 
-    implementation 'com.termux.termux-app:termux-shared:dd952a90ad'
-    implementation 'com.termux.termux-app:terminal-view:dd952a90ad'
+    implementation 'com.termux.termux-app:termux-shared:9ffcd21ce1'
+    implementation 'com.termux.termux-app:terminal-view:9ffcd21ce1'
 
     // Use if below libraries are published locally by termux-app with `./gradlew publishReleasePublicationToMavenLocal` and used with `mavenLocal()`.
     // If updates are done, republish there and sync project with gradle files here

From 9a49bfce92e78f6fd88c8da22f01eab2961bb416 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Wed, 22 Sep 2021 11:27:52 +0500
Subject: [PATCH 21/27] Update LICENSE.md

---
 LICENSE.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/LICENSE.md b/LICENSE.md
index 7e951d4..a1639fe 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,3 +1,5 @@
-Released under [the GPLv3 license](https://www.gnu.org/licenses/gpl.html).
+The `termux/termux-float` repository is released under [GPLv3 only](https://www.gnu.org/licenses/gpl-3.0.html) license.
 
-Contains code from `Terminal Emulator for Android` by which is released under [the Apache License 2.0](https://www.apache.org/licenses/).
+### Exceptions
+
+- [Terminal Emulator for Android](https://github.com/jackpal/Android-Terminal-Emulator) code is used which is released under [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). Check [`terminal-view`](https://github.com/termux/termux-app/tree/master/terminal-view) and [`terminal-emulator`](https://github.com/termux/termux-app/tree/master/terminal-emulator) libraries.

From 56af0d42cd6f7a0b78028c3ef5b87930af10e958 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 1 Jan 2022 02:03:24 +0500
Subject: [PATCH 22/27] Changed: Bump termux-shared to vfcc0d36258

---
 app/build.gradle | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ae676b0..898d576 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -54,11 +54,12 @@ android {
 dependencies {
     implementation 'androidx.annotation:annotation:1.2.0'
 
-    implementation 'com.termux.termux-app:termux-shared:9ffcd21ce1'
-    implementation 'com.termux.termux-app:terminal-view:9ffcd21ce1'
+    implementation 'com.termux.termux-app:termux-shared:fcc0d36258'
+    implementation 'com.termux.termux-app:terminal-view:fcc0d36258'
 
     // Use if below libraries are published locally by termux-app with `./gradlew publishReleasePublicationToMavenLocal` and used with `mavenLocal()`.
     // If updates are done, republish there and sync project with gradle files here
+    // https://github.com/termux/termux-app/wiki/Termux-Libraries
     //implementation 'com.termux:termux-shared:0.117'
     //implementation 'com.termux:terminal-view:0.117'
 

From 6950e8be327347b66dd803a071cca5312537592b Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 8 Jan 2022 00:48:49 +0500
Subject: [PATCH 23/27] Changed: Move to semantic versioning for app version
 and add commit hash and `github` to APK file names

The `versionName` will now follow semantic version `2.0.0` spec in the format `major.minor.patch(-prerelease)(+buildmetadata)`. This will make versioning the prerelease and github debug builds versions easier and follow a spec. The @termux devs should make sure that when bumping `versionName` in `build.gradle` file and when creating a tag for new releases on github that they include the patch number as well, like `v0.1.0` instead of just `v0.1`. The `build.gradle` file and `attach_debug_apks_to_release` workflow will now validate the version as well and the build/attachment will fail if `versionName` does not follow the spec. https://semver.org/spec/v2.0.0.html

APKs released on github for debug build workflows and releases are now referred as `Github` releases as per termux/termux-app@7b10a35f and termux/termux-app@94e01d68, so APK filenames have been modified to include `github` in the filename. The APKs are still debuggable, so that tag remains too.

For github workflows the apk filename format will be `termux-float_<current_version>+<last_commit_hash>-github-debug_<arch>.apk`, like `termux-float_v0.1.0+xxxxxxxx-github-debug_arm64-v8a.apk` and for github releases it will be `termux-float_<release_version>+github-debug_<arch>.apk`, like `termux-float_v0.1+github-debug_arm64-v8a.apk`. The `last_commit_hash` will be the first `8` characters of the commit hash. The `<last_commit_hash>-github-debug` will act as `buildmetadata` and will not affect versioning precedence.

For github workflows triggered by `push` and `pull_request` triggers, `<current_version>+<last_commit_hash>` will be used as new `versionName`, like `v0.1.0+xxxxxxxx`. This will make tracking which build a user is using easier and help in resolving issues as well.

The `app/build.gradle` now also supports following `TERMUX_FLOAT_` scoped environmental variables and `RELEASE_TAG` variable will not be used anymore since it may conflict with possibly other variables used by users.

- `TERMUX_FLOAT_APP_VERSION_NAME` will be used as `versionName` if its set.
- `TERMUX_FLOAT_APK_VERSION_TAG` will be used as `termux-float_<TERMUX_FLOAT_APK_VERSION_TAG>.apk` if its set.
---
 .../workflows/attach_debug_apk_to_release.yml | 64 +++++++++++++++++
 .../attach_debug_apks_to_release.yml          | 32 ---------
 .github/workflows/debug_build.yml             | 72 +++++++++++++++----
 app/build.gradle                              | 26 +++++--
 4 files changed, 143 insertions(+), 51 deletions(-)
 create mode 100644 .github/workflows/attach_debug_apk_to_release.yml
 delete mode 100644 .github/workflows/attach_debug_apks_to_release.yml

diff --git a/.github/workflows/attach_debug_apk_to_release.yml b/.github/workflows/attach_debug_apk_to_release.yml
new file mode 100644
index 0000000..2a42147
--- /dev/null
+++ b/.github/workflows/attach_debug_apk_to_release.yml
@@ -0,0 +1,64 @@
+name: Attach Debug APK To Release
+
+on:
+  release:
+    types:
+      - published
+
+jobs:
+  attach-apks:
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ env.GITHUB_REF }}
+
+      - name: Build and attach APK to release
+        shell: bash {0}
+        run: |
+          exit_on_error() {
+              echo "$1"
+              echo "Deleting '$RELEASE_VERSION_NAME' release and '$GITHUB_REF' tag"
+              hub release delete "$RELEASE_VERSION_NAME"
+              git push --delete origin "$GITHUB_REF"
+              exit 1
+          }
+
+          echo "Setting vars"
+          RELEASE_VERSION_NAME="${GITHUB_REF/refs\/tags\//}"
+          if ! printf "%s" "${RELEASE_VERSION_NAME/v/}" | grep -qP '^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$'; then
+            exit_on_error "The versionName '${RELEASE_VERSION_NAME/v/}' is not a valid version as per semantic version '2.0.0' spec in the format 'major.minor.patch(-prerelease)(+buildmetadata)'. https://semver.org/spec/v2.0.0.html."
+          fi
+
+          APK_DIR_PATH="./app/build/outputs/apk/debug"
+          APK_VERSION_TAG="$RELEASE_VERSION_NAME+github-debug"
+          APK_BASENAME_PREFIX="termux-float_$APK_VERSION_TAG"
+
+          echo "Building APK for '$RELEASE_VERSION_NAME' release"
+          export TERMUX_FLOAT_APK_VERSION_TAG="$APK_VERSION_TAG" # Used by app/build.gradle
+          if ! ./gradlew assembleDebug; then
+            exit_on_error "Build failed for '$RELEASE_VERSION_NAME' release."
+          fi
+
+          echo "Validating APK"
+          if ! test -f "$APK_DIR_PATH/${APK_BASENAME_PREFIX}.apk"; then
+            files_found="$(ls "$APK_DIR_PATH")"
+            exit_on_error "Failed to find built APK at '$APK_DIR_PATH/${APK_BASENAME_PREFIX}.apk'. Files found: "$'\n'"$files_found"
+          fi
+
+          echo "Generating sha25sums file"
+          if ! (cd "$APK_DIR_PATH"; sha256sum "${APK_BASENAME_PREFIX}.apk" > sha256sums); then
+            exit_on_error "Generate sha25sums failed for '$RELEASE_VERSION_NAME' release."
+          fi
+
+          echo "Attaching APK to github release"
+          if ! hub release edit \
+          -m "" \
+          -a "$APK_DIR_PATH/${APK_BASENAME_PREFIX}.apk" \
+          -a "$APK_DIR_PATH/sha256sums" \
+          "$RELEASE_VERSION_NAME"; then
+            exit_on_error "Attach APK to release failed for '$RELEASE_VERSION_NAME' release."
+          fi
diff --git a/.github/workflows/attach_debug_apks_to_release.yml b/.github/workflows/attach_debug_apks_to_release.yml
deleted file mode 100644
index 156cc94..0000000
--- a/.github/workflows/attach_debug_apks_to_release.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: Attach Debug APKs To Release
-
-on:
-  release:
-    types:
-      - published
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    env:
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - name: Set tag
-        id: vars
-        run: echo ::set-output name=tag::${GITHUB_REF/refs\/tags\//}
-      - name: Clone repository
-        uses: actions/checkout@v2
-        with:
-          ref: ${{ env.GITHUB_REF }}
-      - name: Build
-        env:
-          RELEASE_TAG: ${{ steps.vars.outputs.tag }}
-        run: ./gradlew assembleDebug
-      - name: Attach debug APKs to release
-        env:
-          RELEASE_TAG: ${{ steps.vars.outputs.tag }}
-        run: >-
-          hub release edit
-          -m ""
-          -a ./app/build/outputs/apk/debug/termux-float-$RELEASE_TAG-debug.apk
-          $RELEASE_TAG
diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml
index 1c49e12..88fe227 100644
--- a/.github/workflows/debug_build.yml
+++ b/.github/workflows/debug_build.yml
@@ -1,20 +1,66 @@
 name: Build
 
-on: push
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - name: Clone repository
-      uses: actions/checkout@v2
-    - name: Build
-      run: |
-        ./gradlew assembleDebug
-    - name: Store generated APK file
-      uses: actions/upload-artifact@v2
-      with:
-        name: termux-float
-        path: |
-          ./app/build/outputs/apk/debug/termux-float-debug.apk
-          ./app/build/outputs/apk/debug/output-metadata.json
+      - name: Clone repository
+        uses: actions/checkout@v2
+
+      - name: Build APK
+        shell: bash {0}
+        run: |
+          exit_on_error() { echo "$1"; exit 1; }
+
+          echo "Setting vars"
+          # Set RELEASE_VERSION_NAME to "<CURRENT_VERSION_NAME>+<last_commit_hash>"
+          CURRENT_VERSION_NAME_REGEX='\s+versionName "([^"]+)"$'
+          CURRENT_VERSION_NAME="$(grep -m 1 -E "$CURRENT_VERSION_NAME_REGEX" ./app/build.gradle | sed -r "s/$CURRENT_VERSION_NAME_REGEX/\1/")"
+          RELEASE_VERSION_NAME="v$CURRENT_VERSION_NAME+${GITHUB_SHA:0:7}" # The "+" is necessary so that versioning precedence is not affected
+          if ! printf "%s" "${RELEASE_VERSION_NAME/v/}" | grep -qP '^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$'; then
+            exit_on_error "The versionName '${RELEASE_VERSION_NAME/v/}' is not a valid version as per semantic version '2.0.0' spec in the format 'major.minor.patch(-prerelease)(+buildmetadata)'. https://semver.org/spec/v2.0.0.html."
+          fi
+
+          APK_DIR_PATH="./app/build/outputs/apk/debug"
+          APK_VERSION_TAG="$RELEASE_VERSION_NAME-github-debug" # Note the "-", GITHUB_SHA will already have "+" before it
+          APK_BASENAME_PREFIX="termux-float_$APK_VERSION_TAG"
+
+          # Used by attachment steps later
+          echo "APK_DIR_PATH=$APK_DIR_PATH" >> $GITHUB_ENV
+          echo "APK_VERSION_TAG=$APK_VERSION_TAG" >> $GITHUB_ENV
+          echo "APK_BASENAME_PREFIX=$APK_BASENAME_PREFIX" >> $GITHUB_ENV
+
+          echo "Building APK for '$RELEASE_VERSION_NAME' build"
+          export TERMUX_FLOAT_APP_VERSION_NAME="${RELEASE_VERSION_NAME/v/}" # Used by app/build.gradle
+          export TERMUX_FLOAT_APK_VERSION_TAG="$APK_VERSION_TAG" # Used by app/build.gradle
+          if ! ./gradlew assembleDebug; then
+            exit_on_error "Build failed for '$RELEASE_VERSION_NAME' build."
+          fi
+
+          echo "Validating APK"
+          if ! test -f "$APK_DIR_PATH/${APK_BASENAME_PREFIX}.apk"; then
+            files_found="$(ls "$APK_DIR_PATH")"
+            exit_on_error "Failed to find built APK at '$APK_DIR_PATH/${APK_BASENAME_PREFIX}.apk'. Files found: "$'\n'"$files_found"
+          fi
+
+          echo "Generating sha25sums file"
+          if ! (cd "$APK_DIR_PATH"; sha256sum "${APK_BASENAME_PREFIX}.apk" > sha256sums); then
+            exit_on_error "Generate sha25sums failed for '$RELEASE_VERSION_NAME' release."
+          fi
+
+      - name: Attach files
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ env.APK_BASENAME_PREFIX }}
+          path: |
+            ${{ env.APK_DIR_PATH }}/${{ env.APK_BASENAME_PREFIX }}.apk
+            ${{ env.APK_DIR_PATH }}/sha256sums
+            ${{ env.APK_DIR_PATH }}/output-metadata.json
diff --git a/app/build.gradle b/app/build.gradle
index 898d576..1e58abe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,12 +2,18 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion project.properties.compileSdkVersion.toInteger()
+    def appVersionName = System.getenv("TERMUX_FLOAT_APP_VERSION_NAME") ?: ""
+    def apkVersionTag = System.getenv("TERMUX_FLOAT_APK_VERSION_TAG") ?: ""
+
     defaultConfig {
         applicationId "com.termux.window"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
         versionCode 14
-        versionName "0.14"
+        versionName "0.14.0"
+
+        if (appVersionName) versionName = appVersionName
+        validateVersionName(versionName)
 
         manifestPlaceholders.TERMUX_PACKAGE_NAME = "com.termux"
         manifestPlaceholders.TERMUX_APP_NAME = "Termux"
@@ -44,8 +50,9 @@ android {
     applicationVariants.all { variant ->
         variant.outputs.all { output ->
             if (variant.buildType.name == "debug") {
-                def releaseTag = System.getenv("RELEASE_TAG")
-                outputFileName = new File("termux-float" + (releaseTag ? "-" + releaseTag : "") + "-debug.apk")
+                outputFileName = new File("termux-float_" + (apkVersionTag ? apkVersionTag : "debug") + ".apk")
+            } else if (variant.buildType.name == "release") {
+                outputFileName = new File("termux-float_" + (apkVersionTag ? apkVersionTag : "release") + ".apk")
             }
         }
     }
@@ -67,7 +74,14 @@ dependencies {
 }
 
 task versionName {
-  doLast {
-    print android.defaultConfig.versionName
-  }
+    doLast {
+        print android.defaultConfig.versionName
+    }
+}
+
+def validateVersionName(String versionName) {
+    // https://semver.org/spec/v2.0.0.html#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
+    // ^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$
+    if (!java.util.regex.Pattern.matches("^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?\$", versionName))
+        throw new GradleException("The versionName '" + versionName + "' is not a valid version as per semantic version '2.0.0' spec in the format 'major.minor.patch(-prerelease)(+buildmetadata)'. https://semver.org/spec/v2.0.0.html.")
 }

From 31b902572d972e7e8957f6f6c4dedb36f3f018a1 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 8 Jan 2022 00:54:06 +0500
Subject: [PATCH 24/27] Changed: Bump dependency versions

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1e58abe..539880c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -59,7 +59,7 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.annotation:annotation:1.2.0'
+    implementation 'androidx.annotation:annotation:1.3.0'
 
     implementation 'com.termux.termux-app:termux-shared:fcc0d36258'
     implementation 'com.termux.termux-app:terminal-view:fcc0d36258'

From 8f3a664859363ad52e955c0ab542a89d615942c8 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 8 Jan 2022 00:56:40 +0500
Subject: [PATCH 25/27] Changed: Rename setLogLevel() to setLogConfig()

---
 .../java/com/termux/window/TermuxFloatApplication.java   | 9 ++++++---
 .../main/java/com/termux/window/TermuxFloatService.java  | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/termux/window/TermuxFloatApplication.java b/app/src/main/java/com/termux/window/TermuxFloatApplication.java
index c434367..8910191 100644
--- a/app/src/main/java/com/termux/window/TermuxFloatApplication.java
+++ b/app/src/main/java/com/termux/window/TermuxFloatApplication.java
@@ -6,6 +6,7 @@
 import com.termux.shared.crash.TermuxCrashUtils;
 import com.termux.shared.logger.Logger;
 import com.termux.shared.settings.preferences.TermuxFloatAppSharedPreferences;
+import com.termux.shared.termux.TermuxConstants;
 
 public class TermuxFloatApplication extends Application {
 
@@ -15,13 +16,15 @@ public void onCreate() {
         // Set crash handler for the app
         TermuxCrashUtils.setCrashHandler(this);
 
-        // Set log level for the app
-        setLogLevel(getApplicationContext(), true);
+        // Set log config for the app
+        setLogConfig(getApplicationContext(), true);
 
         Logger.logDebug("Starting Application");
     }
 
-    public static void setLogLevel(Context context, boolean commitToFile) {
+    public static void setLogConfig(Context context, boolean commitToFile) {
+        //Logger.setDefaultLogTag(TermuxConstants.TERMUX_FLOAT_APP_NAME);
+
         // Load the log level from shared preferences and set it to the {@link Logger.CURRENT_LOG_LEVEL}
         TermuxFloatAppSharedPreferences preferences = TermuxFloatAppSharedPreferences.build(context);
         if (preferences == null) return;
diff --git a/app/src/main/java/com/termux/window/TermuxFloatService.java b/app/src/main/java/com/termux/window/TermuxFloatService.java
index 58a8bed..416c397 100644
--- a/app/src/main/java/com/termux/window/TermuxFloatService.java
+++ b/app/src/main/java/com/termux/window/TermuxFloatService.java
@@ -41,7 +41,7 @@ public IBinder onBind(Intent intent) {
     @Override
     public void onCreate() {
         runStartForeground();
-        TermuxFloatApplication.setLogLevel(this, false);
+        TermuxFloatApplication.setLogConfig(this, false);
         Logger.logVerbose(LOG_TAG, "onCreate");
     }
 

From b5a4020dae8692278506dc1c999774ff6db494b9 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 8 Jan 2022 01:01:02 +0500
Subject: [PATCH 26/27] Docs: Update README.md

---
 README.md | 99 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 85 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 036f3bc..7f6b5da 100644
--- a/README.md
+++ b/README.md
@@ -3,22 +3,93 @@
 [![Build status](https://github.com/termux/termux-float/workflows/Build/badge.svg)](https://github.com/termux/termux-float/actions)
 [![Join the chat at https://gitter.im/termux/termux](https://badges.gitter.im/termux/termux.svg)](https://gitter.im/termux/termux)
 
-A [Termux](https://termux.com/) add-on app to show the terminal in a floating
-terminal window.
+A [Termux] plugin app to show the terminal in a floating terminal window.
+##
 
-When developing (or packaging), note that this app needs to be signed with the
-same key as the main Termux app in order to have the permission to modify the
-required font or color files.
 
-## Installation
 
-Termux:Float application can be obtained from [F-Droid](https://f-droid.org/en/packages/com.termux.window/).
+### Contents
+- [Installation](#Installation)
+- [Terminal and App Settings](#Terminal-and-App-Settings)
+- [Debugging](#Debugging)
+- [Worthy Of Note](#Worthy-Of-Note)
+- [For Maintainers and Contributors](#For-Maintainers-and-Contributors)
+- [Forking](#Forking)
+##
 
-Additionally we provide per-commit debug builds for those who want to try
-out the latest features or test their pull request. This build can be obtained
-from one of the workflow runs listed on [Github Actions](https://github.com/termux/termux-float/actions)
-page.
 
-Signature keys of all offered builds are different. Before you switch the
-installation source, you will have to uninstall the Termux application and
-all currently installed plugins.
+
+### Installation
+
+Latest version is `v0.14.0`.
+
+**Check [`termux-app` Installation](https://github.com/termux/termux-app#Installation) for details before reading forward.**
+
+### F-Droid
+
+`Termux:Float` application can be obtained from `F-Droid` from [here](https://f-droid.org/en/packages/com.termux.window).
+
+You **do not** need to download the `F-Droid` app (via the `Download F-Droid` link) to install `Termux:Float`. You can download the `Termux:Float` APK directly from the site by clicking the `Download APK` link at the bottom of each version section.
+
+It usually takes a few days (or even a week or more) for updates to be available on `F-Droid` once an update has been released on `Github`. The `F-Droid` releases are built and published by `F-Droid` once they [detect](https://gitlab.com/fdroid/fdroiddata/-/blob/master/metadata/com.termux.yml) a new `Github` release. The Termux maintainers **do not** have any control over the building and publishing of the Termux apps on `F-Droid`. Moreover, the Termux maintainers also do not have access to the APK signing keys of `F-Droid` releases, so we cannot release an APK ourselves on `Github` that would be compatible with `F-Droid` releases.
+
+The `F-Droid` app often may not notify you of updates and you will manually have to do a pull down swipe action in the `Updates` tab of the app for it to check updates. Make sure battery optimizations are disabled for the app, check https://dontkillmyapp.com/ for details on how to do that.
+
+### Github
+
+`Termux:Float` application can be obtained on `Github` either from [`Github Releases`](https://github.com/termux/termux-float/releases) for version `>= 0.15.0` or from [`Github Build`](https://github.com/termux/termux-float/actions/workflows/debug_build.yml) action workflows.
+
+The APKs for `Github Releases` will be listed under `Assets` drop-down of a release. These are automatically attached when a new version is released.
+
+The APKs for `Github Build` action workflows will be listed under `Artifacts` section of a workflow run. These are created for each commit/push done to the repository and can be used by users who don't want to wait for releases and want to try out the latest features immediately or want to test their pull requests. Note that for action workflows, you need to be [**logged into a `Github` account**](https://github.com/login) for the `Artifacts` links to be enabled/clickable. If you are using the [`Github` app](https://github.com/mobile), then make sure to open workflow link in a browser like Chrome or Firefox that has your Github account logged in since the in-app browser may not be logged in.
+
+The APKs for both of these are [`debuggable`](https://developer.android.com/studio/debug) and are compatible with each other but they are not compatible with other sources.
+##
+
+
+
+### Terminal and App Settings
+
+The `Termux:Float` app supports defining various settings in `~/.termux/termux.float.properties` file like the `Termux` app does in `~/.termux/termux.properties` file for version `>= 0.15.0`. Currently, only the following properties are supported: `enforce-char-based-input`, `ctrl-space-workaround`, `bell-character`, `terminal-cursor-style`, `terminal-transcript-rows`, `back-key`, `default-working-directory`, `volume-keys`. Check [Terminal Settings](https://wiki.termux.com/wiki/Terminal_Settings) for more info. The `~/` is a shortcut for the Termux home directory `/data/data/com.termux/files/home/` and can also be referred by the `$HOME` shell environment variable.
+
+You can create/edit it by running the below commands to open the `nano` text editor in the terminal. Press `Ctrl+o` and then `Enter` to save and `Ctrl+x` to exit. You can also edit it with a [SAF file browser](https://github.com/termux/termux-tasker#Creating-And-Modifying-Scripts) after creating it.
+
+```
+mkdir -p ~/.termux
+nano ~/.termux/termux.float.properties
+```
+
+##
+
+
+
+### Debugging
+
+You can help debug problems by setting appropriate `logcat` `Log Level` in `Termux` app settings -> `Termux:Float` -> `Debugging` -> `Log Level` (Requires `Termux` app version `>= 0.118.0`). The `Log Level` defaults to `Normal` and log level `Verbose` currently logs additional information. Its best to revert log level to `Normal` after you have finished debugging since private data may otherwise be passed to `logcat` during normal operation and moreover, additional logging increases execution time.
+
+Once log levels have been set, you can run the `logcat` command in `Termux` or `Termux:Float` app terminal to view the logs in realtime (`Ctrl+c` to stop) or use `logcat -d` to take a dump of the log. You can also view the logs from a PC over `ADB`. For more information, check official android `logcat` guide [here](https://developer.android.com/studio/command-line/logcat).
+
+##### Log Levels
+- `Off` - Log nothing
+- `Normal` - Start logging error, warn and info messages and stacktraces
+- `Debug` - Start logging debug messages
+- `Verbose` - Start logging verbose messages
+##
+
+
+
+## For Maintainers and Contributors
+
+Check [For Maintainers and Contributors](https://github.com/termux/termux-app#For-Maintainers-and-Contributors) section of `termux/termux-app` `README` for details.
+##
+
+
+
+## Forking
+
+Check [Forking](https://github.com/termux/termux-app#Forking) section of `termux/termux-app` `README` for details.
+##
+
+
+
+[Termux]: https://termux.com

From ef5ba3881d9f4c160539b102caaa849e70391e29 Mon Sep 17 00:00:00 2001
From: agnostic-apollo <agnosticapollo@gmail.com>
Date: Sat, 8 Jan 2022 01:04:47 +0500
Subject: [PATCH 27/27] Changed: Bump to v0.15.0

---
 README.md        | 2 +-
 app/build.gradle | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 7f6b5da..10a77f1 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ A [Termux] plugin app to show the terminal in a floating terminal window.
 
 ### Installation
 
-Latest version is `v0.14.0`.
+Latest version is `v0.15.0`.
 
 **Check [`termux-app` Installation](https://github.com/termux/termux-app#Installation) for details before reading forward.**
 
diff --git a/app/build.gradle b/app/build.gradle
index 539880c..e5ae623 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.termux.window"
         minSdkVersion project.properties.minSdkVersion.toInteger()
         targetSdkVersion project.properties.targetSdkVersion.toInteger()
-        versionCode 14
-        versionName "0.14.0"
+        versionCode 15
+        versionName "0.15.0"
 
         if (appVersionName) versionName = appVersionName
         validateVersionName(versionName)