Hotfix-2.4.1: Resolve merge conflicts with develop branch #703
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
ThomasSchwengler
commented
Jul 23, 2019
ThomasSchwengler
commented
- Merge develop branch on hotfix and resolve conflicts
* Add a new interface `ToolController` and an implementation `DefaultToolController`, which acts as a facade and simplifies the `MainActivityPresenter` * Refactor `LayerTest`, `BaseToolWithRectangleShapeToolTest` and `ShapeToolTest` and remove dependency on android activity. * Refactor `ShapeTool`, move any UI dependency into `ShapeToolOptions`
PAINTROID-17: Refactor shape tool
…uild JENKINS-322 add needed packages for emulator to fix builds
…ad-ToReleaseJob JENKINS-306 add stage for bintrayUpload to release pipeline
JENKINS-316 Accept sdk licenses in dockerfile
…_Toolbar PAINTROID-85 Tool bar at bottom
…Picker_returns_wrong_color PAINTROID-103 Colorpicker returns wrong Color
…ew_for_Tools PAINTROID-86 GridView for tools
- Cursor reset to last position after EditText update
ThomasSchwengler
requested review from
chbinder,
catrobatjenkins and
SebastianGrief
…GradlePlugin JENKINS-329 update gradle emulator plugin to 1.6.1
…ging_char_in_hex PAINTROID-97: Changing single character in color chooser HEX
ThomasSchwengler
force-pushed
the
hotfix-2.4.1_resolve_merge_conflicts
branch
from
7a1fd3d
to
2bd56fc
Compare
ThomasSchwengler
force-pushed
the
hotfix-2.4.1_resolve_merge_conflicts
branch
from
2bd56fc
to
19a8fb4
Compare
Tscheppe
approved these changes
Sep 19, 2019
ThomasSchwengler
pushed a commit
that referenced
this pull request
Sep 19, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.