diff --git a/catroid/src/createAtSchool/java/org/catrobat/catroid/common/FlavoredConstants.java b/catroid/src/createAtSchool/java/org/catrobat/catroid/common/FlavoredConstants.java index 91711ceab41..eee15362a2e 100644 --- a/catroid/src/createAtSchool/java/org/catrobat/catroid/common/FlavoredConstants.java +++ b/catroid/src/createAtSchool/java/org/catrobat/catroid/common/FlavoredConstants.java @@ -53,12 +53,12 @@ public final class FlavoredConstants { // Media Library: 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"; - public static final String LIBRARY_BACKGROUNDS_URL_LANDSCAPE = BASE_URL_HTTPS + "media-library/backgrounds-landscape"; - public static final String LIBRARY_SOUNDS_URL = BASE_URL_HTTPS + "media-library/sounds"; - public static final String PRIVACY_POLICY_URL = "https://catrob.at/createatschoolprivacy"; + public static final String CATROBAT_BASE_URL = "https://catrobat.org/"; + public static final String CATROBAT_CONTENT_DOWNLOAD_URL = CATROBAT_BASE_URL + "wp-content/"; + public static final String CATROBAT_CONTENT_LOOKS_URL = CATROBAT_BASE_URL + "figures-download/"; + public static final String CATROBAT_CONTENT_SOUNDS_URL = CATROBAT_BASE_URL + "sounds-download/"; + public static final String CATROBAT_CONTENT_BACKGROUNDS_URL = CATROBAT_BASE_URL + "backgrounds-download/"; + public static final String PRIVACY_POLICY_URL = "https://catrob.at/privacypolicy"; private FlavoredConstants() { throw new AssertionError("No."); diff --git a/catroid/src/embroideryDesigner/java/org/catrobat/catroid/common/FlavoredConstants.java b/catroid/src/embroideryDesigner/java/org/catrobat/catroid/common/FlavoredConstants.java index 21244612c3f..a850e002a86 100644 --- a/catroid/src/embroideryDesigner/java/org/catrobat/catroid/common/FlavoredConstants.java +++ b/catroid/src/embroideryDesigner/java/org/catrobat/catroid/common/FlavoredConstants.java @@ -53,11 +53,11 @@ public final class FlavoredConstants { // Media Library: 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"; - public static final String LIBRARY_BACKGROUNDS_URL_LANDSCAPE = BASE_URL_HTTPS + "media-library/backgrounds-landscape"; - public static final String LIBRARY_SOUNDS_URL = BASE_URL_HTTPS + "media-library/sounds"; + public static final String CATROBAT_BASE_URL = "https://catrobat.org/"; + public static final String CATROBAT_CONTENT_DOWNLOAD_URL = CATROBAT_BASE_URL + "wp-content/"; + public static final String CATROBAT_CONTENT_LOOKS_URL = CATROBAT_BASE_URL + "figures-download/"; + public static final String CATROBAT_CONTENT_SOUNDS_URL = CATROBAT_BASE_URL + "sounds-download/"; + public static final String CATROBAT_CONTENT_BACKGROUNDS_URL = CATROBAT_BASE_URL + "backgrounds-download/"; public static final String PRIVACY_POLICY_URL = "https://catrob.at/privacypolicy"; private FlavoredConstants() { diff --git a/catroid/src/lunaAndCat/java/org/catrobat/catroid/common/FlavoredConstants.java b/catroid/src/lunaAndCat/java/org/catrobat/catroid/common/FlavoredConstants.java index a375ddf9e5f..c3d0219c239 100644 --- a/catroid/src/lunaAndCat/java/org/catrobat/catroid/common/FlavoredConstants.java +++ b/catroid/src/lunaAndCat/java/org/catrobat/catroid/common/FlavoredConstants.java @@ -53,11 +53,11 @@ public final class FlavoredConstants { // Media Library: 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"; - public static final String LIBRARY_BACKGROUNDS_URL_LANDSCAPE = BASE_URL_HTTPS + "media-library/backgrounds-landscape"; - public static final String LIBRARY_SOUNDS_URL = BASE_URL_HTTPS + "media-library/sounds"; + public static final String CATROBAT_BASE_URL = "https://catrobat.org/"; + public static final String CATROBAT_CONTENT_DOWNLOAD_URL = CATROBAT_BASE_URL + "wp-content/"; + public static final String CATROBAT_CONTENT_LOOKS_URL = CATROBAT_BASE_URL + "figures-download/"; + public static final String CATROBAT_CONTENT_SOUNDS_URL = CATROBAT_BASE_URL + "sounds-download/"; + public static final String CATROBAT_CONTENT_BACKGROUNDS_URL = CATROBAT_BASE_URL + "backgrounds-download/"; public static final String PRIVACY_POLICY_URL = "https://catrob.at/privacypolicy"; private FlavoredConstants() { diff --git a/catroid/src/mindstorms/java/org/catrobat/catroid/common/FlavoredConstants.java b/catroid/src/mindstorms/java/org/catrobat/catroid/common/FlavoredConstants.java index ef51e8439b5..26a8f93f0b8 100644 --- a/catroid/src/mindstorms/java/org/catrobat/catroid/common/FlavoredConstants.java +++ b/catroid/src/mindstorms/java/org/catrobat/catroid/common/FlavoredConstants.java @@ -53,13 +53,12 @@ public final class FlavoredConstants { // Media Library: 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"; - public static final String LIBRARY_BACKGROUNDS_URL_LANDSCAPE = BASE_URL_HTTPS + "media-library/backgrounds-landscape"; - public static final String LIBRARY_SOUNDS_URL = BASE_URL_HTTPS + "media-library/sounds"; + public static final String CATROBAT_BASE_URL = "https://catrobat.org/"; + public static final String CATROBAT_CONTENT_DOWNLOAD_URL = CATROBAT_BASE_URL + "wp-content/"; + public static final String CATROBAT_CONTENT_LOOKS_URL = CATROBAT_BASE_URL + "figures-download/"; + public static final String CATROBAT_CONTENT_SOUNDS_URL = CATROBAT_BASE_URL + "sounds-download/"; + public static final String CATROBAT_CONTENT_BACKGROUNDS_URL = CATROBAT_BASE_URL + "backgrounds-download/"; public static final String PRIVACY_POLICY_URL = "https://catrob.at/privacypolicy"; - private FlavoredConstants() { throw new AssertionError("No."); } diff --git a/catroid/src/phiro/java/org/catrobat/catroid/common/FlavoredConstants.java b/catroid/src/phiro/java/org/catrobat/catroid/common/FlavoredConstants.java index 4e65f662bf1..55194bd75cf 100644 --- a/catroid/src/phiro/java/org/catrobat/catroid/common/FlavoredConstants.java +++ b/catroid/src/phiro/java/org/catrobat/catroid/common/FlavoredConstants.java @@ -53,11 +53,11 @@ public final class FlavoredConstants { // Media Library: 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"; - public static final String LIBRARY_BACKGROUNDS_URL_LANDSCAPE = BASE_URL_HTTPS + "media-library/backgrounds-landscape"; - public static final String LIBRARY_SOUNDS_URL = BASE_URL_HTTPS + "media-library/sounds"; + public static final String CATROBAT_BASE_URL = "https://catrobat.org/"; + public static final String CATROBAT_CONTENT_DOWNLOAD_URL = CATROBAT_BASE_URL + "wp-content/"; + public static final String CATROBAT_CONTENT_LOOKS_URL = CATROBAT_BASE_URL + "figures-download/"; + public static final String CATROBAT_CONTENT_SOUNDS_URL = CATROBAT_BASE_URL + "sounds-download/"; + public static final String CATROBAT_CONTENT_BACKGROUNDS_URL = CATROBAT_BASE_URL + "backgrounds-download/"; public static final String PRIVACY_POLICY_URL = "https://catrob.at/privacypolicy"; private FlavoredConstants() { diff --git a/catroid/src/pocketCodeBeta/java/org/catrobat/catroid/common/FlavoredConstants.java b/catroid/src/pocketCodeBeta/java/org/catrobat/catroid/common/FlavoredConstants.java index 2e8a83e2708..0dcfd3c1ad6 100644 --- a/catroid/src/pocketCodeBeta/java/org/catrobat/catroid/common/FlavoredConstants.java +++ b/catroid/src/pocketCodeBeta/java/org/catrobat/catroid/common/FlavoredConstants.java @@ -53,11 +53,11 @@ public final class FlavoredConstants { // Media Library: 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"; - public static final String LIBRARY_BACKGROUNDS_URL_LANDSCAPE = BASE_URL_HTTPS + "media-library/backgrounds-landscape"; - public static final String LIBRARY_SOUNDS_URL = BASE_URL_HTTPS + "media-library/sounds"; + public static final String CATROBAT_BASE_URL = "https://catrobat.org/"; + public static final String CATROBAT_CONTENT_DOWNLOAD_URL = CATROBAT_BASE_URL + "wp-content/"; + public static final String CATROBAT_CONTENT_LOOKS_URL = CATROBAT_BASE_URL + "figures-download/"; + public static final String CATROBAT_CONTENT_SOUNDS_URL = CATROBAT_BASE_URL + "sounds-download/"; + public static final String CATROBAT_CONTENT_BACKGROUNDS_URL = CATROBAT_BASE_URL + "backgrounds-download/"; public static final String PRIVACY_POLICY_URL = "https://catrob.at/privacypolicy"; private FlavoredConstants() { diff --git a/catroid/src/standalone/java/org/catrobat/catroid/common/FlavoredConstants.java b/catroid/src/standalone/java/org/catrobat/catroid/common/FlavoredConstants.java index 4e65f662bf1..55194bd75cf 100644 --- a/catroid/src/standalone/java/org/catrobat/catroid/common/FlavoredConstants.java +++ b/catroid/src/standalone/java/org/catrobat/catroid/common/FlavoredConstants.java @@ -53,11 +53,11 @@ public final class FlavoredConstants { // Media Library: 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"; - public static final String LIBRARY_BACKGROUNDS_URL_LANDSCAPE = BASE_URL_HTTPS + "media-library/backgrounds-landscape"; - public static final String LIBRARY_SOUNDS_URL = BASE_URL_HTTPS + "media-library/sounds"; + public static final String CATROBAT_BASE_URL = "https://catrobat.org/"; + public static final String CATROBAT_CONTENT_DOWNLOAD_URL = CATROBAT_BASE_URL + "wp-content/"; + public static final String CATROBAT_CONTENT_LOOKS_URL = CATROBAT_BASE_URL + "figures-download/"; + public static final String CATROBAT_CONTENT_SOUNDS_URL = CATROBAT_BASE_URL + "sounds-download/"; + public static final String CATROBAT_CONTENT_BACKGROUNDS_URL = CATROBAT_BASE_URL + "backgrounds-download/"; public static final String PRIVACY_POLICY_URL = "https://catrob.at/privacypolicy"; private FlavoredConstants() {