Fix duplicate key.focused condition and refactor to 'when' for clarity#558
Fix duplicate key.focused condition and refactor to 'when' for clarity#558ColtonLeighton wants to merge 1 commit intoscribe-org:mainfrom
Conversation
Thank you for the pull request! 💙The Scribe-Android team will do our best to address your contribution as soon as we can. If you're not already a member of our public Matrix community, please consider joining! We'd suggest that you use the Element client as well as Element X for a mobile app, and definitely join the Note Scribe uses Conventional Comments in reviews to make sure that communication is as clear as possible. |
Maintainer ChecklistThe following is a checklist for maintainers to make sure this process goes as well as possible. Feel free to address the points below yourself in further commits if you realize that actions are needed :)
|
There was a problem hiding this comment.
First PR Commit Check
- The commit messages for the remote branch should be checked to make sure the contributor's email is set up correctly so that they receive credit for their contribution
- The contributor's name and icon in remote commits should be the same as what appears in the PR
- If there's a mismatch, the contributor needs to make sure that the email they use for GitHub matches what they have forgit config user.emailin their local Scribe-Android repo (can be set withgit config --global user.email "GITHUB_EMAIL")
Contributor checklist
./gradlew lintKotlin detekt testcommand as directed in the testing section of the contributing guideDescription
This pull request fixes a duplicate key.focused check in the text color logic. The original code looked like this:
if (key.focused) {
Color.WHITE
} else if (key.focused) {
mPrimaryColor.getContrastColor()
}
The second key.focused branch could never be reached, because the first if already handles that case. It seems the intention was to check key.pressed instead.
The logic has also been cleaned up using a when statement for readability:
paint.color = when {
key.focused -> Color.WHITE
key.pressed -> mPrimaryColor.getContrastColor()
else -> mTextColor
}
No functional behavior was changed beyond fixing the unreachable condition, but this makes the code clearer and easier to maintain.