Skip to content

Commit 3526388

Browse files
authored
Merge branch 'develop' into develop
2 parents 4ebb6e6 + 23e64a9 commit 3526388

4 files changed

Lines changed: 5 additions & 13 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
## Added
66

77
- #1466 show onboarding when creating a key map for the first time
8+
- #1729 target Android 16.
89

910
## Changed
1011

@@ -17,6 +18,7 @@
1718
- #1701 optimize the trigger screen for smaller screens so elements are less cut off.
1819
- #1699 Do not highlight a floating button as if it is pressed after triggering a key event action from it.
1920
- Button to copy the key map UID to the clipboard is invisible on small screens.
21+
- #1709 Quick settings tiles were causing crashes on Android 15
2022

2123
## [3.1.1](https://github.com/sds100/KeyMapper/releases/tag/v3.1.1)
2224

base/src/main/java/io/github/sds100/keymapper/base/tiles/ToggleKeyMapperKeyboardTile.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,6 @@ class ToggleKeyMapperKeyboardTile :
6464
lifecycleRegistry.currentState = Lifecycle.State.STARTED
6565
}
6666

67-
override fun onStopListening() {
68-
lifecycleRegistry.currentState = Lifecycle.State.CREATED
69-
super.onStopListening()
70-
}
71-
7267
override fun onDestroy() {
7368
lifecycleRegistry.currentState = Lifecycle.State.DESTROYED
7469

base/src/main/java/io/github/sds100/keymapper/base/tiles/ToggleMappingsTile.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,6 @@ class ToggleMappingsTile :
130130
super.onStartListening()
131131
}
132132

133-
override fun onStopListening() {
134-
lifecycleRegistry.currentState = Lifecycle.State.CREATED
135-
super.onStopListening()
136-
}
137-
138133
override fun onDestroy() {
139134
lifecycleRegistry.currentState = Lifecycle.State.DESTROYED
140135
super.onDestroy()

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[versions]
2-
compile-sdk = "35"
2+
compile-sdk = "36"
33
hilt-navigation-compose = "1.2.0"
44
min-sdk = "21"
5-
build-tools = "35.0.0"
6-
target-sdk = "35"
5+
build-tools = "36.0.0"
6+
target-sdk = "36"
77

88
android-gradle-plugin = "8.9.1"
99
androidx-activity = "1.10.1"

0 commit comments

Comments
 (0)