Skip to content

Commit 2d9e297

Browse files
wslanywslany
authored
Merge pull request #4148 from Catrobat/release-v1.0.3
Release v1.0.3
2 parents 4d9651e + 5d3ad78 commit 2d9e297

152 files changed

Lines changed: 6033 additions & 3327 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/scheduled-upload-crowdin.yml‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎.github/workflows/sync_crowdin.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ jobs:
4949

5050
- uses: crowdin/github-action@1.0.10
5151
with:
52-
upload_translations: true
52+
upload_sources: true
53+
upload_translations: false
5354
download_translations: true
5455
config: 'crowdin.yml'
5556
env:

‎catroid/build.gradle‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ jacocoAndroidUnitTestReport {
105105
xml.enabled true
106106
}
107107

108-
def defaultVersionCode = 84
109-
def defaultVersionName = "1.0.2"
108+
def defaultVersionCode = 85
109+
def defaultVersionName = "1.0.3"
110110

111111
android {
112112
compileSdkVersion 29
@@ -332,6 +332,7 @@ dependencies {
332332

333333
// Paintroid local aar lib files
334334
implementation fileTree(dir: 'src/main/libs', include: ['*.aar'])
335+
implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
335336

336337
// Kotlin
337338
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

‎catroid/config/lint-baseline.xml‎

Lines changed: 147 additions & 235 deletions
Large diffs are not rendered by default.

‎catroid/src/androidTest/java/org/catrobat/catroid/test/BricksHelpUrlTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ public class BricksHelpUrlTest {
160160
"https://wiki.catrobat.org/bin/view/Documentation/BrickDocumentation/ChangeXByNBrick");
161161
brickToHelpUrlMapping.put("org.catrobat.catroid.content.bricks.ChangeColorByNBrick",
162162
"https://wiki.catrobat.org/bin/view/Documentation/BrickDocumentation/ChangeColorByNBrick");
163+
brickToHelpUrlMapping.put("org.catrobat.catroid.content.bricks.SetThreadColorBrick",
164+
"https://wiki.catrobat.org/bin/view/Documentation/BrickDocumentation/SetThreadColorBrick");
163165
brickToHelpUrlMapping.put("org.catrobat.catroid.content.bricks.TurnLeftSpeedBrick",
164166
"https://wiki.catrobat.org/bin/view/Documentation/BrickDocumentation/TurnLeftSpeedBrick");
165167
brickToHelpUrlMapping.put("org.catrobat.catroid.content.bricks.LegoEv3PlayToneBrick",

‎catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/StitchActionTest.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525

2626
import android.graphics.PointF;
2727

28+
import com.badlogic.gdx.graphics.Color;
29+
2830
import org.catrobat.catroid.ProjectManager;
2931
import org.catrobat.catroid.content.ActionFactory;
3032
import org.catrobat.catroid.content.Project;
@@ -78,14 +80,15 @@ public void tearDown() {
7880
public void testAddSingleStitchPoint() {
7981
ActionFactory.createStitchAction(testSprite1).act(1f);
8082
Mockito.verify(StageActivity.stageListener.embroideryPatternManager, Mockito.times(1)).addStitchCommand(
81-
Mockito.eq(new DSTStitchCommand(spriteCoords1.x, spriteCoords1.y, testSprite1.look.getZIndex(), testSprite1)));
83+
Mockito.eq(new DSTStitchCommand(spriteCoords1.x, spriteCoords1.y,
84+
testSprite1.look.getZIndex(), testSprite1, Color.BLACK)));
8285
}
8386

8487
@Test
8588
public void testAddPointsTwoSprites() {
8689
ActionFactory.createStitchAction(testSprite1).act(1f);
8790
ActionFactory.createStitchAction(testSprite2).act(1f);
88-
Mockito.verify(StageActivity.stageListener.embroideryPatternManager, Mockito.times(1)).addStitchCommand(new DSTStitchCommand(spriteCoords1.x, spriteCoords1.y, testSprite1.look.getZIndex(), testSprite1));
89-
Mockito.verify(StageActivity.stageListener.embroideryPatternManager, Mockito.times(1)).addStitchCommand(new DSTStitchCommand(spriteCoords2.x, spriteCoords2.y, testSprite2.look.getZIndex(), testSprite2));
91+
Mockito.verify(StageActivity.stageListener.embroideryPatternManager, Mockito.times(1)).addStitchCommand(new DSTStitchCommand(spriteCoords1.x, spriteCoords1.y, testSprite1.look.getZIndex(), testSprite1, Color.BLACK));
92+
Mockito.verify(StageActivity.stageListener.embroideryPatternManager, Mockito.times(1)).addStitchCommand(new DSTStitchCommand(spriteCoords2.x, spriteCoords2.y, testSprite2.look.getZIndex(), testSprite2, Color.BLACK));
9093
}
9194
}

‎catroid/src/androidTest/java/org/catrobat/catroid/test/content/bricks/BrickCategoryTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@
170170
import org.catrobat.catroid.content.bricks.SetRotationStyleBrick;
171171
import org.catrobat.catroid.content.bricks.SetSizeToBrick;
172172
import org.catrobat.catroid.content.bricks.SetTempoBrick;
173+
import org.catrobat.catroid.content.bricks.SetThreadColorBrick;
173174
import org.catrobat.catroid.content.bricks.SetTransparencyBrick;
174175
import org.catrobat.catroid.content.bricks.SetVariableBrick;
175176
import org.catrobat.catroid.content.bricks.SetVelocityBrick;
@@ -267,6 +268,7 @@ public static Collection<Object[]> data() {
267268
SetBounceBrick.class,
268269
SetFrictionBrick.class)},
269270
{"Embroidery", Arrays.asList(StitchBrick.class,
271+
SetThreadColorBrick.class,
270272
RunningStitchBrick.class,
271273
ZigZagStitchBrick.class,
272274
TripleStitchBrick.class,

‎catroid/src/androidTest/java/org/catrobat/catroid/test/content/bricks/RecentBricksTest.java‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
import static androidx.test.espresso.action.ViewActions.click;
5353
import static androidx.test.espresso.action.ViewActions.scrollTo;
5454
import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
55-
import static androidx.test.espresso.assertion.ViewAssertions.matches;
5655
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
5756
import static androidx.test.espresso.matcher.ViewMatchers.withId;
5857
import static androidx.test.espresso.matcher.ViewMatchers.withText;
@@ -89,19 +88,14 @@ public void testCheckNonBackgroundBricksAreHiddenForBackgroundSprites() {
8988
onView(withText(spriteName)).perform(click());
9089

9190
onView(withId(R.id.button_add)).perform(click());
92-
onView(withText(R.string.category_pen)).perform(waitFor(isDisplayed(), 5000));
93-
onView(withText(R.string.category_pen)).perform(scrollTo(), click());
94-
onView(withText(R.string.brick_clear_background)).perform(scrollTo(), click());
95-
onView(withId(android.R.id.list)).perform(click());
96-
97-
onView(withId(R.id.button_add)).perform(click());
98-
onView(withText(R.string.category_pen)).perform(scrollTo(), click());
99-
onView(withText(R.string.brick_stamp)).perform(scrollTo(), click());
91+
onView(withText(R.string.category_motion)).perform(scrollTo(), click());
92+
onView(withText(R.string.brick_if_on_edge_bounce)).perform(scrollTo());
93+
onView(withText(R.string.brick_if_on_edge_bounce)).perform(waitFor(isDisplayed(), 2000), click());
10094
onView(withId(android.R.id.list)).perform(click());
10195

10296
onView(withId(R.id.button_add)).perform(click());
10397
onView(withText(R.string.category_recently_used)).perform(click());
104-
onBrickAtPosition(1).checkShowsText(R.string.brick_stamp);
98+
onBrickAtPosition(1).checkShowsText(R.string.brick_if_on_edge_bounce);
10599

106100
pressBack();
107101
pressBack();
@@ -110,8 +104,7 @@ public void testCheckNonBackgroundBricksAreHiddenForBackgroundSprites() {
110104
onView(withText(R.string.background)).perform(click());
111105
onView(withId(R.id.button_add)).perform(click());
112106
onView(withText(R.string.category_recently_used)).perform(click());
113-
onView(withText(R.string.brick_stamp)).check(doesNotExist());
114-
onView(withText(R.string.brick_clear_background)).check(matches(isDisplayed()));
107+
onView(withText(R.string.brick_if_on_edge_bounce)).check(doesNotExist());
115108
}
116109

117110
@After

‎catroid/src/androidTest/java/org/catrobat/catroid/test/embroidery/DSTFileGeneratorTest.java‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
package org.catrobat.catroid.test.embroidery;
2525

2626
import com.android.dex.util.FileUtils;
27+
import com.badlogic.gdx.graphics.Color;
2728

2829
import org.catrobat.catroid.ProjectManager;
2930
import org.catrobat.catroid.common.Constants;
@@ -72,15 +73,15 @@ public void setUp() throws IOException {
7273
@Test
7374
public void testWriteToSampleDSTFile() throws IOException {
7475
EmbroideryStream stream = new DSTStream(new DSTHeader());
75-
stream.addStitchPoint(-10, 0);
76-
stream.addStitchPoint(10, 0);
77-
stream.addStitchPoint(10, 10);
78-
stream.addStitchPoint(0, 15);
79-
stream.addStitchPoint(-10, 10);
80-
stream.addStitchPoint(-10, 0);
81-
stream.addStitchPoint(10, 10);
82-
stream.addStitchPoint(-10, 10);
83-
stream.addStitchPoint(10, 0);
76+
stream.addStitchPoint(-10, 0, Color.BLACK);
77+
stream.addStitchPoint(10, 0, Color.BLACK);
78+
stream.addStitchPoint(10, 10, Color.BLACK);
79+
stream.addStitchPoint(0, 15, Color.BLACK);
80+
stream.addStitchPoint(-10, 10, Color.BLACK);
81+
stream.addStitchPoint(-10, 0, Color.BLACK);
82+
stream.addStitchPoint(10, 10, Color.BLACK);
83+
stream.addStitchPoint(-10, 10, Color.BLACK);
84+
stream.addStitchPoint(10, 0, Color.BLACK);
8485
DSTFileGenerator fileGenerator = new DSTFileGenerator(stream);
8586
fileGenerator.writeToDSTFile(dstFile);
8687

@@ -97,17 +98,17 @@ public void testWriteToSampleDSTFile() throws IOException {
9798
}
9899

99100
private void addArrowToStream(EmbroideryStream stream, int shiftFactor) {
100-
stream.addStitchPoint(0, shiftFactor);
101-
stream.addStitchPoint(40, -40 + shiftFactor);
102-
stream.addStitchPoint(-40, -40 + shiftFactor);
103-
stream.addStitchPoint(0, shiftFactor);
101+
stream.addStitchPoint(0, shiftFactor, Color.BLACK);
102+
stream.addStitchPoint(40, -40 + shiftFactor, Color.BLACK);
103+
stream.addStitchPoint(-40, -40 + shiftFactor, Color.BLACK);
104+
stream.addStitchPoint(0, shiftFactor, Color.BLACK);
104105
}
105106

106107
private void addColorChangeAndJumpToStream(EmbroideryStream stream, int shiftFactor) {
107108
stream.addColorChange();
108-
stream.addStitchPoint(0, shiftFactor);
109+
stream.addStitchPoint(0, shiftFactor, Color.BLACK);
109110
stream.addJump();
110-
stream.addStitchPoint(0, shiftFactor);
111+
stream.addStitchPoint(0, shiftFactor, Color.BLACK);
111112
}
112113

113114
@Test

‎catroid/src/androidTest/java/org/catrobat/catroid/test/embroidery/DSTPatternManagerTest.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
package org.catrobat.catroid.test.embroidery;
2525

26+
import com.badlogic.gdx.graphics.Color;
27+
2628
import org.catrobat.catroid.content.Sprite;
2729
import org.catrobat.catroid.embroidery.DSTPatternManager;
2830
import org.catrobat.catroid.embroidery.DSTStitchCommand;
@@ -101,14 +103,14 @@ public void testClearEmbroideryPattern() {
101103

102104
@Test
103105
public void testInvalidPattern() {
104-
patternManager.addStitchCommand(new DSTStitchCommand(0, 0, 0, sprite));
106+
patternManager.addStitchCommand(new DSTStitchCommand(0, 0, 0, sprite, Color.BLACK));
105107
assertFalse(patternManager.validPatternExists());
106108
}
107109

108110
@Test
109111
public void testValidPattern() {
110-
patternManager.addStitchCommand(new DSTStitchCommand(0, 0, 0, sprite));
111-
patternManager.addStitchCommand(new DSTStitchCommand(0, 1, 0, sprite));
112+
patternManager.addStitchCommand(new DSTStitchCommand(0, 0, 0, sprite, Color.BLACK));
113+
patternManager.addStitchCommand(new DSTStitchCommand(0, 1, 0, sprite, Color.BLACK));
112114
assertTrue(patternManager.validPatternExists());
113115
}
114116

@@ -119,18 +121,18 @@ public void testEmptyEmbroideryPattern() {
119121

120122
@Test
121123
public void testSingleLayerEmbroideryPatternList() {
122-
StitchCommand command = new DSTStitchCommand(0, 0, 0, sprite);
124+
StitchCommand command = new DSTStitchCommand(0, 0, 0, sprite, Color.BLACK);
123125
patternManager.addStitchCommand(command);
124126

125127
assertEquals(1, patternManager.getEmbroideryPatternList().size());
126-
assertEquals(new DSTStitchPoint(command.getX(), command.getY()),
128+
assertEquals(new DSTStitchPoint(command.getX(), command.getY(), Color.BLACK),
127129
patternManager.getEmbroideryPatternList().get(0));
128130
}
129131

130132
@Test
131133
public void testMultilayerEmbroideryPatternList() {
132-
patternManager.addStitchCommand(new DSTStitchCommand(0, 0, 0, sprite));
133-
patternManager.addStitchCommand(new DSTStitchCommand(0, 0, 1, sprite));
134+
patternManager.addStitchCommand(new DSTStitchCommand(0, 0, 0, sprite, Color.BLACK));
135+
patternManager.addStitchCommand(new DSTStitchCommand(0, 0, 1, sprite, Color.BLACK));
134136

135137
assertEquals(5, patternManager.getEmbroideryPatternList().size());
136138
assertTrue(patternManager.getEmbroideryPatternList().get(1).isColorChangePoint());

0 commit comments

Comments
 (0)