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.

Sign up for GitHub

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

Jump to bottom

IDE-216 Highlight relating parts in the formula editor #5024

Open
wants to merge 14 commits into
base: develop
Choose a base branch
from
Open

IDE-216 Highlight relating parts in the formula editor #5024

wants to merge 14 commits into from

Conversation

afissel
Copy link

@afissel afissel commented Aug 29, 2024 •
edited
Loading

Added a SpannableString to color the function names in the formular editor.

https://catrobat.atlassian.net/browse/IDE-216

Your checklist for this pull request

Please review the contributing guidelines and wiki pages of this repository.

  • Include the name of the Jira ticket in the PR’s title
  • Include a summary of the changes plus the relevant context
  • Choose the proper base branch (develop)
  • Confirm that the changes follow the project’s coding guidelines
  • Verify that the changes generate no compiler or linter warnings
  • Perform a self-review of the changes
  • Verify to commit no other files than the intentionally changed ones
  • Include reasonable and readable tests verifying the added or changed behavior
  • Confirm that new and existing unit tests pass locally
  • Check that the commits’ message style matches the project’s guideline
  • Stick to the project’s gitflow workflow
  • Verify that your changes do not have any conflicts with the base branch
  • After the PR, verify that all CI checks have passed
  • Post a message in the catroid-stage or catroid-ide Slack channel and ask for a code reviewer

afissel and others added 8 commits August 29, 2024 15:19
@afissel
IDE-216 Add highlighting for formula function
f5e5b44
@astrokit
IDE-257 Formula Editor - missing a "Confirm" button (Catrobat#5008)
7ff2dd1 
* IDE-257 Change formula editor compute button string to 'Confirm'

* IDE-257 Change string literal name formula_editor_compute to formula_editor_confirm; change all strings in English for the confirm button in the formula editor

* IDE-257 Add test for confirm button string in formula editor
@Jr9992
IDE-116 Visualize the color code in formulas (Catrobat#4906)
4272e7a 
* IDE-116 Add Square next to Colorstring

* IDE-116 Add ColorString detection

* IDE-116 Makes ColorSquare Updates in FormulaEditor

* IDE-116 Makes ColorSquare Visible in Formula

* IDE-116 Add FormulaSpannableStringBuilder Object, makes colorSquares visible in complex formulas

* IDE-116 Fix WhiteSpace in SpannableColorString and Fix Testcases

* IDE-116 Fix Warnings, Fix Testcases

* IDE-116 Add VisualizeColorString Class, Add FormulaEditorColorVisualizeTest

* IDE-116 Add more FormulaEditorColorVisualizeTests, cleanup code

* IDE-116 Fix Warnings

* IDE-116 Add static function and correct imports

---------

Co-authored-by: Jakob <[email protected]>
@Toml499
IDE-127 reduce thumbnail screenshot dimensions (Catrobat#4852)
c38df43
@Toml499
IDE-129 delete automatic screenshot if manual screenshot exists (Catr…
423e81c 
…obat#4794)
@rinaschedl
IDE-122 image view change to new guidelines (Catrobat#4749)
6f3d084
@l-ilma
CATROID-986 Apply single choice operations immediately (Catrobat#4650)
376122e
@scrappie1 @ma-zea
IDE-69 End of enclosing bricks (loops, conditionals etc) can't be mov…
ad61e62 
…ed (Catrobat#4983)

* IDE-69 Add possibility to drag and drop EndBrick

* IDE-69 fix functionality for moving end brick

---------

Co-authored-by: ma-zea <[email protected]>
Co-authored-by: Orhidea Shatri <[email protected]>
coki1405
coki1405 reviewed Sep 16, 2024
View reviewed changes
catroid/src/main/java/org/catrobat/catroid/formulaeditor/InternToExternGenerator.java Outdated
currentToken.getInternTokenType() == InternTokenType.FUNCTION_PARAMETERS_BRACKET_OPEN ||
currentToken.getInternTokenType() == InternTokenType.FUNCTION_PARAMETERS_BRACKET_CLOSE ||
currentToken.getInternTokenType() == InternTokenType.FUNCTION_PARAMETER_DELIMITER ) {
externTokenSpannableString.setSpan(new ForegroundColorSpan(Color.parseColor("#008B96")),
Copy link
Contributor

Choose a reason for hiding this comment

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

Define color in colors.xml and use it from there

coki1405
coki1405 reviewed Sep 16, 2024
View reviewed changes
Copy link
Contributor

@coki1405 coki1405 left a comment

Choose a reason for hiding this comment

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

Please change the copyright year in all changed files and resolve conflict in FormulaEditorEditText.java, rest looks good

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@coki1405 coki1405 coki1405 left review comments

At least 2 approving reviews are required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@afissel @coki1405 @astrokit @Jr9992 @Toml499 @rinaschedl @l-ilma @scrappie1