Merge pull request #1581 from keymapperorg/develop

Version 3.0.0 Beta 1

Author: sds100

.editorconfig

@@ -2,4 +2,8 @@
 ktlint_standard_function-expression-body = disabled
 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
+ktlint_code_style = intellij_idea # Use IntelliJ style because it has trailing commas
+
+[app/src/main/java/io/github/sds100/keymapper/util/ui/compose/icons/*.{kt,kts}]
+ktlint_standard_property-naming = disabled
+ktlint_standard_backing-property-naming = disabled

.idea/runConfigurations/app.xml

@@ -1,15 +1,42 @@
+## [3.0 Beta 1](https://github.com/sds100/KeyMapper/releases/tag/v3.0.0-beta.1)
+
+#### TO BE RELEASED
+
+Most of the codebase has been touched and most of the user interface has been rewritten
+in Jetpack Compose, resulting in many improvements to the user experience.
+
+## Added
+
+- #1407 New trigger! Add floating buttons on top of other apps to input key maps.
+- Key maps are much more dense on the home screen.
+- Button to pause/resume key maps at the top of the home screen.
+- #1502 Constraint for lockscreen is (not) showing.
+- #1203 Show a share sheet after exporting key maps rather than asking where to store it. This solves the problem when no apps are installed to select where to back it up. You can still find the file in the Downloads file.
+- #1531 Show shortcuts to quickly add recently used actions and constraints.
+- #1487 Add confirmation dialog when importing key maps and offer the option to replace all the key maps or append to the list.
+- #1546 Add short explanation of what constraints mean on top of the list.
+- #1548 Dynamically change key map enabled switch label.
+- #1562 Import key maps by opening .json and .zip files from other apps and file managers.
+
+## Bug fixes
+- #1518 detect more apps that are playing media (fix to previous fix).
+- #1545 support phone call constraints in more apps.
+- #1536 'Edit action' sometimes does not appear.
+- #1507 only vibrate once when mixing short, long, and double press key maps.
+- Prevent various system errors from crashing the apps.
+
 ## [2.8.3](https://github.com/sds100/KeyMapper/releases/tag/v2.8.3)
 
 #### 17 March 2025
 
 ## Changed
 
-- #1474 always allow specifying a name for key map launcher shortcuts
-- #1533 simplify naming of ringer mode actions
+- #1474 always allow specifying a name for key map launcher shortcuts.
+- #1533 simplify naming of ringer mode actions.
 
 ## Bug fixes
 
-- #1535 side key/assistant trigger does not trigger from non-assistant buttons
+- #1535 side key/assistant trigger does not trigger from non-assistant buttons.
 
 ## [2.8.2](https://github.com/sds100/KeyMapper/releases/tag/v2.8.2)
 

.idea/valkyrie_settings.xml

@@ -7,6 +7,7 @@ apply plugin: "kotlinx-serialization"
 apply plugin: "org.jetbrains.kotlin.plugin.parcelize"
 apply plugin: "org.jlleitschuh.gradle.ktlint"
 apply plugin: "org.jetbrains.kotlin.plugin.compose"
+apply plugin: "androidx.room"
 
 android {
 
@@ -71,13 +72,8 @@ android {
         }
 
         ci {
-            postprocessing {
-                removeUnusedCode true
-                removeUnusedResources true
-                obfuscate false
-                optimizeCode true
-                proguardFiles "proguard-rules.pro"
-            }
+            minifyEnabled true
+            shrinkResources true
 
             /*
             This is required because the splitties library does not have a ci build type.
@@ -86,6 +82,9 @@ android {
 
             applicationIdSuffix ".ci"
             versionNameSuffix "-ci." + versionProperties.getProperty("VERSION_NUM")
+
+            proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
+
             signingConfig signingConfigs.debug
         }
     }
@@ -121,7 +120,6 @@ android {
         targetCompatibility JavaVersion.VERSION_17
     }
 
-    // work-runtime-ktx 2.1.0 and above now requires Java 8
     kotlinOptions {
         jvmTarget = "17"
     }
@@ -150,6 +148,10 @@ android {
             outputFileName = "keymapper-${variant.versionName}.apk"
         }
     }
+
+    room {
+        schemaDirectory "$projectDir/schemas"
+    }
 }
 
 dependencies {
@@ -172,23 +174,21 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3"
 
     // random stuff
-    implementation "com.google.android.material:material:1.13.0-alpha11"
+    implementation "com.google.android.material:material:1.13.0-alpha12"
     implementation "com.github.salomonbrys.kotson:kotson:2.5.0"
     implementation "com.airbnb.android:epoxy:$epoxy_version"
-    implementation "com.github.AppIntro:AppIntro:6.1.0"
     implementation "com.airbnb.android:epoxy-databinding:$epoxy_version"
     kapt "com.airbnb.android:epoxy-processor:$epoxy_version"
     implementation "com.jakewharton.timber:timber:5.0.1"
-    implementation "uk.co.samuelwall:material-tap-target-prompt:3.1.0"
     implementation "net.lingala.zip4j:zip4j:2.8.0"
     implementation "com.anggrayudi:storage:0.8.1"
     implementation "com.github.MFlisar:DragSelectRecyclerView:0.3"
     implementation "com.google.android.flexbox:flexbox:3.0.0"
     implementation "dev.rikka.shizuku:api:$shizuku_version"
     implementation "dev.rikka.shizuku:provider:$shizuku_version"
     implementation "org.lsposed.hiddenapibypass:hiddenapibypass:4.3"
-    proImplementation 'com.revenuecat.purchases:purchases:8.11.0'
-
+    proImplementation 'com.revenuecat.purchases:purchases:8.14.2'
+    proImplementation "com.airbnb.android:lottie-compose:6.6.3"
 
     // splitties
     implementation "com.louiscad.splitties:splitties-bitflags:$splitties_version"
@@ -221,15 +221,25 @@ dependencies {
     implementation "androidx.viewpager2:viewpager2:1.1.0"
     implementation "androidx.datastore:datastore-preferences:1.1.3"
     implementation "androidx.core:core-splashscreen:1.0.1"
+    implementation "androidx.activity:activity-compose:1.10.1"
+    implementation "androidx.navigation:navigation-compose:2.8.9"
+    implementation "androidx.navigation:navigation-fragment-compose:2.8.9"
     ksp "androidx.room:room-compiler:$room_version"
 
     // Compose
-    implementation "androidx.compose.ui:ui-android:1.7.8"
-    implementation "androidx.compose.material3:material3-android:1.3.1"
-    implementation "androidx.compose.ui:ui-tooling-preview-android:1.7.8"
-    implementation "androidx.compose.material:material-icons-extended-android:1.7.8"
-    debugImplementation "androidx.compose.ui:ui-tooling:1.7.8"
-    debug_releaseImplementation "androidx.compose.ui:ui-tooling:1.7.8"
+    Dependency composeBom = platform('androidx.compose:compose-bom-beta:2025.03.00')
+    implementation composeBom
+    implementation 'androidx.compose.foundation:foundation'
+    implementation "androidx.compose.ui:ui-android"
+    implementation "androidx.compose.material3:material3-android"
+    implementation "androidx.compose.ui:ui-tooling-preview-android"
+    implementation "androidx.compose.material:material-icons-extended-android"
+    implementation 'androidx.compose.material3.adaptive:adaptive-android'
+    implementation "androidx.compose.material3.adaptive:adaptive-navigation"
+    implementation "com.google.accompanist:accompanist-drawablepainter:0.35.0-alpha"
+    implementation "androidx.activity:activity-compose:1.10.1"
+    debugImplementation "androidx.compose.ui:ui-tooling"
+    debug_releaseImplementation "androidx.compose.ui:ui-tooling"
 
 //    debugImplementation "com.squareup.leakcanary:leakcanary-android:2.6"