From 55cd42039507b8cedc758ac92efc90990af2ee6f Mon Sep 17 00:00:00 2001
From: Christophe Beyls <software@digitalia.be>
Date: Sat, 25 Jan 2014 19:28:59 +0100
Subject: [PATCH] Improved notifications with an action button allowing to show
 the room map image directly. Event subtitle in notification BigText style is
 now shown in white, before the speaker(s).

---
 AndroidManifest.xml                           |   7 ++++
 res/drawable-hdpi/ic_action_place.png         | Bin 0 -> 336 bytes
 res/drawable-mdpi/ic_action_place.png         | Bin 0 -> 276 bytes
 res/drawable-xhdpi/ic_action_place.png        | Bin 0 -> 402 bytes
 res/drawable-xxhdpi/ic_action_place.png       | Bin 0 -> 526 bytes
 res/values-v11/styles.xml                     |   6 +++
 res/values/strings.xml                        |   1 +
 res/values/styles.xml                         |   3 ++
 .../activities/RoomImageDialogActivity.java   |  30 +++++++++++++++
 .../fosdem/services/AlarmIntentService.java   |  35 ++++++++++++++----
 10 files changed, 75 insertions(+), 7 deletions(-)
 create mode 100644 res/drawable-hdpi/ic_action_place.png
 create mode 100644 res/drawable-mdpi/ic_action_place.png
 create mode 100644 res/drawable-xhdpi/ic_action_place.png
 create mode 100644 res/drawable-xxhdpi/ic_action_place.png
 create mode 100644 res/values-v11/styles.xml
 create mode 100644 src/be/digitalia/fosdem/activities/RoomImageDialogActivity.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ffa3204..6b2cb38 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="be.digitalia.fosdem"
     android:versionCode="0700104"
@@ -58,6 +59,12 @@
                 android:name="android.app.searchable"
                 android:resource="@xml/main_searchable" />
         </activity>
+        <!-- Clearing the Task Affinity allows this dialog activity to be displayed without bringing to front the main application with it. -->
+        <activity
+            android:name=".activities.RoomImageDialogActivity"
+            android:excludeFromRecents="true"
+            android:taskAffinity=""
+            android:theme="@style/DialogTheme" />
         <activity
             android:name=".activities.SettingsActivity"
             android:label="@string/settings" />
