Merge pull request #136 from android/bubbles-r-dp1

Bubbles: Update for DP1

Author: yaraki

BubblesKotlin/app/build.gradle

@@ -2,15 +2,18 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 'android-R'
     defaultConfig {
         applicationId "com.example.android.bubbles"
-        minSdkVersion 29
-        targetSdkVersion 29
+        minSdkVersion 'R'
+        targetSdkVersion 'R'
         versionCode 1
         versionName '1.0'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
     buildTypes {
         release {
             minifyEnabled false
@@ -23,17 +26,17 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.fragment:fragment-ktx:1.1.0'
-    implementation 'androidx.core:core-ktx:1.1.0'
+    implementation 'androidx.fragment:fragment-ktx:1.2.1'
+    implementation 'androidx.core:core-ktx:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
 
-    def lifecycle_version = '2.1.0'
+    def lifecycle_version = '2.2.0'
     implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
-    testImplementation "androidx.arch.core:core-testing:$lifecycle_version"
+    testImplementation 'androidx.arch.core:core-testing:2.1.0'
 
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.google.android.material:material:1.1.0'
 
     implementation 'com.github.bumptech.glide:glide:4.9.0'
 
@@ -42,7 +45,6 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
     testImplementation 'org.robolectric:robolectric:4.2'
-    testImplementation "androidx.arch.core:core-testing:$lifecycle_version"
     testImplementation 'androidx.test.ext:junit:1.1.1'
     testImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     testImplementation 'androidx.test.ext:truth:1.2.0'

BubblesKotlin/app/src/main/java/com/example/android/bubbles/data/NotificationHelper.kt

@@ -80,10 +80,26 @@ class NotificationHelper(private val context: Context) {
             // A notification can be shown as a bubble by calling setBubbleMetadata()
             .setBubbleMetadata(
                 Notification.BubbleMetadata.Builder()
+                    .createIntentBubble(
+                        // The Intent to be used for the expanded bubble.
+                        PendingIntent.getActivity(
+                            context,
+                            REQUEST_BUBBLE,
+                            // Launch BubbleActivity as the expanded bubble.
+                            Intent(context, BubbleActivity::class.java)
+                                .setAction(Intent.ACTION_VIEW)
+                                .setData(
+                                    Uri.parse(
+                                        "https://android.example.com/chat/${chat.contact.id}"
+                                    )
+                                ),
+                            PendingIntent.FLAG_UPDATE_CURRENT
+                        ),
+                        // The icon of the bubble.
+                        icon
+                    )
                     // The height of the expanded bubble.
                     .setDesiredHeight(context.resources.getDimensionPixelSize(R.dimen.bubble_height))
-                    // The icon of the bubble.
-                    .setIcon(icon)
                     .apply {
                         // When the bubble is explicitly opened by the user, we can show the bubble
                         // automatically in the expanded state. This works only when the app is in
@@ -93,18 +109,6 @@ class NotificationHelper(private val context: Context) {
                             setSuppressNotification(true)
                         }
                     }
-                    // The Intent to be used for the expanded bubble.
-                    .setIntent(
-                        PendingIntent.getActivity(
-                            context,
-                            REQUEST_BUBBLE,
-                            // Launch BubbleActivity as the expanded bubble.
-                            Intent(context, BubbleActivity::class.java)
-                                .setAction(Intent.ACTION_VIEW)
-                                .setData(Uri.parse("https://android.example.com/chat/${chat.contact.id}")),
-                            PendingIntent.FLAG_UPDATE_CURRENT
-                        )
-                    )
                     .build()
             )
             // The user can turn off the bubble in system settings. In that case, this notification
@@ -130,36 +134,33 @@ class NotificationHelper(private val context: Context) {
 
         if (fromUser) {
             // This is a Bubble explicitly opened by the user.
-            builder.setContentText(context.getString(R.string.chat_with_contact, chat.contact.name))
+            builder
+                .setStyle(
+                    Notification.MessagingStyle(person)
+                        .addMessage(
+                            context.getString(R.string.chat_with_contact, chat.contact.name),
+                            System.currentTimeMillis(),
+                            person
+                        )
+                        .setGroupConversation(false)
+                )
+                .setContentText(context.getString(R.string.chat_with_contact, chat.contact.name))
         } else {
             // Let's add some more content to the notification in case it falls back to a normal
             // notification.
             val lastOutgoingId = chat.messages.last { !it.isIncoming }.id
             val newMessages = chat.messages.filter { message ->
                 message.id > lastOutgoingId
             }
-            val lastMessage = newMessages.last()
             builder
                 .setStyle(
-                    if (lastMessage.photo != null) {
-                        Notification.BigPictureStyle()
-                            .bigPicture(
-                                BitmapFactory.decodeResource(
-                                    context.resources,
-                                    lastMessage.photo
-                                )
-                            )
-                            .bigLargeIcon(icon)
-                            .setSummaryText(lastMessage.text)
-                    } else {
-                        Notification.MessagingStyle(person)
-                            .apply {
-                                for (message in newMessages) {
-                                    addMessage(message.text, message.timestamp, person)
-                                }
+                    Notification.MessagingStyle(person)
+                        .apply {
+                            for (message in newMessages) {
+                                addMessage(message.text, message.timestamp, person)
                             }
-                            .setGroupConversation(false)
-                    }
+                        }
+                        .setGroupConversation(false)
                 )
                 .setContentText(newMessages.joinToString("\n") { it.text })
                 .setWhen(newMessages.last().timestamp)

BubblesKotlin/build.gradle

@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.60'
+    ext.kotlin_version = '1.3.61'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }