Commit 6f601fbd authored by Ingmar Kroll's avatar Ingmar Kroll

neue Version

parent 4e966324
......@@ -8,6 +8,7 @@ import android.content.Context;
import android.content.Intent;
import android.util.JsonReader;
import android.util.Log;
import android.graphics.BitmapFactory;
import com.google.firebase.messaging.FirebaseMessagingService;
import com.google.firebase.messaging.RemoteMessage;
......@@ -147,7 +148,9 @@ public class FirebaseReceiver extends FirebaseMessagingService {
final NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
final Notification notification = new NotificationCompat.Builder(context)
.setSmallIcon(R.drawable.ic_logo)
.setSmallIcon(R.drawable.ic_menu_alarm)
.setLargeIcon(BitmapFactory.decodeResource(this.getResources(),
R.drawable.ic_logo))
.setContentText(message).setContentTitle(title).setContentIntent(contentIntent)
.build();
......
......@@ -210,7 +210,9 @@ public class CanteenDatabaseManager {
ASiSTTreeItem<FeedItem> root = startTreeConfig.getRootNode(context);
String moduleName = context.getString(R.string.module_canteen_name);
ASiSTPreferenceManager apm = new ASiSTPreferenceManager();
boolean enabled = apm.getSetting(context, AsistStartActivity.START_VIEW_TREE + moduleName);
//TODO: unsauber: Mensa soll nicht auf der Startseite angezeigt werden
boolean enabled = false;
//boolean enabled = apm.getSetting(context, AsistStartActivity.START_VIEW_TREE + moduleName);
root.setEnabled(enabled);
AsistStartModule.update(root);
} finally {
......
......@@ -2,6 +2,7 @@
<resources>
<!-- TRANSLATED FROM BPS -->
<string name="module_alarm_name">Alarms</string>
<string name="dummy_button">Dummy Button</string>
<string name="dummy_content">DUMMY\nCONTENT</string>
<string name="txt_image_content_description">Image</string>
......
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="module_alarm_name">Alarmierungen</string>
<string name="dummy_button">Dummy Button</string>
<string name="dummy_content">DUMMY\nCONTENT</string>
<string name="txt_image_content_description">Image</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment