Adaptive icon, notification budge

Author: glodanif

app/build.gradle

@@ -1,5 +1,5 @@
-def final VERSION_CODE = 5
-def final VERSION_NAME = '1.0.0-alpha5'
+def final VERSION_CODE = 6
+def final VERSION_NAME = '1.0.0-beta1'
 
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'

app/src/debug/res/mipmap-hdpi/ic_launcher.png

@@ -20,6 +20,7 @@
         android:fullBackupContent="@xml/backup_descriptor"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:replace="android:allowBackup">

app/src/debug/res/mipmap-mdpi/ic_launcher.png

@@ -39,12 +39,10 @@ class NotificationViewImpl(private val context: Context) : NotificationView {
             notificationManager.createNotificationChannel(channel)
         }
 
-        val icon = BitmapFactory.decodeResource(resources, R.mipmap.ic_launcher)
         val builder = NotificationCompat.Builder(context, CHANNEL_FOREGROUND)
                 .setContentTitle(context.getString(R.string.app_name))
                 .setContentText(message)
                 .setSmallIcon(R.drawable.ic_notification)
-                .setLargeIcon(Bitmap.createScaledBitmap(icon, 128, 128, false))
                 .setContentIntent(pendingIntent)
                 .setOngoing(true)
                 .setPriority(Notification.PRIORITY_LOW)
@@ -64,11 +62,11 @@ class NotificationViewImpl(private val context: Context) : NotificationView {
         notificationIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
         val pendingIntent = PendingIntent.getActivity(context, 0, notificationIntent, 0)
 
-        val icon = BitmapFactory.decodeResource(resources, R.mipmap.ic_launcher)
         val name = if (displayName.isNullOrEmpty()) deviceName else "$displayName ($deviceName)"
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             val channel = NotificationChannel(CHANNEL_MESSAGE, context.getString(R.string.notification__channel_message), NotificationManager.IMPORTANCE_MAX)
+            channel.setShowBadge(true)
             notificationManager.createNotificationChannel(channel)
         }
 
@@ -77,7 +75,6 @@ class NotificationViewImpl(private val context: Context) : NotificationView {
                 .setContentText(message)
                 .setLights(Color.BLUE, 3000, 3000)
                 .setSmallIcon(R.drawable.ic_new_message)
-                .setLargeIcon(Bitmap.createScaledBitmap(icon, 128, 128, false))
                 .setContentIntent(pendingIntent)
                 .setAutoCancel(true)
                 .setPriority(Notification.PRIORITY_MAX)
@@ -107,17 +104,15 @@ class NotificationViewImpl(private val context: Context) : NotificationView {
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             val channel = NotificationChannel(CHANNEL_REQUEST, context.getString(R.string.notification__channel_request), NotificationManager.IMPORTANCE_MAX)
+            channel.setShowBadge(true)
             notificationManager.createNotificationChannel(channel)
         }
 
-        val icon = BitmapFactory.decodeResource(resources, R.mipmap.ic_launcher)
-
         val builder = NotificationCompat.Builder(context, CHANNEL_REQUEST)
                 .setContentTitle(context.getString(R.string.notification__connection_request))
                 .setContentText(context.getString(R.string.notification__connection_request_body, deviceName))
                 .setLights(Color.BLUE, 3000, 3000)
                 .setSmallIcon(R.drawable.ic_connection_request)
-                .setLargeIcon(Bitmap.createScaledBitmap(icon, 128, 128, false))
                 .setContentIntent(pendingIntent)
                 .setAutoCancel(true)
                 .setPriority(Notification.PRIORITY_MAX)

app/src/debug/res/mipmap-xhdpi/ic_launcher.png

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/debug/res/mipmap-xxhdpi/ic_launcher.png

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>