beta 0.1.2

diff --git a/app/src/main/java/de/dhbwloe/campusapp/CampusAppContext.java b/app/src/main/java/de/dhbwloe/campusapp/CampusAppContext.java
index e4f0e494b9343019ff66d89f82b0cc4b9a226b12..4fddc35accd381ca52f50add127c7b278b265d15 100644 (file)
--- a/app/src/main/java/de/dhbwloe/campusapp/CampusAppContext.java
+++ b/app/src/main/java/de/dhbwloe/campusapp/CampusAppContext.java
@@ -47,6 +47,8 @@ public class CampusAppContext {
             this.fragementType = type;
         }
     }
+
+    public static final String APPVERSION = "0.1.1 (beta)";
     private final AppPage[] PAGES = {
             new AppPage("SplashScreen", SplashScreen.class),
             new AppPage("Dashboard", Dashboard.class),

diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/SplashScreen.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/SplashScreen.java
index 961a32be18645d312a8ff73a3da63fa60798ff15..77cb27eea36bc31c7f112464edf6c05eafb610ce 100644 (file)
--- a/app/src/main/java/de/dhbwloe/campusapp/fragments/SplashScreen.java
+++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/SplashScreen.java
@@ -13,10 +13,12 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
+import android.widget.TextView;
 
 import java.util.Date;
 
 import de.dhbwloe.campusapp.CampusApp;
+import de.dhbwloe.campusapp.CampusAppContext;
 import de.dhbwloe.campusapp.CampusAppFragment;
 import de.dhbwloe.campusapp.R;
 import de.dhbwloe.campusapp.mensaplan.MensaplanManager;
@@ -56,6 +58,9 @@ public class SplashScreen extends CampusAppFragment {
                              Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_splashscreen, container, false);
 
+        TextView versionView = (TextView) view.findViewById(R.id.version);
+        versionView.setText(CampusAppContext.APPVERSION);
+
         splashProgress = (ProgressBar)view.findViewById(R.id.splashProgress);
         splashProgress.setMax(20);
         splashProgress.setProgress(0);

diff --git a/app/src/main/res/layout/fragment_splashscreen.xml b/app/src/main/res/layout/fragment_splashscreen.xml
index d80dfcb2b8a265f0a880d7a03a6177d795121581..5bcad5e96509fa6343e66ee1d7d30e24267ed229 100644 (file)
--- a/app/src/main/res/layout/fragment_splashscreen.xml
+++ b/app/src/main/res/layout/fragment_splashscreen.xml
@@ -42,4 +42,14 @@
         android:layout_above="@+id/splashProgress"
         android:layout_centerHorizontal="true" />
 
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="{version}"
+        android:id="@+id/version"
+        android:layout_above="@+id/splashProgress"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginRight="8dp" />
+
 </RelativeLayout>