Closed TheBrokenRail closed 5 years ago
@AnmAtAnm
When will this get merged?
Can you rebase and fix the merge conflict with blocklylib-core/src/main/res/layout/blockly_variable_name_dialog.xml
?
So there's good news and bad news.
:thumbsup: The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.
:confused: The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.
Note to project maintainer: This is a terminal state, meaning the cla/google
commit status will not change from this state. It's up to you to confirm consent of all the commit author(s), set the cla
label to yes
(if enabled on your project), and then merge this pull request when appropriate.
Rebased!
While GitHub is confused, this looks good. GitHub is not recognizing the commits as part of other PRs. Not sure why that is, because the hashes are identical. However, pulling this in via the command line showed the changes are exactly what would be expected:
* branch prettify-dialogs -> FETCH_HEAD
Auto-merging blocklylib-vertical/src/main/java/com/google/blockly/android/ui/vertical/VerticalBlockViewFactory.java
Merge made by the 'recursive' strategy.
.../src/main/java/com/google/blockly/android/ui/WorkspaceView.java | 4 ++++
.../blockly/android/ui/mutator/ProcedureDefinitionMutatorFragment.java | 8 ++++---
blocklylib-core/src/main/res/drawable/ic_add_black_24dp.xml | 9 ++++++++
blocklylib-core/src/main/res/drawable/ic_close_black_24dp.xml | 9 ++++++++
blocklylib-core/src/main/res/layout/blockly_variable_name_dialog.xml | 8 +++++--
blocklylib-core/src/main/res/layout/if_else_mutator_dialog.xml | 42 ++++++++++++++++++++++++-------------
blocklylib-core/src/main/res/layout/name_variable_view.xml | 19 +++++++----------
blocklylib-core/src/main/res/layout/procedure_definition_mutator_add.xml | 16 +++++++-------
.../src/main/res/layout/procedure_definition_mutator_argument.xml | 31 +++++++++++++--------------
blocklylib-core/src/main/res/layout/procedure_definition_mutator_dialog.xml | 9 ++++----
.../com/google/blockly/android/ui/vertical/VerticalBlockViewFactory.java | 6 +++++-
11 files changed, 102 insertions(+), 59 deletions(-)
Prettify Dialogs, Disable Accessing Mutator UI in Flyout
This change is![Reviewable](https://reviewable.io/review_button.svg)