[pull] master from termux:master

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+- package-ecosystem: github-actions
+  directory: /
+  schedule:
+    interval: daily

.github/workflows/github_action_build.yml

@@ -0,0 +1,80 @@
+name: GitHub Action Build
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+  schedule:
+    - cron: "15 0 1 */2 *"
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v4
+
+      - name: Build
+        shell: bash {0}
+        run: |
+          exit_on_error() { echo "$1"; exit 1; }
+
+          if [ -z "$JAVA_HOME_17_X64" ] || [ ! -f "$JAVA_HOME_17_X64/bin/javac" ] || [ ! -x "$JAVA_HOME_17_X64/bin/javac" ]; then
+              exit_on_error "jdk-17 binary not found at path '$JAVA_HOME_17_X64/bin/javac' or is not executable."
+          fi
+
+          echo "Setting vars"
+
+          if [ "$GITHUB_EVENT_NAME" == "pull_request" ]; then
+              GITHUB_SHA="${{ github.event.pull_request.head.sha }}" # Do not use last merge commit set in GITHUB_SHA
+          fi
+
+          # 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 release version '${RELEASE_VERSION_NAME/v/}' generated from current version '$CURRENT_VERSION_NAME' 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-styling-app_$APK_VERSION_TAG"
+
+          # Used by upload step 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 file for '$RELEASE_VERSION_NAME' release with '$APK_VERSION_TAG' tag"
+          export TERMUX_STYLING_APP_BUILD__APP_VERSION_NAME="${RELEASE_VERSION_NAME/v/}" # Used by app/build.gradle
+          export TERMUX_STYLING_APP_BUILD__APK_VERSION_TAG="$APK_VERSION_TAG" # Used by app/build.gradle
+          export GRADLE_OPTS="-Dorg.gradle.java.home=$JAVA_HOME_17_X64"
+          if ! ./gradlew assembleDebug; then
+            exit_on_error "Build failed for '$RELEASE_VERSION_NAME' release with '$APK_VERSION_TAG' tag."
+          fi
+
+          echo "Validating APK file"
+          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 file at '$APK_DIR_PATH/${APK_BASENAME_PREFIX}.apk'. Files found: "$'\n'"$files_found"
+          fi
+
+          echo "Generating checksums-sha256.txt file"
+          if ! (cd "$APK_DIR_PATH"; sha256sum "${APK_BASENAME_PREFIX}.apk" > checksums-sha256.txt); then
+            exit_on_error "Generate checksums-sha256.txt file failed for '$RELEASE_VERSION_NAME' release."
+          fi
+          echo "checksums-sha256.txt:"$'\n```\n'"$(cat "$APK_DIR_PATH/checksums-sha256.txt")"$'\n```'
+
+      - name: Upload files to action
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.APK_BASENAME_PREFIX }}
+          path: |
+            ${{ env.APK_DIR_PATH }}/${{ env.APK_BASENAME_PREFIX }}.apk
+            ${{ env.APK_DIR_PATH }}/checksums-sha256.txt
+            ${{ env.APK_DIR_PATH }}/output-metadata.json

.github/workflows/github_release_build.yml

@@ -0,0 +1,69 @@
+name: GitHub Release Build
+
+on:
+  release:
+    types:
+      - published
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.GITHUB_REF }}
+
+      - name: Build and upload files 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
+          }
+
+          if [ -z "$JAVA_HOME_17_X64" ] || [ ! -f "$JAVA_HOME_17_X64/bin/javac" ] || [ ! -x "$JAVA_HOME_17_X64/bin/javac" ]; then
+              exit_on_error "jdk-17 binary not found at path '$JAVA_HOME_17_X64/bin/javac' or is not executable."
+          fi
+
+          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 release version '${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-styling-app_$APK_VERSION_TAG"
+
+          echo "Building APK file for '$RELEASE_VERSION_NAME' release with '$APK_VERSION_TAG' tag"
+          export TERMUX_STYLING_APP_BUILD__APK_VERSION_TAG="$APK_VERSION_TAG" # Used by app/build.gradle
+          export GRADLE_OPTS="-Dorg.gradle.java.home=$JAVA_HOME_17_X64"
+          if ! ./gradlew assembleDebug; then
+            exit_on_error "Build failed for '$RELEASE_VERSION_NAME' release with '$APK_VERSION_TAG' tag."
+          fi
+
+          echo "Validating APK file"
+          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 file at '$APK_DIR_PATH/${APK_BASENAME_PREFIX}.apk'. Files found: "$'\n'"$files_found"
+          fi
+
+          echo "Generating checksums-sha256.txt file"
+          if ! (cd "$APK_DIR_PATH"; sha256sum "${APK_BASENAME_PREFIX}.apk" > checksums-sha256.txt); then
+            exit_on_error "Generate checksums-sha256.txt file failed for '$RELEASE_VERSION_NAME' release."
+          fi
+          echo "checksums-sha256.txt:"$'\n```\n'"$(cat "$APK_DIR_PATH/checksums-sha256.txt")"$'\n```'
+
+          echo "Uploading files to release"
+          if ! gh release upload "$RELEASE_VERSION_NAME" \
+            "$APK_DIR_PATH/${APK_BASENAME_PREFIX}.apk" \
+            "$APK_DIR_PATH/checksums-sha256.txt" \
+          ; then
+            exit_on_error "Upload files to release failed for '$RELEASE_VERSION_NAME' release."
+          fi

.github/workflows/nerd-font-setup.yml

@@ -0,0 +1,17 @@
+name: Check Nerd Fonts 
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Downloads nerd fonts
+      run: ./setup-nerd-fonts.sh

.gitignore

