Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
4d88fd2
#1711 convert build.gradle files to kotlin
sds100 May 16, 2025
1b7a549
#1711 create base module
sds100 May 16, 2025
4a22ef1
#1711 create api module and move relay service into it
sds100 May 16, 2025
8f91351
#1711 create common and system module and move result and lockscreen …
sds100 May 16, 2025
3063084
#1711 add Hilt library
sds100 May 16, 2025
e4b1b19
style: remove old Created by header comments
sds100 May 16, 2025
c241a29
#1711 move all system adapters to system module
sds100 May 16, 2025
a68cbbe
#1711 convert usecases and viewmodels
sds100 May 16, 2025
6d030a7
#1711 convert more usecases and viewmodels
sds100 May 17, 2025
6ec24b5
#1711 refactor more view models and move files to base module
sds100 May 17, 2025
68e1cbe
#1711 set minifyenabled in more modules
sds100 May 17, 2025
f693823
#1711 move files to base module
sds100 May 17, 2025
5316357
#1711 use buildconfigprovider in other modules instead of Constants
sds100 May 17, 2025
a2a947f
#1711 delete ServiceLocator
sds100 May 17, 2025
00636d7
#1711 WIP: move more files around
sds100 May 17, 2025
3835f03
#1711 create mapping module
sds100 May 17, 2025
8b01834
#1711 WIP: move more files
sds100 May 17, 2025
7d72d08
#1711 WIP: refactor more
sds100 May 17, 2025
d34a19d
#1711 WIP: refactor more files
sds100 May 18, 2025
b055e2b
#1711 system module compiles
sds100 May 18, 2025
1adb550
#1711 WIP: refactor more files
sds100 May 18, 2025
6a355fb
#1711 refactor more
sds100 May 18, 2025
5d727fa
#1711 refactor more files
sds100 May 18, 2025
82d904e
chore: set version to 3.2.0
sds100 May 21, 2025
ffd06b4
#1711 refactor more files
sds100 May 21, 2025
17a3f98
#1711 refactor more
sds100 May 21, 2025
26b8696
#1711 refactor more files
sds100 May 21, 2025
fc98be4
#1711 add more hilt bindings
sds100 May 21, 2025
a1690ba
#1711 finish bindings
sds100 May 21, 2025
d1cb3ec
#1711 app compiles and opens
sds100 May 21, 2025
7994417
#1711 fix tests
sds100 May 21, 2025
c84fa29
#1711 programatically add homefragment to nav app graph
sds100 May 21, 2025
f370511
#1711 navigating to compose screens from view models works
sds100 May 22, 2025
0710f01
#1711 working navigation between and data passing between compose des…
sds100 May 22, 2025
6a28a91
#1711 inject popupviewmodel
sds100 May 22, 2025
236f701
#1711 move InteractUiElementScreen into compose navigation
sds100 May 23, 2025
b198196
#1711 move choose constraint screen into compose navigation
sds100 May 23, 2025
6e04b60
#1711 rename NavigationViewModel to NavigationProvider and document h…
sds100 May 23, 2025
5cfbb03
#1711 move MainNavHost into base module
sds100 May 23, 2025
260a323
name project "KeyMapperFoss"
sds100 May 25, 2025
00aef7e
delete empty string translation files
sds100 May 25, 2025
6e8ae6f
#1711 building full app works
sds100 May 25, 2025
835900b
#1711 WIP: refactor floating buttons code
sds100 May 28, 2025
c0d0756
#1711 bunch more changes
sds100 May 28, 2025
b92e1f9
#1711 more changes
sds100 May 29, 2025
d00c14d
#1711 use assisted inject for accessibility service classes
sds100 May 29, 2025
4684110
#1711 finish assisted injection, compiles again
sds100 May 29, 2025
32312a6
#1711 app no longer crashes on start up of the accessibility service
sds100 May 29, 2025
13158ea
#1711 FOSS app compiles again
sds100 May 29, 2025
fe98aa1
#1711 remove unnecessary libraries from build.gradle files
sds100 May 29, 2025
8acf18f
#1711 test that DetectKeyMapsUseCase.kt is singleton
sds100 Jul 2, 2025
5437c4b
#1711 add back missing dependencies in base module
sds100 Jul 2, 2025
3f6d04d
#1711 move ci and debug resources into app module
sds100 Jul 2, 2025
d0640a7
#1711 delete old "free" build flavor code
sds100 Jul 2, 2025
5c5f491
#1711 add "-foss" suffix to FOSS version name
sds100 Jul 2, 2025
c835948
#1711 complete TODO
sds100 Jul 2, 2025
40a14c1
fix: button to copy the key map UID to the clipboard is invisible on …
sds100 Jul 2, 2025
ddd0868
#1711 complete TODOs
sds100 Jul 2, 2025
be526db
refactor: rename PopupViewModel to DialogProvider
sds100 Jul 2, 2025
27d9724
refactor: rename Result to KMResult to avoid import headaches when th…
sds100 Jul 2, 2025
5ca646d
#1711 complete more TODOs
sds100 Jul 2, 2025
65cff43
#1711 inject dialog provider rather than instantiating it in each vie…
sds100 Jul 2, 2025
6b92f16
#1711 only show dialogs once
sds100 Jul 2, 2025
79fbc46
#1711 only show dialogs once
sds100 Jul 2, 2025
3ad3ab8
#1711 suppress warning for fully qualified name in SortBottomSheetCon…
sds100 Jul 2, 2025
aa8f3e1
#1711 fix path to strings.xml in crowdin.yaml
sds100 Jul 2, 2025
a8dc203
#1711 fix tests
sds100 Jul 2, 2025
3794cc5
Merge branch 'develop' into feature/1711-modules
sds100 Jul 2, 2025
4d64726
delete build.gradle file
sds100 Jul 2, 2025
fd5974a
#1711 fix ktlint format
sds100 Jul 2, 2025
2fa5f9e
#1711 fix Fastfile
sds100 Jul 2, 2025
c3258fc
#1711 style: fix format
sds100 Jul 2, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ 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

[app/src/main/java/io/github/sds100/keymapper/util/ui/compose/icons/*.{kt,kts}]
[base/src/main/java/io/github/sds100/keymapper/base/utils/ui/compose/icons/*.{kt,kts}]
ktlint_standard_property-naming = disabled
ktlint_standard_backing-property-naming = disabled
6 changes: 3 additions & 3 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: android-actions/setup-android@v2

- name: Unit tests
run: bash ./gradlew testFreeDebugUnitTest
run: bash ./gradlew testDebugUnitTest

style:
name: Code style check
Expand Down Expand Up @@ -96,10 +96,10 @@ jobs:
run: bundle exec fastlane testing

- name: set apk name env
run: echo "APK_NAME=$(basename app/build/outputs/apk/free/ci/*.apk .apk)" >> $GITHUB_ENV
run: echo "APK_NAME=$(basename app/build/outputs/apk/ci/*.apk .apk)" >> $GITHUB_ENV

- name: Upload APK
uses: actions/upload-artifact@v4
with:
name: ${{ env.APK_NAME }}
path: app/build/outputs/apk/free/ci/${{ env.APK_NAME }}.apk
path: app/build/outputs/apk/ci/${{ env.APK_NAME }}.apk
2 changes: 1 addition & 1 deletion .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: android-actions/setup-android@v2

- name: Unit tests
run: bash ./gradlew testFreeDebugUnitTest
run: bash ./gradlew testDebugUnitTest

style:
name: Code style check
Expand Down
1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/material_theme_project_new.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

257 changes: 257 additions & 0 deletions .idea/navEditor.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## [3.1.2](https://github.com/sds100/KeyMapper/releases/tag/v3.1.2)
## [3.2.0](https://github.com/sds100/KeyMapper/releases/tag/v3.2.0)

#### TO BE RELEASED

Expand All @@ -15,6 +15,7 @@
- #1686 (more fixes) do not show some screens behind system bars on the left/right side of the device.
- #1701 optimize the trigger screen for smaller screens so elements are less cut off.
- #1699 Do not highlight a floating button as if it is pressed after triggering a key event action from it.
- Button to copy the key map UID to the clipboard is invisible on small screens.

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

Expand Down
1 change: 1 addition & 0 deletions api/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
50 changes: 50 additions & 0 deletions api/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.google.devtools.ksp)
alias(libs.plugins.jlleitschuh.gradle.ktlint)
alias(libs.plugins.dagger.hilt.android)
}

android {
namespace = "io.github.sds100.keymapper.api"
compileSdk = libs.versions.compile.sdk.get().toInt()

defaultConfig {
minSdk = libs.versions.min.sdk.get().toInt()

consumerProguardFiles("consumer-rules.pro")
}

buildTypes {
release {
isMinifyEnabled = true
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro",
)
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = "11"
}

buildFeatures {
aidl = true
}
}

dependencies {
implementation(project(":common"))
implementation(project(":base"))
implementation(project(":system"))

implementation(libs.jakewharton.timber)

implementation(libs.dagger.hilt.android)
ksp(libs.dagger.hilt.android.compiler)
}
File renamed without changes.
Loading