diff --git a/qksms/src/main/AndroidManifest.xml b/qksms/src/main/AndroidManifest.xml
index ff319479..d4877afc 100644
--- a/qksms/src/main/AndroidManifest.xml
+++ b/qksms/src/main/AndroidManifest.xml
@@ -64,6 +64,8 @@
+
+
message.threadId }
@@ -60,6 +62,10 @@ class NotificationManager(private val context: Context, private val themeManager
val seenIntent = Intent(context, MarkSeenReceiver::class.java).putExtra("threadId", threadId)
val seenPI = PendingIntent.getBroadcast(context, threadId.toInt() + 20000, seenIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+ val readIntent = Intent(context, MarkReadReceiver::class.java).putExtra("threadId", threadId)
+ val readPI = PendingIntent.getBroadcast(context, threadId.toInt() + 30000, readIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+ val readAction = NotificationCompat.Action(R.drawable.ic_done_black_24dp, context.getString(R.string.notification_read), readPI)
+
val notification = NotificationCompat.Builder(context, "channel_1")
.setColor(themeManager.color)
.setSmallIcon(R.mipmap.ic_launcher)
@@ -67,10 +73,34 @@ class NotificationManager(private val context: Context, private val themeManager
.setAutoCancel(true)
.setContentIntent(contentPI)
.setDeleteIntent(seenPI)
+ .addAction(readAction)
.setStyle(style)
+ if (Build.VERSION.SDK_INT >= 24 && conversation != null) {
+ notification.addAction(getReplyAction(conversation.contacts[0].address, conversation.id))
+ }
+
notificationManager.notify(threadId.toInt(), notification.build())
}
}
+ private fun getReplyAction(address: String, threadId: Long): NotificationCompat.Action {
+ val replyIntent = Intent(context, RemoteMessagingReceiver::class.java)
+ .putExtra("address", address)
+ .putExtra("threadId", threadId)
+ val replyPI = PendingIntent.getBroadcast(context, threadId.toInt() + 40000, replyIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+
+ val responseSet = arrayListOf("Hello", "Hey").toTypedArray().sortedArray()
+ val remoteInput = RemoteInput.Builder("body")
+ .setLabel(context.getString(R.string.notification_reply))
+ .setChoices(responseSet)
+ .build()
+
+ return NotificationCompat.Action.Builder(
+ R.drawable.ic_reply_black_24dp,
+ context.getString(R.string.notification_reply), replyPI)
+ .addRemoteInput(remoteInput)
+ .build()
+ }
+
}
\ No newline at end of file
diff --git a/qksms/src/main/res/drawable/ic_done_black_24dp.xml b/qksms/src/main/res/drawable/ic_done_black_24dp.xml
new file mode 100644
index 00000000..7affe9ba
--- /dev/null
+++ b/qksms/src/main/res/drawable/ic_done_black_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/qksms/src/main/res/drawable/ic_reply_black_24dp.xml b/qksms/src/main/res/drawable/ic_reply_black_24dp.xml
new file mode 100644
index 00000000..46b19a0d
--- /dev/null
+++ b/qksms/src/main/res/drawable/ic_reply_black_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/qksms/src/main/res/layout/message_list_activity.xml b/qksms/src/main/res/layout/message_list_activity.xml
index 06d567e3..12186fc9 100644
--- a/qksms/src/main/res/layout/message_list_activity.xml
+++ b/qksms/src/main/res/layout/message_list_activity.xml
@@ -54,7 +54,7 @@
android:layout_weight="1"
android:background="@null"
android:gravity="center_vertical"
- android:hint="@string/message_hint"
+ android:hint="@string/compose_hint"
android:minHeight="48dp" />
QKSMS
- Write a message
+ Write a message
+
+ Reply
+ Mark read