diff --git a/res/drawable-hdpi/ic_action_place.png b/res/drawable-hdpi/ic_action_place.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b3a5fe445317cea0c7f6e137337d5c04a5ae6ad
GIT binary patch
literal 336
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc;00(?STf%Jb;fVD3R$RL4|AirP+
zUMV$W2j9rFhMt+rHt#=UAQTt}l-uv=;uunK>+R)(d@Tw*EEhDnxir4~|6k^LAva7|
zMt@$7xsaN2$cL()mK!XL$Cs{(EmH6at$*e6=DPj#&IN6r9#@;SBsza@oAW*6h{wy>
zVeBV%r5b*?cy95>-%UFf?Yoqx*7x8-N7+OU6_ZYmin~u97#nj2+7?Shd|i@|66VZ%
zZeo1OCOI96&s72mGm@wO=6@0Nkn4<#*o;G>Gdgt)j&fPt<MQa{{TbHEuA4deVDZ(u
mV81Qp4qBlF-W(OSFSt+hNc^`;RcZrzg~8L+&t;ucLK6T(-kZ_@

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/ic_action_place.png b/res/drawable-mdpi/ic_action_place.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c7fbc95baf52e4146527b543c7c223f88be7250
GIT binary patch
literal 276
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy1_3@Hu0Z-fDZtv7#Q>;Bpd`pI
zn1NSH&Dg;=t+=6Q=CaNE&wM?YC<K&i_H=O!skn9Zf;S(tA`f%GXH93Wp7-^)PYGQr
z5!{q_zpYi*o27pFE#FVEg$0GL6ZOPpX2y2~8?bJ^vhw<zLqQY1UwSK|!Raw2_@L06
zkQqzvOnE9|rMkm~bHC=}lj=5aHBEMiZD)<=W>0ZtzI2E&@?t}XXdDMmk;0_XBLU_|
ef)2g^$*_4Bx7W_K52gT}!{F)a=d#Wzp$P!1)_^$x

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/ic_action_place.png b/res/drawable-xhdpi/ic_action_place.png
new file mode 100644
index 0000000000000000000000000000000000000000..4eda58548a582d321a70fef8a8eee658a2cccf64
GIT binary patch
literal 402
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!j01c^T!Hj|62bPVkD7qm1WSVa
zf*E+F)QlZ`Bh!i-dS))$y#GwXrG2k}l7Bs2978H@y}cIL->e|O@_<n@G~~wr|Jm=8
zlqPR8i#-0Mh`+91EhjCJ`BB;L_fC3O>#ka|r~bULCj0SAA?K~)rVpp&$Zy&Zx6Z&s
zS?a;oTMM;J7MKQB)|^*-R%UkSz}M*OjjZw?B<?HQ=a?T%-gx)l(X#G{1z+bqNQ^zA
z7RAp0?pM#*l)0N**A)btYul(THk+PhlHKg#U%~QQ>rm=8{jeV?Yni#u_OV)sT8BIk
zeH+kpdr_{U>PNdptL}DOzt6fVis4ie1B8s)$}r^!!<HJJg>s6HK|khYDAn`0EPgCk
z5aX-cFeOu}@Zc%QODb{;SLp0ebGegO|A771BE45lRbMiI0m0zu>gTe~DWM4fUw6a{

literal 0
HcmV?d00001

diff --git a/res/drawable-xxhdpi/ic_action_place.png b/res/drawable-xxhdpi/ic_action_place.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae08ea00e580627cacfdc254877537706e1f2593
GIT binary patch
literal 526
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy##1AIbUf%Jb8!S<<-nt<8_OM?7@
z8F;1Cj2(O<(~28<W-i;j|4hQAeXkf87%M$p978H@y}fa;?}-8r%Y`NZD*>jj|KoSx
zI(*7HBS0zXeBzPaN=IWG7)__8Moznb^zBNMf1yDo7sQPATQHlnI(^gIE2Q@^dU-Qf
zec^(<fDNX6TYaDZo+cWj?5izuZ->miA0NUFaqs&$@A#fG?0!DQZ=T%UZM*sL*02Sv
zH+NdCzOeO!*^Ay)CeD#=efvJm**p7H;!FOtFZ(z5s_Q48JNbWVVYB$$WF~>DiyS5h
z-hUfEmnrqe!_egnkM}ovtn#^d@SGy=x*{ppZ&_W{tKP`Yc>FWqz>-t$QfaD}zB%3a
z>2YMsF?E@o=NifPj<J{RDfk$6RC?lezS+|kf2dHssk8Be@bQ*ckJmj|o3O>*b?42+
z+XR(FL}oK6NwErCRcq*QV|3Zdsn8V25SYW%ks#tQ#gXAO2jeOuYt~(V6dEF1girmt
zebf1_V;4*9x>Mh0H#b^Ta7&g%xArQS@13~jR`TQe8)h>sQ@W*AZgM?)?I&~a(<a^h
giILM%e^%Br?2XLGatbO*2F4JBr>mdKI;Vst04E6r)c^nh

literal 0
HcmV?d00001

diff --git a/res/values-v11/styles.xml b/res/values-v11/styles.xml
new file mode 100644
index 0000000..7efda10
--- /dev/null
+++ b/res/values-v11/styles.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <style name="DialogTheme" parent="@android:style/Theme.Holo.Light.Dialog" />
+
+</resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6e6e790..1d5aefc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -101,6 +101,7 @@
     <string name="more_info">More info</string>
 
     <!-- Others -->
+    <string name="room_map">Room map</string>
     <string name="directions">Directions to ULB</string>
     <string name="no_data">No data available.</string>
     <string name="about">About</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index e202197..add8019 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="AppTheme" parent="@style/Theme.AppCompat.Light">
@@ -12,6 +13,8 @@
         <item name="activatedBackgroundIndicator">@drawable/activated_background</item>
     </style>
 
+    <style name="DialogTheme" parent="@android:style/Theme.Dialog" />
+
     <style name="ActionBar.Solid.Fosdem" parent="@style/Widget.AppCompat.Light.ActionBar.Solid">
 
         <!-- Only override the progress bar style for modern devices with Holo theme -->
