Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 2.7.0 #1357

Merged
merged 134 commits into from
Dec 8, 2024
Merged
Changes from 1 commit
Commits
Show all changes
134 commits
Select commit Hold shift + click to select a range
76840fe
chore: add pro build flavor
sds100 Aug 11, 2024
c7445f8
Merge branch 'refs/heads/develop' into develop-pro
sds100 Aug 11, 2024
09bd3c1
#1274 add empty assistant trigger fragment
sds100 Aug 13, 2024
bd4768d
fix KeyMapController
sds100 Aug 13, 2024
b353671
chore: upgrade kotlin version
sds100 Aug 13, 2024
aa9986f
#1274 use build flavor source directory rather than gradle module
sds100 Aug 13, 2024
e92d6d3
#1274 update text for free version
sds100 Aug 13, 2024
a7d3fbc
#1274 add billing library dependency for pro build
sds100 Aug 13, 2024
6d3dde3
Merge branch 'develop' into 1274-set-key-mapper-as-the-device-assista…
sds100 Aug 13, 2024
c279616
Update README.md
sds100 Sep 14, 2024
03242f8
Merge branch 'develop' into 1274-set-key-mapper-as-the-device-assista…
sds100 Sep 14, 2024
e30e30e
delete home tab for assistant trigger
sds100 Sep 14, 2024
f738776
tests: duplicate shared test utils across android and unit tests beca…
sds100 Sep 16, 2024
9e04eb6
tests: duplicate shared test utils across android and unit tests beca…
sds100 Sep 16, 2024
731a329
#1297: send events to accessibility service asynchronously
sds100 Sep 16, 2024
3c39f57
#1297: make accessibility service controller an abstract class
sds100 Sep 16, 2024
e6f3bbc
#1304 docs: add vietnamese translations badge to README
sds100 Sep 25, 2024
9c35460
chore: use github actions checkout@v4
sds100 Sep 25, 2024
6886e22
chore: use github actions upload-artifact@v4
sds100 Sep 25, 2024
6d54885
New Crowdin translations by GitHub Action
crowdin-bot Sep 25, 2024
5fa1698
Merge pull request #1305 from keymapperorg/l10n/develop
sds100 Sep 25, 2024
6652bd4
Merge branch 'refs/heads/develop' into 1274-set-key-mapper-as-the-dev…
sds100 Sep 26, 2024
5be22b9
#1297 change trigger screen placeholder text to mention advanced trig…
sds100 Sep 26, 2024
3c5b7e1
#1297 only show the trigger mode buttons if there are keys recorded
sds100 Sep 26, 2024
7cdca46
#1297 add theme for jetpack compose
sds100 Sep 26, 2024
286b0bf
#1297 add empty Jetpack Compose record trigger button
sds100 Sep 26, 2024
8f57a60
#1297 use dynamic Material You colors for compose theme
sds100 Sep 26, 2024
00bf278
fix (ConfigMappingFragment): Don't show the swipe animations for reac…
sds100 Sep 26, 2024
1433ee5
#1297 complete new record trigger button
sds100 Sep 28, 2024
8df65ce
#1297 create empty bottom sheet for choosing advanced triggers
sds100 Sep 29, 2024
6519be5
#1297 create stubbed advanced triggers bottom sheet for free build
sds100 Sep 29, 2024
b16c234
#1297 add NEW! badge to advanced triggers button
sds100 Sep 29, 2024
7f32657
#1297 add system bars padding to advanced triggers bottomsheet
sds100 Sep 29, 2024
bb01372
#1297 complete assistant trigger product card
sds100 Sep 29, 2024
5f2c051
#1222 #1307 fix: execute the correct app shortcut action if multiple …
sds100 Sep 29, 2024
b7d6a9c
chore: set version to 2.6.3
sds100 Sep 29, 2024
6baf224
delete AutoSwitchImeControllerTest
sds100 Sep 29, 2024
60baa82
chore: upgrade coroutines version to 1.9.0
sds100 Sep 29, 2024
2d29dbe
use new testdispatcher in TestDispatcherProvider
sds100 Sep 29, 2024
c89b8a5
tests: fix GetActionErrorUseCaseTest
sds100 Sep 29, 2024
04bd7a8
run unit tests in github actions workflows
sds100 Sep 29, 2024
b2ac3eb
#1308 fix tests to use new Coroutines library in 1.6.0
sds100 Sep 29, 2024
b18a2cb
use Java 17 for unit tests in github actions
sds100 Sep 29, 2024
5b67bec
Merge pull request #1309 from keymapperorg/fix-tests
sds100 Sep 29, 2024
b7dcace
#1271 fix: ignore double press key maps overlapping short press key m…
sds100 Oct 1, 2024
a9159f3
docs: remove maintenance notice header
sds100 Oct 1, 2024
e1c1afc
Merge branch 'develop' into 1274-set-key-mapper-as-the-device-assista…
sds100 Oct 3, 2024
be93e77
#1274 name KeyMapTrigger to CustomTrigger
sds100 Oct 3, 2024
6ae4cc9
#1274 move TriggerKeyEntity to its own file
sds100 Oct 3, 2024
2b2ac17
use kotlinx.parcelize instead of kotlinx.android.parcel
sds100 Oct 3, 2024
db8b2d4
refactor: rename CustomTrigger to Trigger
sds100 Oct 3, 2024
af0c895
refactor: move TriggerKeyMapFromOtherAppsController to different package
sds100 Oct 3, 2024
c82459a
#1274: represent assistant triggers as normal key map trigger keys
sds100 Oct 3, 2024
3022249
refactor: move all click types and annotation to TriggerKey
sds100 Oct 4, 2024
0dbd022
chore: disable writing function bodies inline
sds100 Oct 5, 2024
bafb15b
#1274 WIP: add assistant trigger key
sds100 Oct 5, 2024
4ac8364
delete code that migrates device names for triggers from before versi…
sds100 Oct 5, 2024
0fe594f
New Crowdin translations by GitHub Action
crowdin-bot Oct 5, 2024
a3dc103
Merge branch 'develop' into 1274-set-key-mapper-as-the-device-assista…
sds100 Oct 5, 2024
3df2d65
Merge pull request #1315 from keymapperorg/l10n/develop
sds100 Oct 6, 2024
5403af4
Update issue templates
sds100 Oct 6, 2024
b3125be
#1274 wip: support assistant trigger in keymapcontroller
sds100 Oct 6, 2024
11752b1
#1274 move all strings for advanced triggers into the public repo
sds100 Oct 6, 2024
4cf532f
readme: Hide translation badges until the shield link is fixed
sds100 Oct 8, 2024
3521dac
tests: remove tests for issue #612.
sds100 Oct 8, 2024
995176a
New Crowdin translations by GitHub Action
crowdin-bot Oct 8, 2024
8753e90
Merge pull request #1317 from keymapperorg/l10n/develop
sds100 Oct 8, 2024
ad9bd58
tests: add tests from pro build flavor
sds100 Oct 12, 2024
9bca41b
#1274 use SplashActivity explicitly in app run configuration because …
sds100 Oct 12, 2024
b45a800
#1274 allow using the screen off constraint with assistant triggers s…
sds100 Oct 12, 2024
cc84b3f
#1274 style: rename variable
sds100 Oct 13, 2024
717de79
fix: add padding between tabs and trigger list
sds100 Oct 13, 2024
f6e1e95
#1274 fix: hide click type buttons if a parallel trigger has an assis…
sds100 Oct 13, 2024
d5f335b
#1274 set parallel trigger to short press when adding assistant key
sds100 Oct 13, 2024
83e3d69
#1274 fix: use custom JSON name for type field in AssistantTriggerKey
sds100 Oct 13, 2024
9b7c0a7
#1274 show dialog to select which assistant type when clicking more o…
sds100 Oct 13, 2024
5bbf802
#1274 update google play billing library
sds100 Oct 13, 2024
ff67ae8
#1274 set version to 2.7.0
sds100 Oct 13, 2024
454dd82
#1274 set version to 2.7.0 alpha
sds100 Oct 13, 2024
917981f
#1274 add Dagger Hilt dependency injection and split up MainActivity …
sds100 Oct 15, 2024
155bde5
refactor: use data object instead of object for Result errors
sds100 Oct 15, 2024
9c8582d
#1274 fix errors for free build
sds100 Oct 15, 2024
7baf108
#1274 add revenuecat public api key to BuildConfig from local.properties
sds100 Oct 15, 2024
a5ba747
#1274 pass viewmodel to AdvancedTriggersBottomSheet so it is compatib…
sds100 Oct 15, 2024
3b19cfb
#1274 delete hilt and inject PurchasingUseCase into ConfigTriggerView…
sds100 Oct 16, 2024
121f4f8
remove unused home_tab_titles string array from resources
sds100 Oct 16, 2024
00ed19c
#1274 add debug_release build type that does not alter the package na…
sds100 Oct 16, 2024
381c874
#1274 bump compose library versions and add tooling for debug_release…
sds100 Oct 16, 2024
fc22ab0
#1274 extend debug_release from debug build type
sds100 Oct 16, 2024
48aac71
#1274 purchase assistant trigger and check whether it is purchased
sds100 Oct 16, 2024
89948a9
#1328 fix: don't crash when generating the key events for a non-ASCII…
sds100 Nov 7, 2024
ce49d6f
New Crowdin translations by GitHub Action
crowdin-bot Nov 7, 2024
9fbe7c9
Merge pull request #1334 from keymapperorg/l10n/develop
sds100 Nov 7, 2024
5b232f2
#1274 feat: show dialog if an error is encountered while purchasing
sds100 Nov 7, 2024
8b4c088
Merge branch 'develop' into 1274-set-key-mapper-as-the-device-assista…
sds100 Nov 7, 2024
5235760
#1274 dismiss advanced triggers bottom sheet after choosing assistant…
sds100 Nov 7, 2024
628dfd3
#1274 dismiss bottom sheet after it is hidden
sds100 Nov 7, 2024
2db6560
#1274 fix: do not allow multiple trigger keys when switching to a par…
sds100 Nov 7, 2024
cdc1a31
#1274 feat: show a button to contact the developer if they have purch…
sds100 Nov 8, 2024
e1c16b1
#1274 feat: show thank you dialog after purchasing
sds100 Nov 8, 2024
028a8cd
#1274 feat: show errors if the assistant is not purchased or key mapp…
sds100 Nov 12, 2024
38bde34
#1274 feat: instruct the user to buy the advanced trigger on the home…
sds100 Nov 12, 2024
a4723b6
#1274 feat: inform the user that advanced triggers are only available…
sds100 Nov 12, 2024
3cc1549
#1274 feat: show error when Key Mapper is not selected as the device …
sds100 Nov 14, 2024
ad1af28
#1274 fix: only show button for long press if all the keys are key co…
sds100 Nov 14, 2024
7142f2c
#1274 fix: restore key maps by using gson instance that uses the dese…
sds100 Nov 14, 2024
9fbb316
#1274 fix: missing member in free PurchasingManagerImpl
sds100 Nov 14, 2024
8e4a1c3
update libraries
sds100 Nov 16, 2024
3071715
#1274 update store description to say Google Assistant, Pixel Active …
sds100 Nov 16, 2024
32012b9
docs: fix translations badges in website and readme
sds100 Nov 16, 2024
58500e6
#1274 reword strings related to default assistant app
sds100 Nov 24, 2024
102fc95
#1274 document the new assistant trigger
sds100 Nov 24, 2024
69eae2e
#1274 document the build flavors and build types
sds100 Nov 24, 2024
6136c73
#1274 update maintenance notice
sds100 Nov 24, 2024
7ac3ccb
#1274 fix docs website redirects and add redirect to advanced triggers
sds100 Nov 24, 2024
f70a860
#1274 add button to learn more about advanced triggers that opens the…
sds100 Nov 24, 2024
947c641
no longer show notifications or app intro slides for the fingerprint …
sds100 Nov 24, 2024
cff5897
#1274 feat: show a notification presenting the new assistant trigger …
sds100 Dec 4, 2024
a641f91
fix: do not fail gradle sync if local.properties doesn't exist for th…
sds100 Dec 4, 2024
70acd62
#1274 chore: assemble free CI build when creating testing builds and …
sds100 Dec 4, 2024
7f630c2
fix: remove unused home_tab_titles string array in polish strings
sds100 Dec 4, 2024
8fad3e2
Merge pull request #1351 from keymapperorg/1274-set-key-mapper-as-the…
sds100 Dec 4, 2024
2727353
New Crowdin translations by GitHub Action
crowdin-bot Dec 4, 2024
53233fc
Merge pull request #1352 from keymapperorg/l10n/develop
sds100 Dec 4, 2024
525641a
chore: delete production github actions since Pro builds for the play…
sds100 Dec 4, 2024
1100a34
update whats-new.txt
sds100 Dec 4, 2024
8e02a62
fix: use correct path for CI testing builds
sds100 Dec 4, 2024
de67923
#1274 fix: after tapping the notification, do not navigate to the adv…
sds100 Dec 8, 2024
2f3958a
chore: write changelog for 2.7.0
sds100 Dec 8, 2024
296a1ec
New Crowdin translations by GitHub Action
crowdin-bot Dec 8, 2024
01d29fd
chore: update changelog for 2.7.0
sds100 Dec 8, 2024
d5eae77
Merge pull request #1356 from keymapperorg/l10n/develop
sds100 Dec 8, 2024
5f8469d
chore: make releasing to production manual in fastlane
sds100 Dec 8, 2024
c3b3a26
Merge remote-tracking branch 'origin/develop' into develop
sds100 Dec 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
#1297: make accessibility service controller an abstract class
  • Loading branch information
