X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fde%2Fdhbwloe%2Fcampusapp%2FCampusAppContext.java;h=e4f0e494b9343019ff66d89f82b0cc4b9a226b12;hb=cea4ee15ef92f521ae962404bd1b3c25042219fa;hp=77c2b9d82ccc366b7bf4fc33eb10e9125975ed34;hpb=bd624f87e88e024b0c680f989cf008941fccc17f;p=DHBWCampusApp.git

diff --git a/app/src/main/java/de/dhbwloe/campusapp/CampusAppContext.java b/app/src/main/java/de/dhbwloe/campusapp/CampusAppContext.java
index 77c2b9d..e4f0e49 100644
--- a/app/src/main/java/de/dhbwloe/campusapp/CampusAppContext.java
+++ b/app/src/main/java/de/dhbwloe/campusapp/CampusAppContext.java
@@ -14,9 +14,9 @@ import de.dhbwloe.campusapp.fragments.FirstRun;
 import de.dhbwloe.campusapp.fragments.Impressum;
 import de.dhbwloe.campusapp.fragments.Mensa;
 import de.dhbwloe.campusapp.fragments.MensaCard;
-import de.dhbwloe.campusapp.fragments.MensaWochenplan;
 import de.dhbwloe.campusapp.fragments.News;
 import de.dhbwloe.campusapp.fragments.PopupFragment;
+import de.dhbwloe.campusapp.fragments.Settings;
 import de.dhbwloe.campusapp.fragments.SplashScreen;
 import de.dhbwloe.campusapp.fragments.Vorlesungsplan;
 import de.dhbwloe.campusapp.fragments.WebBrowser;
@@ -57,6 +57,7 @@ public class CampusAppContext {
             new AppPage("News", News.class),
             new AppPage("WifiSettings", WifiSettings.class),
             new AppPage("FirstRun", FirstRun.class),
+            new AppPage("Settings", Settings.class),
             new AppPage("Impressum", Impressum.class),
             new AppPage("WebBrowser", WebBrowser.class),
             new AppPage("WebBrowserPopup", WebBrowser.class, 3)
@@ -72,11 +73,13 @@ public class CampusAppContext {
     private NavigationManager oNavigationManager;
     private DatabaseManager oDatabaseManager;
     private NfcCardListener oNfcCardListener;
+    private Bundle oContextVariables;
 
     public CampusAppContext(CampusApp mainActivity, int fragmentContainerId) {
         final CampusAppContext AppContext = this;
         instance = this;
         oMainActivity = mainActivity;
+        oContextVariables = new Bundle();
         oNavigationManager = new NavigationManager(this, fragmentContainerId);
         oDatabaseManager = new DatabaseManager(this);
         oNfcCardListener = new NfcCardListener(this);
@@ -112,7 +115,8 @@ public class CampusAppContext {
     public void setTitle(String title) {
         PopupFragment popup = oNavigationManager.getDialog();
         if(popup != null) {
-            popup.getDialog().setTitle(title);
+            if(popup.getDialog() != null)
+                popup.getDialog().setTitle(title);
         } else {
             TextView titleView = (TextView)oMainActivity.findViewById(R.id.title);
             titleView.setText(title);
@@ -145,9 +149,13 @@ public class CampusAppContext {
 
     private void onNfcCardDataReceived(NfcCardData data) {
         Bundle bundle = new Bundle();
-        bundle.putDouble("balance", data.getBalance() / 100.0);
+        double cardBalance = data.getBalance() / 100.0;
+        bundle.putDouble("balance", cardBalance);
         bundle.putDouble("transaction", data.getLastTransaction() / 100.0);
 
+        oContextVariables.putInt("nfcCardUniqueId", data.getUniqueId());
+        oContextVariables.putDouble("nfcCardBalance", cardBalance);
+
         String pagename = oNavigationManager.getCurrentPageName();
         if(pagename != null && pagename.equalsIgnoreCase("MensaCard")) {
             MensaCard fragment = (MensaCard) oNavigationManager.getCurrentFragment();
@@ -156,4 +164,18 @@ public class CampusAppContext {
             oNavigationManager.navigatePage("MensaCard", bundle);
     }
 
+    public Bundle getContextVariables() {
+        return oContextVariables;
+    }
+
+    public String getResString(int id, Object... arguments) {
+        String format = getResString(id);
+        String res = String.format(format, arguments);
+        return res;
+    }
+    public String getResString(int id) {
+        String str = oMainActivity.getResources().getString(id);
+        return str;
+    }
+
 }