diff --git a/api/src/main/java/ch/liip/timeforcoffee/api/mappers/DepartureMapper.java b/api/src/main/java/ch/liip/timeforcoffee/api/mappers/DepartureMapper.java index a717109..490cb68 100644 --- a/api/src/main/java/ch/liip/timeforcoffee/api/mappers/DepartureMapper.java +++ b/api/src/main/java/ch/liip/timeforcoffee/api/mappers/DepartureMapper.java @@ -37,7 +37,7 @@ public static Departure fromBackend(ch.liip.timeforcoffee.backend.Departure back backendDeparture.getPlatform(), colorFg, colorBg, - false, + backendDeparture.isAccessible(), false ); } diff --git a/backend/src/main/java/ch/liip/timeforcoffee/backend/Departure.java b/backend/src/main/java/ch/liip/timeforcoffee/backend/Departure.java index 0263117..3e55be2 100644 --- a/backend/src/main/java/ch/liip/timeforcoffee/backend/Departure.java +++ b/backend/src/main/java/ch/liip/timeforcoffee/backend/Departure.java @@ -5,6 +5,7 @@ public class Departure { private Station destination; private String line; private String platform; + private boolean accessible; private Color color; private Time departure; private Time arrival; @@ -23,6 +24,10 @@ public String getPlatform() { return platform; } + public boolean isAccessible() { + return accessible; + } + public Color getColor() { return color; } diff --git a/build.gradle b/build.gradle index 1e18349..ce34979 100644 --- a/build.gradle +++ b/build.gradle @@ -32,6 +32,8 @@ ext { KEYSTORE_PATH = project.hasProperty('keystoreFilePath') ? project.property('keystoreFilePath') : "." KEYSTORE_STORE_PASS = project.hasProperty('keystoreStorePass') ? project.property('keystoreStorePass') : "" + BACKEND_DEV_URL = "https://timeforcoffee-backend-staging.herokuapp.com" + BACKEND_PROD_URL = "https://timeforcoffee-backend.herokuapp.com" BACKEND_BASIC_AUTH_USERNAME = project.hasProperty('backendBasicAuthUsername') ? project.property('backendBasicAuthUsername') : "" BACKEND_BASIC_AUTH_PASSWORD = project.hasProperty('backendBasicAuthPassword') ? project.property('backendBasicAuthPassword') : "" diff --git a/mobile/build.gradle b/mobile/build.gradle index 96e1b31..5c17f19 100644 --- a/mobile/build.gradle +++ b/mobile/build.gradle @@ -46,12 +46,14 @@ android { minifyEnabled false applicationIdSuffix '.dev' versionNameSuffix '-DEV' + buildConfigField "String", "BACKEND_URL", "\"" + project.BACKEND_DEV_URL + "\"" } release { debuggable false minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' signingConfig signingConfigs.release + buildConfigField "String", "BACKEND_URL", "\"" + project.BACKEND_PROD_URL + "\"" } } flavorDimensions "mobile" diff --git a/mobile/src/main/java/ch/liip/timeforcoffee/TimeForCoffeeModule.java b/mobile/src/main/java/ch/liip/timeforcoffee/TimeForCoffeeModule.java index 610a0a5..2f9e51a 100644 --- a/mobile/src/main/java/ch/liip/timeforcoffee/TimeForCoffeeModule.java +++ b/mobile/src/main/java/ch/liip/timeforcoffee/TimeForCoffeeModule.java @@ -60,7 +60,7 @@ BackendService provideBackendService() { .create(); RestAdapter restAdapter = new RestAdapter.Builder() - .setEndpoint("https://timeforcoffee-backend.herokuapp.com") + .setEndpoint(BuildConfig.BACKEND_URL) .setConverter(new GsonConverter(gson)) .setRequestInterceptor(new RequestInterceptor() { @Override