diff --git a/app/src/main/java/de/labor_stein/befund/Core/Https/Servers.java b/app/src/main/java/de/labor_stein/befund/Core/Https/Servers.java index f1273af..540f283 100644 --- a/app/src/main/java/de/labor_stein/befund/Core/Https/Servers.java +++ b/app/src/main/java/de/labor_stein/befund/Core/Https/Servers.java @@ -10,12 +10,13 @@ package de.labor_stein.befund.Core.Https; public enum Servers { // Development server change ip to your local ip - DEVELOPMENT("127.0.0.1"), + DEVELOPMENT("patientenbefundapp.labor-muenster.de"), + //DEVELOPMENT("172.21.200.145"), /** * HOST´s of productive outside services */ - LIS_SIMULATOR("10.200.200.102"), + LIS_SIMULATOR("pba-simulator.patientenbefundapp.labor-limbach-hannover.de:8443"), LABOR_HEIDELBERG("patientenbefundapp.labor-limbach.de"), LABOR_LUDWIGSBURG("patientenbefundapp.mvz-labor-lb.de"), LABOR_ULM("patientenbefundapp.humangenetik-ulm.de"), diff --git a/app/src/main/java/de/labor_stein/befund/Core/Models/Settings.java b/app/src/main/java/de/labor_stein/befund/Core/Models/Settings.java index ef6c225..1e9e091 100644 --- a/app/src/main/java/de/labor_stein/befund/Core/Models/Settings.java +++ b/app/src/main/java/de/labor_stein/befund/Core/Models/Settings.java @@ -85,7 +85,7 @@ public class Settings result.labor = Labor.GetLaborByName(labor_id); /** REMOVE FOR PRODUCTIVE **/ - //result.labor.host = Servers.DEVELOPMENT; + result.labor.host = Servers.DEVELOPMENT; } } } diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 1bdf192..a54a5b0 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -22,7 +22,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="40dp" - android:text="@string/app_name" + android:text="" android:layout_marginBottom="50dp" android:textColor="@color/primary_color" android:textAlignment="center" > diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index fd26f82..59511b2 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -11,7 +11,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="40dp" - android:text="@string/app_name" + android:text="" android:textColor="@color/primary_color" android:textAlignment="center" android:layout_marginTop="-150dp"