Skip to content

Commit 54a6e30

Browse files
thmqthmq
committed
CATROID-12 Luna&Cat Flavor
 - cleaned up styles and colors. - added missing folders for flavors (catroid, standalone). - added adaptable constants for all flavors. - moved app_name from main res set to flavors (to ensure correct fallback behavior). - added Luna&Cat flavor (with colors and icons). - added drawables for default Luna&Cat project. - changed default project bird name to animal. - changed "Rate Pocket Code" in dialog to "Rate App".
1 parent 01dc83f commit 54a6e30

File tree

182 files changed

+1554
-893
lines changed

Some content is hidden

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

182 files changed

+1554
-893
lines changed

‎automationScripts/createBetaTestingPocketCodeAPK.py

+3
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ def buildApk():
3838
shutil.copyfile("../catroid/build/outputs/apk/catroid/debug/catroid-catroid-debug.apk", "./catroid-catroid-debug"
3939
+ timestamp + ".apk")
4040

41+
shutil.copyfile("../catroid/build/outputs/apk/lunaAndCat/debug/catroid-lunaAndCat-debug.apk", "./catroid-lunaAndCat-debug"
42+
+ timestamp + ".apk")
43+
4144
def restoreBuildGradleAndAndroidManifest():
4245
shutil.move("../catroid/build.gradle_backup", "../catroid/build.gradle")
4346
shutil.move("../catroid/src/main/AndroidManifest.xml_backup", "../catroid/src/main/AndroidManifest.xml")

‎catroid/build.gradle

+11-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,17 @@ android {
209209
buildConfigField "String", "PROJECT_NAME", "\"No Standalone Project\""
210210
buildConfigField "boolean", "FEATURE_APK_GENERATOR_ENABLED", "false"
211211
buildConfigField "boolean", "FEATURE_CLOUD_MESSAGING_ENABLED", "false"
212-
buildConfigField "boolean", "CRASHLYTICS_CRASH_REPORT_ENABLED", "false"
212+
buildConfigField "boolean", "CRASHLYTICS_CRASH_REPORT_ENABLED", "true"
213+
}
214+
215+
lunaAndCat {
216+
dimension "default"
217+
applicationId appId
218+
buildConfigField "String", "START_PROJECT", "\"No Starting Project\""
219+
buildConfigField "String", "PROJECT_NAME", "\"No Standalone Project\""
220+
buildConfigField "boolean", "FEATURE_APK_GENERATOR_ENABLED", "false"
221+
buildConfigField "boolean", "FEATURE_CLOUD_MESSAGING_ENABLED", "false"
222+
buildConfigField "boolean", "CRASHLYTICS_CRASH_REPORT_ENABLED", "true"
213223
}
214224

215225
phiro {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
import static junit.framework.Assert.fail;
5656

5757
import static org.catrobat.catroid.common.Constants.CURRENT_CATROBAT_LANGUAGE_VERSION;
58-
import static org.catrobat.catroid.common.Constants.DEFAULT_ROOT_DIRECTORY;
58+
import static org.catrobat.catroid.common.FlavoredConstants.DEFAULT_ROOT_DIRECTORY;
5959

6060
@RunWith(AndroidJUnit4.class)
6161
public class ProjectManagerTest {

‎catroid/src/androidTest/java/org/catrobat/catroid/test/common/DefaultProjectHandlerTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import android.support.test.runner.AndroidJUnit4;
2727

2828
import org.catrobat.catroid.ProjectManager;
29-
import org.catrobat.catroid.common.Constants;
3029
import org.catrobat.catroid.common.DefaultProjectHandler;
30+
import org.catrobat.catroid.common.FlavoredConstants;
3131
import org.catrobat.catroid.content.Project;
3232
import org.catrobat.catroid.content.Scene;
3333
import org.catrobat.catroid.content.Sprite;
@@ -59,7 +59,7 @@ public void setUp() {
5959

6060
@After
6161
public void tearDown() throws Exception {
62-
StorageOperations.deleteDir(new File(Constants.DEFAULT_ROOT_DIRECTORY, projectName));
62+
StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, projectName));
6363
}
6464

6565
@Test

‎catroid/src/androidTest/java/org/catrobat/catroid/test/content/MessageContainerTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import android.support.test.runner.AndroidJUnit4;
2727

2828
import org.catrobat.catroid.ProjectManager;
29-
import org.catrobat.catroid.common.Constants;
29+
import org.catrobat.catroid.common.FlavoredConstants;
3030
import org.catrobat.catroid.content.BroadcastScript;
3131
import org.catrobat.catroid.content.Project;
3232
import org.catrobat.catroid.content.Script;
@@ -66,8 +66,8 @@ public void setUp() throws Exception {
6666

6767
@After
6868
public void tearDown() throws Exception {
69-
StorageOperations.deleteDir(new File(Constants.DEFAULT_ROOT_DIRECTORY, projectName1));
70-
StorageOperations.deleteDir(new File(Constants.DEFAULT_ROOT_DIRECTORY, projectName2));
69+
StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, projectName1));
70+
StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, projectName2));
7171
}
7272