sds100 committed Sep 16, 2024
commit 3c39f576e334a296035f0fbf1b4384223f9aadb8

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
package io.github.sds100.keymapper.system.accessibility

import io.github.sds100.keymapper.actions.PerformActionsUseCase
import io.github.sds100.keymapper.constraints.DetectConstraintsUseCase
import io.github.sds100.keymapper.data.repositories.PreferenceRepository
import io.github.sds100.keymapper.mappings.PauseMappingsUseCase
import io.github.sds100.keymapper.mappings.fingerprintmaps.DetectFingerprintMapsUseCase
import io.github.sds100.keymapper.mappings.keymaps.detection.DetectKeyMapsUseCase
import io.github.sds100.keymapper.reroutekeyevents.RerouteKeyEventsUseCase
import io.github.sds100.keymapper.system.devices.DevicesAdapter
import io.github.sds100.keymapper.system.inputmethod.InputMethodAdapter
import io.github.sds100.keymapper.system.root.SuAdapter
import io.github.sds100.keymapper.util.ServiceEvent
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.SharedFlow

class AccessibilityServiceController(
coroutineScope: CoroutineScope,
accessibilityService: IAccessibilityService,
inputEvents: SharedFlow<ServiceEvent>,
outputEvents: MutableSharedFlow<ServiceEvent>,
detectConstraintsUseCase: DetectConstraintsUseCase,
performActionsUseCase: PerformActionsUseCase,
detectKeyMapsUseCase: DetectKeyMapsUseCase,
detectFingerprintMapsUseCase: DetectFingerprintMapsUseCase,
rerouteKeyEventsUseCase: RerouteKeyEventsUseCase,
pauseMappingsUseCase: PauseMappingsUseCase,
devicesAdapter: DevicesAdapter,
suAdapter: SuAdapter,
inputMethodAdapter: InputMethodAdapter,
settingsRepository: PreferenceRepository,
) : BaseAccessibilityServiceController(
coroutineScope,
accessibilityService,
inputEvents,
outputEvents,
detectConstraintsUseCase,
performActionsUseCase,
detectKeyMapsUseCase,
detectFingerprintMapsUseCase,
rerouteKeyEventsUseCase,
pauseMappingsUseCase,
devicesAdapter,
suAdapter,
inputMethodAdapter,
settingsRepository
)
Original file line number Diff line number Diff line change
@@ -54,7 +54,7 @@ import timber.log.Timber
/**
* Created by sds100 on 17/04/2021.
*/
class AccessibilityServiceController(
abstract class BaseAccessibilityServiceController(
private val coroutineScope: CoroutineScope,
private val accessibilityService: IAccessibilityService,
private val inputEvents: SharedFlow<ServiceEvent>,
@@ -92,7 +92,7 @@ class AccessibilityServiceController(
detectConstraintsUseCase,
)

private val keymapDetectionDelegate = KeyMapController(
private val keyMapController = KeyMapController(
coroutineScope,
detectKeyMapsUseCase,
performActionsUseCase,
@@ -123,7 +123,7 @@ class AccessibilityServiceController(

if (!isPaused.value) {
withContext(Dispatchers.Main.immediate) {
keymapDetectionDelegate.onKeyEvent(
keyMapController.onKeyEvent(
keyCode,
action,
metaState = 0,
@@ -196,7 +196,7 @@ class AccessibilityServiceController(
}

pauseMappingsUseCase.isPaused.distinctUntilChanged().onEach {
keymapDetectionDelegate.reset()
keyMapController.reset()
fingerprintMapController.reset()
triggerKeyMapFromOtherAppsController.reset()
}.launchIn(coroutineScope)
@@ -324,7 +324,7 @@ class AccessibilityServiceController(
try {
var consume: Boolean

consume = keymapDetectionDelegate.onKeyEvent(
consume = keyMapController.onKeyEvent(
keyCode,
action,
metaState,
@@ -426,7 +426,7 @@ class AccessibilityServiceController(
triggerKeyMapFromOtherAppsController.onDetected(uid)
}

private fun onEventFromUi(event: ServiceEvent) {
open fun onEventFromUi(event: ServiceEvent) {
Timber.d("Service received event from UI: $event")
when (event) {
is ServiceEvent.StartRecordingTrigger ->
@@ -449,7 +449,10 @@ class AccessibilityServiceController(

is ServiceEvent.TestAction -> performActionsUseCase.perform(event.action)

is ServiceEvent.Ping -> coroutineScope.launch { outputEvents.emit(ServiceEvent.Pong(event.key)) }
is ServiceEvent.Ping -> coroutineScope.launch {
outputEvents.emit(ServiceEvent.Pong(event.key))
}

is ServiceEvent.HideKeyboard -> accessibilityService.hideKeyboard()
is ServiceEvent.ShowKeyboard -> accessibilityService.showKeyboard()
is ServiceEvent.ChangeIme -> accessibilityService.switchIme(event.imeId)
Loading