diff --git a/src/be/digitalia/fosdem/activities/RoomImageDialogActivity.java b/src/be/digitalia/fosdem/activities/RoomImageDialogActivity.java
new file mode 100644
index 0000000..ffc9355
--- /dev/null
+++ b/src/be/digitalia/fosdem/activities/RoomImageDialogActivity.java
@@ -0,0 +1,30 @@
+package be.digitalia.fosdem.activities;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.ImageView;
+
+/**
+ * A special Activity which is displayed like a dialog and shows a room image. Specify the room name and the room image id as Intent extras.
+ * 
+ * @author Christophe Beyls
+ * 
+ */
+public class RoomImageDialogActivity extends Activity {
+
+	public static final String EXTRA_ROOM_NAME = "roomName";
+	public static final String EXTRA_ROOM_IMAGE_RESOURCE_ID = "imageResId";
+
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		Intent intent = getIntent();
+
+		setTitle(intent.getStringExtra(EXTRA_ROOM_NAME));
+
+		ImageView imageView = new ImageView(this);
+		imageView.setImageResource(intent.getIntExtra(EXTRA_ROOM_IMAGE_RESOURCE_ID, 0));
+		setContentView(imageView);
+	}
+}
diff --git a/src/be/digitalia/fosdem/services/AlarmIntentService.java b/src/be/digitalia/fosdem/services/AlarmIntentService.java
index c78a63c..73f02eb 100644
--- a/src/be/digitalia/fosdem/services/AlarmIntentService.java
+++ b/src/be/digitalia/fosdem/services/AlarmIntentService.java
@@ -9,18 +9,24 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.Cursor;
+import android.graphics.Color;
 import android.net.Uri;
 import android.preference.PreferenceManager;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.TaskStackBuilder;
+import android.text.Spannable;
+import android.text.SpannableString;
 import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
 import be.digitalia.fosdem.R;
 import be.digitalia.fosdem.activities.EventDetailsActivity;
 import be.digitalia.fosdem.activities.MainActivity;
+import be.digitalia.fosdem.activities.RoomImageDialogActivity;
 import be.digitalia.fosdem.db.DatabaseManager;
 import be.digitalia.fosdem.fragments.SettingsFragment;
 import be.digitalia.fosdem.model.Event;
 import be.digitalia.fosdem.receivers.AlarmReceiver;
+import be.digitalia.fosdem.utils.StringUtils;
 
 /**
  * A service to schedule or unschedule alarms in the background, keeping the app responsive.
@@ -140,7 +146,7 @@ public class AlarmIntentService extends IntentService {
 
 				String personsSummary = event.getPersonsSummary();
 				String trackName = event.getTrack().getName();
-				String bigText;
+				CharSequence bigText;
 				String contentText;
 				if (TextUtils.isEmpty(personsSummary)) {
 					contentText = trackName;
@@ -151,16 +157,31 @@ public class AlarmIntentService extends IntentService {
 					if (TextUtils.isEmpty(subTitle)) {
 						bigText = personsSummary;
 					} else {
-						bigText = String.format("%1s\n\n%2$s", subTitle, personsSummary);
+						SpannableString spannableBigText = new SpannableString(String.format("%1$s\n%2$s", subTitle, personsSummary));
+						// Set the subtitle in white color
+						spannableBigText.setSpan(new ForegroundColorSpan(Color.WHITE), 0, subTitle.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+						bigText = spannableBigText;
 					}
 				}
 
-				Notification notification = new NotificationCompat.Builder(this).setSmallIcon(R.drawable.ic_launcher).setWhen(event.getStartTime().getTime())
-						.setContentTitle(event.getTitle()).setContentText(contentText)
+				NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this).setSmallIcon(R.drawable.ic_launcher)
+						.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_DEFAULT)
-						.build();
-				notificationManager.notify((int) eventId, notification);
+						.setContentIntent(eventPendingIntent).setAutoCancel(true).setDefaults(defaultFlags).setPriority(NotificationCompat.PRIORITY_DEFAULT);
+
+				// Add an optional action button to show the room map image
+				String roomName = event.getRoomName();
+				int roomImageResId = getResources().getIdentifier(StringUtils.roomNameToResourceName(roomName), "drawable", getPackageName());
+				if (roomImageResId != 0) {
+					// The room name is the unique Id of a RoomImageDialogActivity
+					Intent mapIntent = new Intent(this, RoomImageDialogActivity.class).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK).setData(Uri.parse(roomName));
+					mapIntent.putExtra(RoomImageDialogActivity.EXTRA_ROOM_NAME, roomName);
+					mapIntent.putExtra(RoomImageDialogActivity.EXTRA_ROOM_IMAGE_RESOURCE_ID, roomImageResId);
+					PendingIntent mapPendingIntent = PendingIntent.getActivity(this, 0, mapIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+					notificationBuilder.addAction(R.drawable.ic_action_place, getString(R.string.room_map), mapPendingIntent);
+				}
+
+				notificationManager.notify((int) eventId, notificationBuilder.build());
 			}
 
 			AlarmReceiver.completeWakefulIntent(intent);