7373
@Test

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import com.badlogic.gdx.scenes.scene2d.Action;
2929

3030
import org.catrobat.catroid.ProjectManager;
31-
import org.catrobat.catroid.common.Constants;
31+
import org.catrobat.catroid.common.FlavoredConstants;
3232
import org.catrobat.catroid.common.LookData;
3333
import org.catrobat.catroid.common.ScreenValues;
3434
import org.catrobat.catroid.content.ActionFactory;
@@ -64,7 +64,7 @@ public class NextLookActionTest {
6464

6565
@Before
6666
public void setUp() throws Exception {
67-
projectDir = new File(Constants.DEFAULT_ROOT_DIRECTORY, projectName);
67+
projectDir = new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, projectName);
6868

6969
if (projectDir.exists()) {
7070
StorageOperations.deleteDir(projectDir);

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
import com.badlogic.gdx.scenes.scene2d.Action;
2828

29-
import org.catrobat.catroid.common.Constants;
29+
import org.catrobat.catroid.common.FlavoredConstants;
3030
import org.catrobat.catroid.common.LookData;
3131
import org.catrobat.catroid.content.ActionFactory;
3232
import org.catrobat.catroid.content.Sprite;
@@ -51,7 +51,7 @@ public class PreviousLookActionTest {
5151

5252
@Before
5353
public void setUp() throws Exception {
54-
testImage = new File(Constants.DEFAULT_ROOT_DIRECTORY, "testImage.png");
54+
testImage = new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, "testImage.png");
5555
sprite = new Sprite("cat");
5656
actionFactory = sprite.getActionFactory();
5757
}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import com.badlogic.gdx.scenes.scene2d.Action;
3030

3131
import org.catrobat.catroid.ProjectManager;
32-
import org.catrobat.catroid.common.Constants;
32+
import org.catrobat.catroid.common.FlavoredConstants;
3333
import org.catrobat.catroid.common.LookData;
3434
import org.catrobat.catroid.common.ScreenValues;
3535
import org.catrobat.catroid.content.ActionFactory;
@@ -61,7 +61,7 @@ public class SetLookActionTest {
6161

6262
@Before
6363
public void setUp() throws Exception {
64-
File projectDir = new File(Constants.DEFAULT_ROOT_DIRECTORY, projectName);
64+
File projectDir = new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, projectName);
6565

6666
if (projectDir.exists()) {
6767
StorageOperations.deleteDir(projectDir);
@@ -99,7 +99,7 @@ public void setUp() throws Exception {
9999

100100
@After
101101
public void tearDown() throws Exception {
102-
File projectDir = new File(Constants.DEFAULT_ROOT_DIRECTORY, projectName);
102+
File projectDir = new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, projectName);
103103

104104
if (projectDir.exists()) {
105105
StorageOperations.deleteDir(projectDir);

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import com.badlogic.gdx.scenes.scene2d.Action;
2929

3030
import org.catrobat.catroid.ProjectManager;
31-
import org.catrobat.catroid.common.Constants;
31+
import org.catrobat.catroid.common.FlavoredConstants;
3232
import org.catrobat.catroid.common.LookData;
3333
import org.catrobat.catroid.common.ScreenValues;
3434
import org.catrobat.catroid.content.ActionFactory;
@@ -62,7 +62,7 @@ public class TurnLeftActionTest {
6262

6363
@Before
6464
public void setUp() throws Exception {
65-
File projectDir = new File(Constants.DEFAULT_ROOT_DIRECTORY, projectName);
65+
File projectDir = new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, projectName);
6666

6767
if (projectDir.exists()) {
6868
StorageOperations.deleteDir(projectDir);
@@ -89,7 +89,7 @@ public void setUp() throws Exception {
8989

9090
@After
9191
public void tearDown() throws Exception {
92-
File projectDir = new File(Constants.DEFAULT_ROOT_DIRECTORY, projectName);
92+
File projectDir = new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, projectName);
9393

9494
if (projectDir.exists()) {
9595
StorageOperations.deleteDir(projectDir);

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import com.badlogic.gdx.scenes.scene2d.Action;
2929

3030
import org.catrobat.catroid.ProjectManager;
31-
import org.catrobat.catroid.common.Constants;
31+
import org.catrobat.catroid.common.FlavoredConstants;
3232
import org.catrobat.catroid.common.LookData;
3333
import org.catrobat.catroid.common.ScreenValues;
3434
import org.catrobat.catroid.content.ActionFactory;
@@ -62,7 +62,7 @@ public class TurnRightActionTest {
6262

6363
@Before
6464
public void setUp() throws Exception {
65-
File projectDir = new File(Constants.DEFAULT_ROOT_DIRECTORY, projectName);
65+
File projectDir = new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, projectName);
6666

6767
if (projectDir.exists()) {
6868
StorageOperations.deleteDir(projectDir);
@@ -89,7 +89,7 @@ public void setUp() throws Exception {
8989

9090
@After
9191
public void tearDown() throws Exception {
92-
File projectDir = new File(Constants.DEFAULT_ROOT_DIRECTORY, projectName);
92+
File projectDir = new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, projectName);
9393

9494
if (projectDir.exists()) {
9595
StorageOperations.deleteDir(projectDir);

‎catroid/src/androidTest/java/org/catrobat/catroid/test/devices/arduino/ArduinoSettingsTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import android.support.test.runner.AndroidJUnit4;
2929

3030
import org.catrobat.catroid.ProjectManager;
31-
import org.catrobat.catroid.common.Constants;
31+
import org.catrobat.catroid.common.FlavoredConstants;
3232
import org.catrobat.catroid.content.Project;
3333
import org.catrobat.catroid.content.SingleSprite;
3434
import org.catrobat.catroid.content.Sprite;
@@ -80,7 +80,7 @@ public void testIfArduinoBricksAreEnabledIfItItUsedInAProgram() throws IOExcepti
8080

8181
assertTrue(SettingsFragment.isArduinoSharedPreferenceEnabled(context));
8282

83-
StorageOperations.deleteDir(new File(Constants.DEFAULT_ROOT_DIRECTORY, projectName));
83+
StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, projectName));
8484
}
8585

8686
private void createProjectArduino() throws InterruptedException {

‎catroid/src/androidTest/java/org/catrobat/catroid/test/devices/phiro/PhiroSettingsTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import android.support.test.runner.AndroidJUnit4;
2929

3030
import org.catrobat.catroid.ProjectManager;
31-
import org.catrobat.catroid.common.Constants;
31+
import org.catrobat.catroid.common.FlavoredConstants;
3232
import org.catrobat.catroid.content.Project;
3333
import org.catrobat.catroid.content.SingleSprite;
3434
import org.catrobat.catroid.content.Sprite;
@@ -83,7 +83,7 @@ public void testIfPhiroBricksAreEnabledIfItItUsedInAProgram() throws IOException
8383

8484
assertTrue(SettingsFragment.isPhiroSharedPreferenceEnabled(context));
8585

86-
StorageOperations.deleteDir(new File(Constants.DEFAULT_ROOT_DIRECTORY, projectName));
86+
StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, projectName));
8787
}
8888

8989
private void createProjectPhiro() throws InterruptedException {

‎catroid/src/androidTest/java/org/catrobat/catroid/test/io/BackwardCompatibleCatrobatLanguageXStreamTest.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import android.support.test.InstrumentationRegistry;
2626
import android.support.test.runner.AndroidJUnit4;
2727

28-
import org.catrobat.catroid.common.Constants;
28+
import org.catrobat.catroid.common.FlavoredConstants;
2929
import org.catrobat.catroid.content.Project;
3030
import org.catrobat.catroid.io.StorageOperations;
3131
import org.catrobat.catroid.io.XstreamSerializer;
@@ -83,8 +83,8 @@ public void testLoadingProjectsOfCatrobatLanguageVersion08() throws Exception {
8383
assertNotNull(colorLeanerBalloonsProject);
8484
assertEquals(PROJECT_NAME_COLOR_LEANER_BALLOONS, colorLeanerBalloonsProject.getName().toLowerCase(Locale.getDefault()));
8585

86-
StorageOperations.deleteDir(new File(Constants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_FALLING_BALLS));
87-
StorageOperations.deleteDir(new File(Constants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_COLOR_LEANER_BALLOONS));
86+
StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_FALLING_BALLS));
87+
StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_COLOR_LEANER_BALLOONS));
8888
}
8989

9090
@Test
@@ -104,8 +104,8 @@ public void testLoadingProjectsOfCatrobatLanguageVersion09() throws Exception {
104104
assertNotNull(whipProject);
105105
assertEquals(PROJECT_NAME_WHIP, whipProject.getName().toLowerCase(Locale.getDefault()));
106106

107-
StorageOperations.deleteDir(new File(Constants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_PONG_STARTER));
108-
StorageOperations.deleteDir(new File(Constants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_WHIP));
107+
StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_PONG_STARTER));
108+
StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_WHIP));
109109
}
110110

111111
@Test
@@ -132,9 +132,9 @@ public void testLoadingProjectsOfCatrobatLanguageVersion091() throws Exception {
132132
assertNotNull(allBricksProject);
133133
assertEquals(PROJECT_NAME_ALL_BRICKS, allBricksProject.getName().toLowerCase(Locale.getDefault()));
134134

135-
StorageOperations.deleteDir(new File(Constants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_AIR_FIGHT));
136-
StorageOperations.deleteDir(new File(Constants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_XRAY_PHONE));
137-
StorageOperations.deleteDir(new File(Constants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_ALL_BRICKS));
135+
StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_AIR_FIGHT));
136+
StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_XRAY_PHONE));
137+
StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_ALL_BRICKS));
138138
}
139139

