Skip to content

Commit

Permalink
Correct default French MessagEase layout (#830) (#840)
Browse files Browse the repository at this point in the history 
* Correct default French MessagEase layout (#830)

This changes the current `FRMessagEase.kt` file to better match its actual
MessagEase counterpart.

> IMPORTANT: I copied the old unchanged `FRMessagEase.kt` layout to `FRMessagEaseV2.kt`, and its title is now "français messagease v2"

Changes:
  - Changed U-key top swipe to letter "û"
  - Changed T-key bottom to letter "ù"
    - Moved combining diaeresis ("¨") to S-key bottom

* Remove the old french messagease layout

This removes the 'french messagease v2' layout entirely
  • Loading branch information
@glm4610
glm4610 authored Apr 10, 2024
1 parent f762aa1 commit f85e7fa
Showing 1 changed file with 20 additions and 10 deletions.
30 changes: 20 additions & 10 deletions app/src/main/java/com/dessalines/thumbkey/keyboards/FRMessagEase.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ val KB_FR_MESSAGEASE_MAIN =
),
SwipeDirection.TOP to
KeyC(
display = KeyDisplay.TextDisplay("ô"),
action = KeyAction.CommitText("ô"),
display = KeyDisplay.TextDisplay("û"),
action = KeyAction.CommitText("û"),
),
SwipeDirection.BOTTOM_LEFT to
KeyC(
Expand Down Expand Up @@ -366,9 +366,8 @@ val KB_FR_MESSAGEASE_MAIN =
),
SwipeDirection.BOTTOM to
KeyC(
display = KeyDisplay.TextDisplay("¨"),
action = KeyAction.CommitText("\u0308"),
color = ColorVariant.MUTED,
display = KeyDisplay.TextDisplay("ù"),
action = KeyAction.CommitText("ù"),
),
SwipeDirection.BOTTOM_LEFT to
KeyC(
Expand Down Expand Up @@ -480,6 +479,12 @@ val KB_FR_MESSAGEASE_MAIN =
action = KeyAction.CommitText(";"),
color = ColorVariant.MUTED,
),
SwipeDirection.BOTTOM to
KeyC(
display = KeyDisplay.TextDisplay("¨"),
action = KeyAction.CommitText("\u0308"),
color = ColorVariant.MUTED,
),
),
),
BACKSPACE_KEY_ITEM,
Expand Down Expand Up @@ -666,8 +671,8 @@ val KB_FR_MESSAGEASE_SHIFTED =
),
SwipeDirection.TOP to
KeyC(
display = KeyDisplay.TextDisplay("Ô"),
action = KeyAction.CommitText("Ô"),
display = KeyDisplay.TextDisplay("Û"),
action = KeyAction.CommitText("Û"),
),
SwipeDirection.BOTTOM_LEFT to
KeyC(
Expand Down Expand Up @@ -848,9 +853,8 @@ val KB_FR_MESSAGEASE_SHIFTED =
),
SwipeDirection.BOTTOM to
KeyC(
display = KeyDisplay.TextDisplay("¨"),
action = KeyAction.CommitText("\u0308"),
color = ColorVariant.MUTED,
display = KeyDisplay.TextDisplay("Ù"),
action = KeyAction.CommitText("Ù"),
),
SwipeDirection.BOTTOM_LEFT to
KeyC(
Expand Down Expand Up @@ -968,6 +972,12 @@ val KB_FR_MESSAGEASE_SHIFTED =
action = KeyAction.CommitText(";"),
color = ColorVariant.MUTED,
),
SwipeDirection.BOTTOM to
KeyC(
display = KeyDisplay.TextDisplay("¨"),
action = KeyAction.CommitText("\u0308"),
color = ColorVariant.MUTED,
),
),
),
BACKSPACE_KEY_ITEM,
Expand Down

0 comments on commit f85e7fa

Please sign in to comment.