beta 0.1.2

[DHBWCampusApp.git] / app / src / main / java / de / dhbwloe / campusapp / fragments / SplashScreen.java

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 83d773fa2d775d35ccfa73d973d32e4454217263..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);
@@ -142,7 +147,7 @@ public class SplashScreen extends CampusAppFragment {
                                     indices.setDescription("Vorlesung " + event.getEventTitle());
                                     indices.addKeyWord(event.getGroupTitle());
                                     indices.addKeyWord(event.getEventLocation());
-                                    return null;
+                                    return indices;
                                 }
                             });
                         }
@@ -164,11 +169,11 @@ public class SplashScreen extends CampusAppFragment {
                                     SearchIndices indices = new SearchIndices("Vorlesungsplan#Group"+group.getGroupId(), false);
                                     indices.setUpdateTime(event.getEventFrom());
                                     indices.setTarget("#Vorlesungsplan#groupid=" + group.getGroupId());
-                                    indices.setTitle("Vorlesungsplan " + event.getCourseName());
-                                    indices.setDescription("Vorlesung " + event.getEventTitle());
+                                    indices.setTitle(AppContext.getResString(R.string.search_vorlesungsplan_group_title, event.getCourseName()));
+                                    indices.setDescription(event.getEventTitle());
                                     indices.addKeyWord(event.getGroupTitle());
                                     indices.addKeyWord(event.getEventLocation());
-                                    return null;
+                                    return indices;
                                 }
                             });
                         }