140140
@Test
@@ -147,7 +147,7 @@ public void testLoadingProjectsOfCatrobatLanguageVersion092() throws Exception {
147147
assertNotNull(noteAndSpeakBrickProject);
148148
assertEquals(PROJECT_NAME_NOTE_AND_SPEAK_BRICK, noteAndSpeakBrickProject.getName().toLowerCase(Locale.getDefault()));
149149

150-
StorageOperations.deleteDir(new File(Constants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_NOTE_AND_SPEAK_BRICK));
150+
StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_NOTE_AND_SPEAK_BRICK));
151151
}
152152

153153
@Test
@@ -160,7 +160,7 @@ public void testLoadingProjectsOfCatrobatLanguageVersion095() throws Exception {
160160
assertNotNull(ghostBricksProject);
161161
assertEquals(PROJECT_NAME_GHOST_EFFECT_BRICKS, ghostBricksProject.getName().toLowerCase(Locale.getDefault()));
162162

163-
StorageOperations.deleteDir(new File(Constants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_GHOST_EFFECT_BRICKS));
163+
StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_GHOST_EFFECT_BRICKS));
164164
}
165165

166166
@Test
@@ -173,11 +173,11 @@ public void testLoadingLegoNxtProjectsOfCatrobatLanguageVersion092() throws Exce
173173
assertNotNull(legoProject);
174174
assertEquals(PROJECT_NAME_LEGO_NXT, legoProject.getName().toLowerCase(Locale.getDefault()));
175175

