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

fix inconsistent layout naming #497

Merged
merged 20 commits into from
Oct 16, 2023
Merged

fix inconsistent layout naming #497

merged 20 commits into from
Oct 16, 2023

Conversation

KraXen72
Copy link
Contributor

@KraXen72 KraXen72 commented Oct 14, 2023

i've implemented fixes for points 1, 3, 5, 6 and 7 of #495

  • i've also renamed all the keyboards with symbols to just have symbols. before, some had with symbols and some had symbols
  • i've renamed the ukrainian layout to start with UA and not UK
  • fixed the KB_EOENDE_THUMBKEY layout not being available in the layout picker (it wasn't imported)
  • added back the KB_FR_MESSAGEEASE layout to layout picker (reported in lemmy)

about the other points in #495:

  • 2 and 4 - how should i differentiate these layouts? how should i name them?

(i have not tested the changes, because i don't have android studio set up, but i was excruciatingly careful when modifying the files. please test that the affected layouts can be selected. i do want to set up android studio very soon though.)

@KraXen72 KraXen72 changed the title partially fix inconsistent layout naming (#495) fix inconsistent layout naming (#495) Oct 14, 2023
@KraXen72 KraXen72 changed the title fix inconsistent layout naming (#495) fix inconsistent layout naming Oct 14, 2023
@@ -781,7 +781,7 @@ val KB_UA_RU_MESSAGEEASE_SYMBOLS_SHIFTED = KeyboardC(
)

val KB_UA_RU_MESSAGEEASE_SYMBOLS: KeyboardDefinition = KeyboardDefinition(
title = "UA RU MessageEase український-русский with Symbols",
title = "RU MessageEase русский (RU+UA multi) symbols",
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ukrainian language code is UK : https://en.m.wikipedia.org/wiki/Ukrainian_language

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, okay. i see - i got confused, because i was using the ISO country codes, and not the language codes. i guess language codes make more sense, due to stuff like esperanto which is not tied to a country. will fix

@@ -17,7 +17,7 @@ import com.dessalines.thumbkey.utils.KeyboardDefinitionModes
import com.dessalines.thumbkey.utils.SwipeDirection
import com.dessalines.thumbkey.utils.SwipeNWay

val KB_UK_THUMBKEY_MAIN = KeyboardC(
val KB_UA_THUMBKEY_MAIN = KeyboardC(
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same

@@ -109,7 +112,7 @@ enum class KeyboardLayout(val index: Int, val keyboardDefinition: KeyboardDefini
FITypeSplit(59, KB_FI_TYPESPLIT),
FRThumbKeyV1(8, KB_FR_THUMBKEY_V1),
FRThumbKeyV2(33, KB_FR_THUMBKEY_V2),
FRMessageEase(28, KB_FR_THUMBKEY_V1),
FRMessageEase(28, KB_FR_MESSAGEEASE),
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thx for getting this one. Eventually I'm going to put all these back in order by index, because people adding to this file need to see the last number anyway.

@dessalines
Copy link
Owner

I'll fix these issues. I'll just use the UK language code for this, unless someone wants to differentiate them.

@dessalines
Copy link
Owner

Also in the future, do not use your main branch for development, use a feature-specific name.

@KraXen72
Copy link
Contributor Author

KraXen72 commented Oct 16, 2023

is the current state of the PR satisfactory? i want to get contribution credit 😛 (don't know kotlin yet, atleast i can help like this)
i'll use feature branch next time, thx for letting me know.

@dessalines
Copy link
Owner

You'll get the credit, don't worry :)

In the future tho, you might want to set up a dev environment, it'd be much easier.

@dessalines dessalines enabled auto-merge (squash) October 16, 2023 21:48
@KraXen72
Copy link
Contributor Author

thanks!! yeah this is about as far as i can go without one.

@dessalines dessalines merged commit e8ad7cb into dessalines:main Oct 16, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants