Merge pull request #31 from auricgoldfinger/notification-enhancement

Notification enhancement
alexstyl · Sep 8, 2016 · c34f552 · c34f552
2 parents 4f90baf + 097aa01
commit c34f552
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 7 deletions.
diff --git a/mobile/src/main/java/com/alexstyl/specialdates/settings/DailyReminderFragment.java b/mobile/src/main/java/com/alexstyl/specialdates/settings/DailyReminderFragment.java
@@ -16,8 +16,8 @@
 
 import com.alexstyl.specialdates.R;
 import com.alexstyl.specialdates.analytics.Action;
-import com.alexstyl.specialdates.analytics.Analytics;
 import com.alexstyl.specialdates.analytics.ActionWithParameters;
+import com.alexstyl.specialdates.analytics.Analytics;
 import com.alexstyl.specialdates.analytics.Firebase;
 import com.alexstyl.specialdates.service.DailyReminderIntentService;
 import com.alexstyl.specialdates.ui.widget.TimePreference;

diff --git a/mobile/src/main/java/com/alexstyl/specialdates/util/Notifier.java b/mobile/src/main/java/com/alexstyl/specialdates/util/Notifier.java
@@ -14,15 +14,22 @@
 import android.graphics.PorterDuffXfermode;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.graphics.Typeface;
 import android.net.Uri;
 import android.support.v4.app.NotificationCompat;
+import android.text.Spannable;
+import android.text.SpannableString;
 import android.text.TextUtils;
+import android.text.style.StyleSpan;
 
 import com.alexstyl.specialdates.R;
+import com.alexstyl.specialdates.contact.Birthday;
 import com.alexstyl.specialdates.contact.Contact;
+import com.alexstyl.specialdates.date.ContactEvent;
 import com.alexstyl.specialdates.date.Date;
 import com.alexstyl.specialdates.datedetails.DateDetailsActivity;
 import com.alexstyl.specialdates.events.ContactEvents;
+import com.alexstyl.specialdates.events.EventType;
 import com.alexstyl.specialdates.events.bankholidays.BankHoliday;
 import com.alexstyl.specialdates.events.namedays.NamedayPreferences;
 import com.alexstyl.specialdates.images.ImageLoader;
@@ -89,19 +96,48 @@ public void forDailyReminder(ContactEvents events) {
                 );
 
         String title = NaturalLanguageUtils.joinContacts(context, events.getContacts(), 3);
-        String fullText = TextUtils.join(", ", events.getContacts());
 
         NotificationCompat.Builder builder = new NotificationCompat.Builder(context)
                 .setSmallIcon(R.drawable.ic_stat_contact_event)
                 .setContentTitle(title)
                 .setLargeIcon(largeIcon)
-                .setStyle(new NotificationCompat.BigTextStyle().bigText(fullText))
                 .setVisibility(NotificationCompat.VISIBILITY_PRIVATE)
                 .setAutoCancel(true)
-                .setContentText(fullText)
                 .setContentIntent(intent)
+                .setNumber(events.size())
                 .setColor(context.getResources().getColor(R.color.main_red));
 
+        if (events.size() == 1) {
+            ContactEvent event = events.getEvent(0);
+            String msg = getLabelFor(event);
+
+            NotificationCompat.BigTextStyle bigTextStyle = new NotificationCompat.BigTextStyle().bigText(msg);
+            bigTextStyle.setBigContentTitle(title);
+            builder.setContentText(msg);
+
+            builder.setStyle(bigTextStyle);
+
+        } else if (events.getContacts().size() > 1) {
+            NotificationCompat.InboxStyle inboxStyle = new NotificationCompat.InboxStyle();
+            inboxStyle.setBigContentTitle(title);
+
+            for (int i = 0; i < events.size(); ++i) {
+
+                ContactEvent event = events.getEvent(i);
+                Contact contact = event.getContact();
+                String name = contact.getDisplayName().toString();
+
+                String lineFormatted = name + "   " + getLabelFor(event);
+
+                Spannable sb = new SpannableString(lineFormatted);
+                sb.setSpan(new StyleSpan(Typeface.BOLD), 0, name.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                inboxStyle.addLine(sb);
+            }
+
+            builder.setStyle(inboxStyle);
+            builder.setContentText(TextUtils.join(", ", events.getContacts()));
+        }
+
         if (supportsPublicNotifications()) {
             String publicTitle = context.getString(R.string.contact_celebration_count, contactCount);
             NotificationCompat.Builder publicNotification = new NotificationCompat.Builder(context)
@@ -114,8 +150,6 @@ public void forDailyReminder(ContactEvents events) {
             builder.setPublicVersion(publicNotification.build());
         }
 
-        builder.setNumber(contactCount);
-
         for (Contact contact : events.getContacts()) {
             Uri uri = contact.getLookupUri();
             if (uri != null) {
@@ -137,6 +171,27 @@ public void forDailyReminder(ContactEvents events) {
 
     }
 
+    /**
+     * TODO duplicated from {@link com.alexstyl.specialdates.upcoming.ui.ContactEventView#getLabelFor(ContactEvent)}
+     *
+     * @deprecated
+     */
+    private String getLabelFor(ContactEvent event) {
+        Resources resources = context.getResources();
+
+        EventType eventType = event.getType();
+        if (eventType == EventType.BIRTHDAY) {
+            Birthday birthday = event.getContact().getBirthday();
+            if (birthday.includesYear()) {
+                int age = birthday.getAgeOnYear(event.getYear());
+                if (age > 0) {
+                    return resources.getString(R.string.turns_age, age);
+                }
+            }
+        }
+        return resources.getString(eventType.nameRes());
+    }
+
     public static Bitmap getCircleBitmap(Bitmap bitmap) {
         final Bitmap output = Bitmap.createBitmap(bitmap.getWidth(),
                                                   bitmap.getHeight(), Bitmap.Config.ARGB_8888

diff --git a/secret.gradle b/secret.gradle
@@ -1,5 +1,4 @@
 ext {
-
     // Replace the existing values with your own unique keys
     crashlyticsKey = "1234567890123456789012345678901234567890"
     androidVendingKey = "Include your vending key here"