176-
StorageOperations.deleteDir(new File(Constants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_LEGO_NXT));
176+
StorageOperations.deleteDir(new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, PROJECT_NAME_LEGO_NXT));
177177
}
178178

179179
private void copyProjectFromAssets(String assetName, String projectName) throws IOException {
180180
InputStream inputStream = InstrumentationRegistry.getContext().getAssets().open(assetName);
181-
new ZipArchiver().unzip(inputStream, new File(Constants.DEFAULT_ROOT_DIRECTORY, projectName));
181+
new ZipArchiver().unzip(inputStream, new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, projectName));
182182
}
183183
}

‎catroid/src/androidTest/java/org/catrobat/catroid/test/io/ResourceImporterTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import android.support.test.InstrumentationRegistry;
2727
import android.support.test.runner.AndroidJUnit4;
2828

29-
import org.catrobat.catroid.common.Constants;
29+
import org.catrobat.catroid.common.FlavoredConstants;
3030
import org.catrobat.catroid.io.ResourceImporter;
3131
import org.catrobat.catroid.io.StorageOperations;
3232
import org.junit.After;
@@ -42,7 +42,7 @@
4242
@RunWith(AndroidJUnit4.class)
4343
public class ResourceImporterTest {
4444

45-
private File testDir = new File(Constants.DEFAULT_ROOT_DIRECTORY, "ResourceImporterTest");
45+
private File testDir = new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, "ResourceImporterTest");
4646