@@ -31,4 +31,8 @@ local.properties
 ehthumbs.db
 Thumbs.db
 
+# Vim files
+*.swo
+*.swp
+
 /tmp/

LICENSE.md

@@ -0,0 +1 @@
+The `termux/termux-styling` repository is released under [GPLv3 only](https://www.gnu.org/licenses/gpl-3.0.html) license.

README.md

@@ -3,7 +3,7 @@
 [![Build status](https://github.com/termux/termux-styling/workflows/Build/badge.svg)](https://github.com/termux/termux-styling/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 customize the terminal font and
+A [Termux](https://termux.org) add-on app to customize the terminal font and
 color theme.
 
 When developing (or packaging), note that this app needs to be signed with the
@@ -12,28 +12,20 @@ required font or color files.
 
 ## Installation
 
-Termux:Styling application can be obtained from:
-
-- [Google Play](https://play.google.com/store/apps/details?id=com.termux.styling)
-- [F-Droid](https://f-droid.org/en/packages/com.termux.styling/)
-- [Kali Nethunter Store](https://store.nethunter.com/en/packages/com.termux.styling/)
+Termux:Styling application can be obtained from [F-Droid](https://f-droid.org/en/packages/com.termux.styling/).
 
 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-styling/actions)
+from one of the workflow runs listed on [Github Actions](https://github.com/termux/termux-styling/actions/workflows/github_action_build.yml?query=branch%3Amaster+event%3Apush)
 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.
+all currently installed plugins. Check https://github.com/termux/termux-app#Installation for more info.
 
 ## How to use
 
 1. When inside Termux, long press anywhere on the terminal.
 2. Select `More...` in the resulting dialog.
 3. Select `Style` in the next dialog.
 4. Click either `CHOOSE COLOR` or `CHOOSE FONT` depending on what you want to customize.
-
-## License
-
-Released under the [GPLv3 license](http://www.gnu.org/licenses/gpl-3.0.en.html).

SECURITY.md

@@ -0,0 +1 @@
+Check https://termux.dev/security for info on Termux security policies and how to report vulnerabilities.

app/build.gradle

@@ -4,19 +4,27 @@ plugins {
 }
 
 android {
-    compileSdkVersion 28
+    namespace "com.termux.styling"
+
+    compileSdk project.properties.compileSdkVersion.toInteger()
+
+    def appVersionName = System.getenv("TERMUX_STYLING_APP_BUILD__APP_VERSION_NAME") ?: ""
+    def apkVersionTag = System.getenv("TERMUX_STYLING_APP_BUILD__APK_VERSION_TAG") ?: ""
 
      defaultConfig {
         applicationId "com.termux.styling"
-        minSdkVersion 21
-        targetSdkVersion 28
-        versionCode 27
-        versionName "0.27"
+        minSdk project.properties.minSdkVersion.toInteger()
+        targetSdk project.properties.targetSdkVersion.toInteger()
+        versionCode 1000
+        versionName "0.32.1"
+
+        if (appVersionName) versionName = appVersionName
+        validateVersionName(versionName)
     }
 
     signingConfigs {
         debug {
-            storeFile file('dev_keystore.jks')
+            storeFile file('testkey_untrusted.jks')
             keyAlias 'alias'
             storePassword 'xrj45yWGLbsO7W0v'
             keyPassword 'xrj45yWGLbsO7W0v'
@@ -34,14 +42,37 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = '11'
+    }
+
+    applicationVariants.all { variant ->
+        variant.outputs.all { output ->
+            outputFileName = new File("termux-styling-app_" +
+                    (apkVersionTag ? apkVersionTag : "v" + versionName + "+" + variant.buildType.name) + ".apk")
+        }
+    }
 }
 
 dependencies {
-    implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
 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.")
 }

app/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.termux.styling"
     android:sharedUserId="com.termux" >
 
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />

app/src/main/assets/colors/base16-snazzy.properties

@@ -0,0 +1,30 @@
+# Base16 Snazzy
+# Based on https://github.com/aaron-williamson/base16-alacritty/blob/025688c7158eb8a3421cb2b3612e77915dce8c2a/colors/base16-snazzy-256.yml
+foreground=#e2e4e5
+background=#282a36
+cursor=#e2e4e5
+
+color0=#282a36
+color1=#ff5c57
+color2=#5af78e
+color3=#f3f99d
+color4=#57c7ff
+color5=#ff6ac1
+color6=#9aedfe
+color7=#e2e4e5
+
+color8=#78787e
+color9=#ff5c57
+color10=#5af78e
+color11=#f3f99d
+color12=#57c7ff
+color13=#ff6ac1
+color14=#9aedfe
+color15=#f1f1f0
+
+color16=#ff9f43
+color17=#b2643c
+color18=#34353e
+color19=#43454f
+color20=#a5a5a9
+color21=#eff0eb

app/src/main/assets/colors/catppuccin-frappe.properties

@@ -0,0 +1,25 @@
+# https://github.com/catppuccin/catppuccin
+foreground=#c6d0f5
+background=#303446
+cursor=#f2d5cf
+
+color0=#51576d
+color1=#e78284
+color2=#a6d189
+color3=#e5c890
+color4=#8caaee
+color5=#f4b8e4
+color6=#81c8be
+color7=#b5bfe2
+
+color8=#626880
+color9=#e78284
+color10=#a6d189
+color11=#e5c890
+color12=#8caaee
+color13=#f4b8e4
+color14=#81c8be
+color15=#a5adce
+
+color16=#ef9f76
+color17=#f2d5cf

app/src/main/assets/colors/catppuccin-frappe.txt

@@ -0,0 +1 @@
+catppuccin.txt