Merge pull request #1289 from keymapperorg/develop

Merge release 2.6.1 into master

.editorconfig

@@ -0,0 +1,4 @@
+[*.{kt,kts}]
+ktlint_function_naming_ignore_when_annotated_with = Composable
+ktlint_ignore_back_ticked_identifier = true
+ktlint_code_style = intellij_idea # Use IntelliJ style because it has trailing commas

.github/workflows/crowdin-actions.yml

@@ -0,0 +1,40 @@
+name: Crowdin Action
+
+on:
+  push:
+#    paths: [ 'app/src/main/res/values**', 'fastlane/metadata' ]
+    branches:
+      - 'develop'
+
+concurrency:
+  group: ${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  synchronize-with-crowdin:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: crowdin action
+        uses: crowdin/github-action@v2
+        with:
+          upload_sources: true
+          upload_translations: false
+          download_translations: true
+          localization_branch_name: l10n/develop
+          create_pull_request: true
+          pull_request_title: 'New Crowdin Translations'
+          pull_request_body: 'New Crowdin translations by [Crowdin GH Action](https://github.com/crowdin/github-action)'
+          pull_request_base_branch_name: 'develop'
+        env:
+          # A classic GitHub Personal Access Token with the 'repo' scope selected (the user should have write access to the repository).
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+          # A numeric ID, found at https://crowdin.com/project/<projectName>/tools/api
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+
+          # Visit https://crowdin.com/settings#api-key to create this token
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.github/workflows/production.yml

@@ -40,7 +40,7 @@ jobs:
       - name: set up Ruby for fastlane
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.7'
+          ruby-version: '3.3'
 
       - name: Install bundle
         run: bundle install

.github/workflows/pull-request.yml

@@ -4,6 +4,35 @@ on:
   pull_request:
 
 jobs:
+  style:
+    name: Code style check
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'oracle'
+          java-version: 17
+          cache: 'gradle'
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v2
+
+      - name: Ktlint check
+        run: ./gradlew ktlintCheck
+
   apk:
     name: Build APK
     runs-on: ubuntu-latest
@@ -33,7 +62,7 @@ jobs:
       - name: set up Ruby for fastlane
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.7'
+          ruby-version: '3.3'
 
       - name: Create debug keystore
         env:

.github/workflows/testing.yml

@@ -10,6 +10,35 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  style:
+    name: Code style check
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'oracle'
+          java-version: 17
+          cache: 'gradle'
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v2
+
+      - name: Ktlint check
+        run: ./gradlew ktlintCheck
+
   apk:
     name: Generate and upload APK to Discord
     runs-on: ubuntu-latest
@@ -45,7 +74,7 @@ jobs:
       - name: set up Ruby for fastlane
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.7'
+          ruby-version: '3.3'
 
       - name: Create debug keystore
         env:

.gitignore

@@ -54,10 +54,17 @@ captures/
 .idea/dictionaries
 .idea/libraries
 .idea/caches
+/.idea/compiler.xml
+/.idea/deploymentTargetDropDown.xml
+/.idea/deploymentTargetSelector.xml
+/.idea/kotlinc.xml
+/.idea/migrations.xml
+/.idea/misc.xml
+/.idea/vcs.xml
 
 # Keystore files
 # Uncomment the following line if you do not want to check your keystore files in.
-#*.jks
+*.jks
 
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
@@ -78,10 +85,8 @@ fastlane/test_output
 fastlane/readme.md
 fastlane/.env
 
-.idea/
-app/src/main/res/values/private_strings.xml
-.vscode/
 Gemfile.lock
 app/play-service-account-key.json
 
 app/.env
+.venv/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "app/src/pro"]
+	path = app/src/pro
+	url = https://github.com/keymapperorg/KeyMapperPro

CHANGELOG.md

@@ -1,3 +1,33 @@
+## [2.6.1](https://github.com/sds100/KeyMapper/releases/tag/v2.6.1)
+
+#### 4 September 2024
+
+This release adds support for Android 14 and fixes some bugs associated with it.
+
+### Added
+
+- #1256 Add Russian and Chinese Simplified translations. Update other languages.
+- #1282 Add Assist key code as screen off trigger for Bixby button.
+
+### Bug fixes
+
+- #1218, #1251 Key event actions and triggering key maps from an intent were delayed by 1 second on Android 14 due to new broadcast receiver restrictions.
+- #1175 Bypass the do not disturb permission requirement for volume button triggers.
+- #1234 Granting permissions with Shizuku crashes on Android 14.
+- #1249 Crash when opening help page from the home page if no browser app for custom tabs was found.
+- #1250 Random crashes when picking a screenshot for actions.
+- #1227 Deprecate Bluetooth actions on Android 13+ due to new restrictions.
+- #1252 Add another Camera key code as supported for screen off triggers.
+- #1219 Key Mapper notifications could not be enabled on Android 14.
+- #1194 Deprecate closing the status bar on Android 14 due to new restrictions.
+- #1190 Add a 3 second delay after the screenshot action before showing the on-screen message confirming it happened.
+
+## [2.6.0](https://github.com/sds100/KeyMapper/releases/tag/v2.6.0)
+
+#### 7 October 2023
+
+- #550 Action for doing pinches and swipes on the screen with 2 or more fingers. Many thanks to Tino (@pixel-shock) for working on this feature. 😊
+
 ## [2.5.0](https://github.com/sds100/KeyMapper/releases/tag/v2.5.0)
 
 #### 9 September 2023