4747
@Before
4848
public void setUp() {

‎catroid/src/androidTest/java/org/catrobat/catroid/test/io/ziparchiver/ZipFolderTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import android.support.test.InstrumentationRegistry;
2727
import android.support.test.runner.AndroidJUnit4;
2828

29-
import org.catrobat.catroid.common.Constants;
29+
import org.catrobat.catroid.common.FlavoredConstants;
3030
import org.catrobat.catroid.io.StorageOperations;
3131
import org.catrobat.catroid.io.ZipArchiver;
3232
import org.junit.After;
@@ -48,8 +48,8 @@ public class ZipFolderTest {
4848

4949
@Before
5050
public void setUp() {
51-
outputArchive = new File(Constants.DEFAULT_ROOT_DIRECTORY, "testCompareZips.zip");
52-
projectDir = new File(Constants.DEFAULT_ROOT_DIRECTORY, "testZipProject");
51+
outputArchive = new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, "testCompareZips.zip");
52+
projectDir = new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, "testZipProject");
5353
}
5454

5555
@After

‎catroid/src/androidTest/java/org/catrobat/catroid/test/io/ziparchiver/ZipSingleFileTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
import android.support.test.runner.AndroidJUnit4;
2727

28-
import org.catrobat.catroid.common.Constants;
28+
import org.catrobat.catroid.common.FlavoredConstants;
2929
import org.catrobat.catroid.io.StorageOperations;
3030
import org.catrobat.catroid.io.ZipArchiver;
3131
import org.junit.After;
@@ -47,9 +47,9 @@ public class ZipSingleFileTest {
4747

4848
@Before
4949
public void setUp() throws IOException {
50-
outputArchive = new File(Constants.DEFAULT_ROOT_DIRECTORY, "folderToZip.zip");
51-
unzippedDir = new File(Constants.DEFAULT_ROOT_DIRECTORY, "unzippedFolder");
52-
tmpFile = File.createTempFile("test", ".png", Constants.DEFAULT_ROOT_DIRECTORY);
50+
outputArchive = new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, "folderToZip.zip");
51+
unzippedDir = new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, "unzippedFolder");
52+
tmpFile = File.createTempFile("test", ".png", FlavoredConstants.DEFAULT_ROOT_DIRECTORY);
5353
}
5454

5555
@After

‎catroid/src/androidTest/java/org/catrobat/catroid/test/physics/PhysicsLookTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import com.badlogic.gdx.utils.GdxNativesLoader;
3434

3535
import org.catrobat.catroid.ProjectManager;
36-
import org.catrobat.catroid.common.Constants;
36+
import org.catrobat.catroid.common.FlavoredConstants;
3737
import org.catrobat.catroid.common.LookData;
3838
import org.catrobat.catroid.content.Look;
3939
import org.catrobat.catroid.content.Project;
@@ -86,7 +86,7 @@ public class PhysicsLookTest {
8686
@Before
8787
public void setUp() throws Exception {
8888
physicsWorld = new PhysicsWorld(1920, 1600);
89-
projectDir = new File(Constants.DEFAULT_ROOT_DIRECTORY, projectName);
89+
projectDir = new File(FlavoredConstants.DEFAULT_ROOT_DIRECTORY, projectName);
9090
if (projectDir.exists()) {
9191
StorageOperations.deleteDir(projectDir);
9292
}

0 commit comments

Comments
 (0)