Skip to content

Commit

Permalink
Merge pull request #4616 from dorianpercic/CATROID-1465
Browse files Browse the repository at this point in the history 
CATROID-1465 Add sprite from library gets downloaded to current project
  • Loading branch information
@juliajulie95
juliajulie95 authored Aug 26, 2022
2 parents 8a5885e + 98ec5f8 commit 2e9dd66
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion catroid/src/catroid/java/org/catrobat/catroid/common/FlavoredConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public final class FlavoredConstants {
Environment.getExternalStorageDirectory(), POCKET_CODE_EXTERNAL_STORAGE_FOLDER_NAME);

// Media Library:
public static final String LIBRARY_BASE_URL = BASE_URL_HTTPS + "download-media/";
public static final String LIBRARY_BASE_URL = MAIN_URL_HTTPS + "/app/download-media/";
public static final String LIBRARY_LOOKS_URL = BASE_URL_HTTPS + "media-library/looks";
public static final String LIBRARY_OBJECT_URL = BASE_URL_HTTPS + "media-library/objects";
public static final String LIBRARY_BACKGROUNDS_URL_PORTRAIT = BASE_URL_HTTPS + "media-library/backgrounds-portrait";
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/createAtSchool/java/org/catrobat/catroid/common/FlavoredConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public final class FlavoredConstants {
Environment.getExternalStorageDirectory().getAbsolutePath(), POCKET_CODE_EXTERNAL_STORAGE_FOLDER_NAME);

// Media Library:
public static final String LIBRARY_BASE_URL = BASE_URL_HTTPS + "download-media/";
public static final String LIBRARY_BASE_URL = MAIN_URL_HTTPS + "/app/download-media/";
public static final String LIBRARY_LOOKS_URL = BASE_URL_HTTPS + "media-library/looks";
public static final String LIBRARY_OBJECT_URL = BASE_URL_HTTPS + "media-library/objects";
public static final String LIBRARY_BACKGROUNDS_URL_PORTRAIT = BASE_URL_HTTPS + "media-library/backgrounds-portrait";
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/embroideryDesigner/java/org/catrobat/catroid/common/FlavoredConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public final class FlavoredConstants {
Environment.getExternalStorageDirectory().getAbsolutePath(), POCKET_CODE_EXTERNAL_STORAGE_FOLDER_NAME);

// Media Library:
public static final String LIBRARY_BASE_URL = BASE_URL_HTTPS + "download-media/";
public static final String LIBRARY_BASE_URL = MAIN_URL_HTTPS + "/app/download-media/";
public static final String LIBRARY_LOOKS_URL = BASE_URL_HTTPS + "media-library/looks";
public static final String LIBRARY_OBJECT_URL = BASE_URL_HTTPS + "media-library/objects";
public static final String LIBRARY_BACKGROUNDS_URL_PORTRAIT = BASE_URL_HTTPS + "media-library/backgrounds-portrait";
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/lunaAndCat/java/org/catrobat/catroid/common/FlavoredConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public final class FlavoredConstants {
Environment.getExternalStorageDirectory().getAbsolutePath(), POCKET_CODE_EXTERNAL_STORAGE_FOLDER_NAME);

// Media Library:
public static final String LIBRARY_BASE_URL = BASE_URL_HTTPS + "download-media/";
public static final String LIBRARY_BASE_URL = MAIN_URL_HTTPS + "/app/download-media/";
public static final String LIBRARY_LOOKS_URL = BASE_URL_HTTPS + "media-library/looks";
public static final String LIBRARY_OBJECT_URL = BASE_URL_HTTPS + "media-library/objects";
public static final String LIBRARY_BACKGROUNDS_URL_PORTRAIT = BASE_URL_HTTPS + "media-library/backgrounds-portrait";
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/mindstorms/java/org/catrobat/catroid/common/FlavoredConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public final class FlavoredConstants {
Environment.getExternalStorageDirectory().getAbsolutePath(), POCKET_CODE_EXTERNAL_STORAGE_FOLDER_NAME);

// Media Library:
public static final String LIBRARY_BASE_URL = BASE_URL_HTTPS + "download-media/";
public static final String LIBRARY_BASE_URL = MAIN_URL_HTTPS + "/app/download-media/";
public static final String LIBRARY_LOOKS_URL = BASE_URL_HTTPS + "media-library/looks";
public static final String LIBRARY_OBJECT_URL = BASE_URL_HTTPS + "media-library/objects";
public static final String LIBRARY_BACKGROUNDS_URL_PORTRAIT = BASE_URL_HTTPS + "media-library/backgrounds-portrait";
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/phiro/java/org/catrobat/catroid/common/FlavoredConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public final class FlavoredConstants {
Environment.getExternalStorageDirectory().getAbsolutePath(), POCKET_CODE_EXTERNAL_STORAGE_FOLDER_NAME);

// Media Library:
public static final String LIBRARY_BASE_URL = BASE_URL_HTTPS + "download-media/";
public static final String LIBRARY_BASE_URL = MAIN_URL_HTTPS + "/app/download-media/";
public static final String LIBRARY_LOOKS_URL = BASE_URL_HTTPS + "media-library/looks";
public static final String LIBRARY_OBJECT_URL = BASE_URL_HTTPS + "media-library/objects";
public static final String LIBRARY_BACKGROUNDS_URL_PORTRAIT = BASE_URL_HTTPS + "media-library/backgrounds-portrait";
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/pocketCodeBeta/java/org/catrobat/catroid/common/FlavoredConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public final class FlavoredConstants {
Environment.getExternalStorageDirectory(), POCKET_CODE_EXTERNAL_STORAGE_FOLDER_NAME);

// Media Library:
public static final String LIBRARY_BASE_URL = BASE_URL_HTTPS + "download-media/";
public static final String LIBRARY_BASE_URL = MAIN_URL_HTTPS + "/app/download-media/";
public static final String LIBRARY_LOOKS_URL = BASE_URL_HTTPS + "media-library/looks";
public static final String LIBRARY_OBJECT_URL = BASE_URL_HTTPS + "media-library/objects";
public static final String LIBRARY_BACKGROUNDS_URL_PORTRAIT = BASE_URL_HTTPS + "media-library/backgrounds-portrait";
Expand Down
2 changes: 1 addition & 1 deletion catroid/src/standalone/java/org/catrobat/catroid/common/FlavoredConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public final class FlavoredConstants {
Environment.getExternalStorageDirectory().getAbsolutePath(), POCKET_CODE_EXTERNAL_STORAGE_FOLDER_NAME);

// Media Library:
public static final String LIBRARY_BASE_URL = BASE_URL_HTTPS + "download-media/";
public static final String LIBRARY_BASE_URL = MAIN_URL_HTTPS + "/app/download-media/";
public static final String LIBRARY_LOOKS_URL = BASE_URL_HTTPS + "media-library/looks";
public static final String LIBRARY_OBJECT_URL = BASE_URL_HTTPS + "media-library/objects";
public static final String LIBRARY_BACKGROUNDS_URL_PORTRAIT = BASE_URL_HTTPS + "media-library/backgrounds-portrait";
Expand Down

0 comments on commit 2e9dd66

Please sign in to comment.