projects
/
DHBWCampusApp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
alpha 0.0.1
[DHBWCampusApp.git]
/
app
/
src
/
main
/
java
/
de
/
dhbwloe
/
campusapp
/
CampusAppContext.java
diff --git
a/app/src/main/java/de/dhbwloe/campusapp/CampusAppContext.java
b/app/src/main/java/de/dhbwloe/campusapp/CampusAppContext.java
index 77c2b9d82ccc366b7bf4fc33eb10e9125975ed34..11d3999154ca7e7a2a60512830c9f7bbff99a3f1 100644
(file)
--- a/
app/src/main/java/de/dhbwloe/campusapp/CampusAppContext.java
+++ b/
app/src/main/java/de/dhbwloe/campusapp/CampusAppContext.java
@@
-14,7
+14,6
@@
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.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.SplashScreen;
import de.dhbwloe.campusapp.fragments.News;
import de.dhbwloe.campusapp.fragments.PopupFragment;
import de.dhbwloe.campusapp.fragments.SplashScreen;
@@
-72,11
+71,13
@@
public class CampusAppContext {
private NavigationManager oNavigationManager;
private DatabaseManager oDatabaseManager;
private NfcCardListener oNfcCardListener;
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;
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);
oNavigationManager = new NavigationManager(this, fragmentContainerId);
oDatabaseManager = new DatabaseManager(this);
oNfcCardListener = new NfcCardListener(this);
@@
-112,7
+113,8
@@
public class CampusAppContext {
public void setTitle(String title) {
PopupFragment popup = oNavigationManager.getDialog();
if(popup != null) {
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);
} else {
TextView titleView = (TextView)oMainActivity.findViewById(R.id.title);
titleView.setText(title);
@@
-145,9
+147,13
@@
public class CampusAppContext {
private void onNfcCardDataReceived(NfcCardData data) {
Bundle bundle = new Bundle();
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);
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();
String pagename = oNavigationManager.getCurrentPageName();
if(pagename != null && pagename.equalsIgnoreCase("MensaCard")) {
MensaCard fragment = (MensaCard) oNavigationManager.getCurrentFragment();
@@
-156,4
+162,13
@@
public class CampusAppContext {
oNavigationManager.navigatePage("MensaCard", bundle);
}
oNavigationManager.navigatePage("MensaCard", bundle);
}
+ public Bundle getContextVariables() {
+ return oContextVariables;
+ }
+
+ public String getResString(int id) {
+ String str = oMainActivity.getResources().getString(id);
+ return str;
+ }
+
}
}