From ec703feba2fdc5bdd0d00bf17c4566473ffd718f Mon Sep 17 00:00:00 2001 From: pk910 Date: Mon, 7 Mar 2016 13:39:54 +0100 Subject: [PATCH] beta 0.1.2 --- .../java/de/dhbwloe/campusapp/CampusAppContext.java | 2 ++ .../de/dhbwloe/campusapp/fragments/SplashScreen.java | 5 +++++ app/src/main/res/layout/fragment_splashscreen.xml | 10 ++++++++++ 3 files changed, 17 insertions(+) diff --git a/app/src/main/java/de/dhbwloe/campusapp/CampusAppContext.java b/app/src/main/java/de/dhbwloe/campusapp/CampusAppContext.java index e4f0e49..4fddc35 100644 --- 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 961a32b..77cb27e 100644 --- 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 d80dfcb..5bcad5e 100644 --- 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" /> + + -- 2.20.1