diff --git a/app/src/main/java/be/digitalia/fosdem/services/AlarmIntentService.java b/app/src/main/java/be/digitalia/fosdem/services/AlarmIntentService.java index fe559dc..c09e52a 100644 --- a/app/src/main/java/be/digitalia/fosdem/services/AlarmIntentService.java +++ b/app/src/main/java/be/digitalia/fosdem/services/AlarmIntentService.java @@ -175,11 +175,16 @@ public class AlarmIntentService extends IntentService { } NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this) - .setSmallIcon(R.drawable.ic_launcher).setWhen(event.getStartTime().getTime()) - .setContentTitle(event.getTitle()).setContentText(contentText) + .setSmallIcon(R.drawable.ic_stat_fosdem) + .setWhen(event.getStartTime().getTime()) + .setContentTitle(event.getTitle()) + .setContentText(contentText) .setStyle(new NotificationCompat.BigTextStyle().bigText(bigText).setSummaryText(trackName)) - .setContentInfo(event.getRoomName()).setContentIntent(eventPendingIntent).setAutoCancel(true) - .setDefaults(defaultFlags).setPriority(NotificationCompat.PRIORITY_HIGH); + .setContentInfo(event.getRoomName()) + .setContentIntent(eventPendingIntent) + .setAutoCancel(true) + .setDefaults(defaultFlags) + .setPriority(NotificationCompat.PRIORITY_HIGH); // Blink the LED with FOSDEM color if enabled in the options if (sharedPreferences.getBoolean(SettingsFragment.KEY_PREF_NOTIFICATIONS_LED, false)) { diff --git a/app/src/main/res/drawable-hdpi-v11/ic_stat_fosdem.png b/app/src/main/res/drawable-hdpi-v11/ic_stat_fosdem.png new file mode 100644 index 0000000..569fee6 Binary files /dev/null and b/app/src/main/res/drawable-hdpi-v11/ic_stat_fosdem.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png index 258b3f4..be8e847 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_launcher.png and b/app/src/main/res/drawable-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_stat_fosdem.png b/app/src/main/res/drawable-hdpi/ic_stat_fosdem.png new file mode 100644 index 0000000..31b9acc Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_stat_fosdem.png differ diff --git a/app/src/main/res/drawable-mdpi-v11/ic_stat_fosdem.png b/app/src/main/res/drawable-mdpi-v11/ic_stat_fosdem.png new file mode 100644 index 0000000..a90ba96 Binary files /dev/null and b/app/src/main/res/drawable-mdpi-v11/ic_stat_fosdem.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png index 159ea64..991e3c3 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_launcher.png and b/app/src/main/res/drawable-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_stat_fosdem.png b/app/src/main/res/drawable-mdpi/ic_stat_fosdem.png new file mode 100644 index 0000000..9406eca Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_stat_fosdem.png differ diff --git a/app/src/main/res/drawable-xhdpi-v11/ic_stat_fosdem.png b/app/src/main/res/drawable-xhdpi-v11/ic_stat_fosdem.png new file mode 100644 index 0000000..9bf7af9 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi-v11/ic_stat_fosdem.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png index 61a949a..66646ec 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_launcher.png and b/app/src/main/res/drawable-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_fosdem.png b/app/src/main/res/drawable-xhdpi/ic_stat_fosdem.png new file mode 100644 index 0000000..f364de0 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_stat_fosdem.png differ diff --git a/app/src/main/res/drawable-xxhdpi-v11/ic_stat_fosdem.png b/app/src/main/res/drawable-xxhdpi-v11/ic_stat_fosdem.png new file mode 100644 index 0000000..07dc6e2 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi-v11/ic_stat_fosdem.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png index 1213a0e..25e4f52 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_launcher.png and b/app/src/main/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_stat_fosdem.png b/app/src/main/res/drawable-xxhdpi/ic_stat_fosdem.png new file mode 100644 index 0000000..ef55f2b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_stat_fosdem.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher.png index f94ddfe..9aa7bba 100644 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_launcher.png and b/app/src/main/res/drawable-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/layout/track_schedule_event.xml b/app/src/main/res/layout/track_schedule_event.xml index 172c951..a237f0e 100644 --- a/app/src/main/res/layout/track_schedule_event.xml +++ b/app/src/main/res/layout/track_schedule_event.xml @@ -1,7 +1,7 @@ + android:layout_width="match_parent" + android:layout_height="match_parent"> + android:visibility="gone"/> - + android:layout_height="match_parent"/> - - - - + \ No newline at end of file