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

Multi sectors #363

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open

Multi sectors #363

wants to merge 20 commits into from

Conversation

guancio
Copy link
Contributor

@guancio guancio commented Aug 8, 2023

This branch is not ready to be merged, but I'm preparing a pull request to get some feeback. The idea is to support an arbitrary number of sectors. I hope that with 6 sectors my finger has to travel less and I can be a bit more efficient.

This pull request enables some of the designs in #35 and fixes the indexing in #360

@github-actions
Copy link
Contributor

github-actions bot commented Aug 8, 2023

Artifact 8vim-debug available until: 2023-10-06T20:42:40Z

@MaethorNaur
Copy link
Contributor

MaethorNaur commented Aug 22, 2023

I can help you to merge your PR from master since a lot of code changes happened 😅 (I'm keeping your logic, but I may adapt the code a bit) if you want

@guancio
Copy link
Contributor Author

guancio commented Aug 23, 2023

I would be happy to get some help

Conflicts:
	8vim/src/main/java/inc/flide/vim8/geometry/Circle.java
	8vim/src/main/java/inc/flide/vim8/keyboardactionlisteners/MainKeypadActionListener.java
	8vim/src/main/java/inc/flide/vim8/keyboardhelpers/InputMethodServiceHelper.java
	8vim/src/main/java/inc/flide/vim8/keyboardhelpers/KeyboardDataYamlParser.java
	8vim/src/main/java/inc/flide/vim8/structures/CharacterPosition.java
	8vim/src/main/java/inc/flide/vim8/structures/Constants.java
	8vim/src/main/java/inc/flide/vim8/structures/Direction.java
	8vim/src/main/java/inc/flide/vim8/structures/FingerPosition.java
	8vim/src/main/java/inc/flide/vim8/structures/KeyboardData.java
	8vim/src/main/java/inc/flide/vim8/structures/LayoutFileName.java
	8vim/src/main/java/inc/flide/vim8/structures/Quadrant.java
	8vim/src/main/java/inc/flide/vim8/structures/yaml/Action.java
	8vim/src/main/java/inc/flide/vim8/structures/yaml/ExtraLayer.java
	8vim/src/main/java/inc/flide/vim8/structures/yaml/Layer.java
	8vim/src/main/java/inc/flide/vim8/structures/yaml/Part.java
	8vim/src/main/java/inc/flide/vim8/utils/GeometricUtilities.java
	8vim/src/main/java/inc/flide/vim8/utils/MovementSequenceHelper.java
	8vim/src/main/java/inc/flide/vim8/views/mainkeyboard/XpadView.java
	8vim/src/main/kotlin/inc/flide/vim8/models/CharacterPosition.kt
	8vim/src/main/res/values/strings.xml
	8vim/src/test/java/inc/flide/vim8/arbitaries/KeyboardActionsEntryArbitrary.java
	8vim/src/test/java/inc/flide/vim8/arbitaries/MovementSequenceArbitrary.java
	8vim/src/test/java/inc/flide/vim8/keyboardhelpers/InputMethodServiceHelperTest.java
	8vim/src/test/java/inc/flide/vim8/keyboardhelpers/KeyboardDataYamlParserTest.java
	8vim/src/test/java/inc/flide/vim8/structures/QuadrantTest.java
	8vim/src/test/java/inc/flide/vim8/utils/GeometricUtilitiesTest.java
	8vim/src/test/java/inc/flide/vim8/utils/MovementSequenceHelperTest.java
	README.md
@MaethorNaur
Copy link
Contributor

Managed to merge it.
I add a backward compatibility for the yaml file

@codecov
Copy link

codecov bot commented Aug 27, 2023

Codecov Report

Merging #363 (1168eb0) into master (fc01d4c) will increase coverage by 0.32%.
Report is 2 commits behind head on master.
The diff coverage is 58.21%.

Additional details and impacted files
@@             Coverage Diff              @@
##             master     #363      +/-   ##
============================================
+ Coverage     26.68%   27.01%   +0.32%     
- Complexity       88       93       +5     
============================================
  Files            46       45       -1     
  Lines          1454     1540      +86     
  Branches        229      240      +11     
============================================
+ Hits            388      416      +28     
- Misses         1033     1078      +45     
- Partials         33       46      +13     
Flag Coverage Δ
unit 27.01% <58.21%> (+0.32%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
.../java/inc/flide/vim8/utils/GeometricUtilities.java 100.00% <ø> (+40.00%) ⬆️
.../src/main/kotlin/inc/flide/vim8/geometry/Circle.kt 68.18% <100.00%> (-2.41%) ⬇️
...otlin/inc/flide/vim8/ime/KeyboardDataYamlParser.kt 96.82% <100.00%> (+0.13%) ⬆️
...rc/main/kotlin/inc/flide/vim8/models/LayerLevel.kt 60.00% <100.00%> (-13.34%) ⬇️
.../src/main/kotlin/inc/flide/vim8/models/Quadrant.kt 100.00% <100.00%> (ø)
...in/kotlin/inc/flide/vim8/models/yaml/ExtraLayer.kt 28.57% <ø> (-39.85%) ⬇️
...lin/inc/flide/vim8/ime/InputMethodServiceHelper.kt 0.00% <0.00%> (ø)
.../main/kotlin/inc/flide/vim8/models/KeyboardData.kt 64.91% <68.75%> (+0.62%) ⬆️
...im/src/main/kotlin/inc/flide/vim8/models/Layout.kt 3.12% <0.00%> (-0.18%) ⬇️
...rc/main/kotlin/inc/flide/vim8/models/yaml/Layer.kt 70.00% <70.58%> (-5.00%) ⬇️
... and 4 more

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Todo
Development

Successfully merging this pull request may close these issues.

None yet

2 participants