Merge remote-tracking branch 'upstream/master'

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "geeksville-androidlib"]
 	path = geeksville-androidlib
 	url = https://github.com/meshtastic/geeksville-androidlib.git
+[submodule "design"]
+	path = design
+	url = https://github.com/meshtastic/meshtastic-design.git

app/build.gradle

@@ -31,9 +31,12 @@ android {
         applicationId "com.geeksville.mesh"
         minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works)
         targetSdkVersion 29
-        versionCode 20136 // format is Mmmss (where M is 1+the numeric major number
-        versionName "1.1.36"
+        versionCode 20137 // format is Mmmss (where M is 1+the numeric major number
+        versionName "1.1.37"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        // per https://developer.android.com/studio/write/vector-asset-studio
+        vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
         release {
@@ -165,7 +168,7 @@ dependencies {
     implementation 'com.google.android.gms:play-services-auth:19.0.0'
 
     // Add the Firebase SDK for Crashlytics.
-    implementation 'com.google.firebase:firebase-crashlytics:17.3.0'
+    implementation 'com.google.firebase:firebase-crashlytics:17.3.1'
 
     // alas implementation bug deep in the bowels when I tried it for my SyncBluetoothDevice class
     // implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3"
@@ -178,7 +181,7 @@ dependencies {
     implementation('com.journeyapps:zxing-android-embedded:4.1.0') { transitive = false }
     implementation 'com.google.zxing:core:3.4.1'
 
-    def work_version = '2.4.0'
+    def work_version = '2.5.0'
 
     // Work Request - used to delay boot event handling
     // implementation "androidx.work:work-runtime:$work_version"

app/src/main/AndroidManifest.xml

@@ -75,9 +75,9 @@
         tools:replace="android:icon"
         android:name="com.geeksville.mesh.MeshUtilApplication"
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher_new"
+        android:icon="@mipmap/ic_launcher2"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_new_round"
+        android:roundIcon="@mipmap/ic_launcher2_round"
         android:supportsRtl="true"
         android:hardwareAccelerated="true"
         android:theme="@style/AppTheme">
@@ -99,13 +99,13 @@
             android:name="com.geeksville.mesh.service.SoftwareUpdateService"
             android:enabled="true"
             android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE"></service>
+            android:permission="android.permission.BIND_JOB_SERVICE" />
 
         <!-- This is the public API for doing mesh radio operations from android apps -->
         <service
             android:name="com.geeksville.mesh.service.MeshService"
             android:enabled="true"
-            android:exported="true">
+            android:exported="true" tools:ignore="ExportedActivity">
             <intent-filter>
                 <action android:name="com.geeksville.mesh.Service" />
             </intent-filter>

app/src/main/aidl/com/geeksville/mesh/IMeshService.aidl

@@ -23,7 +23,13 @@ The intent you use to reach the service should look like this:
 Once you have bound to the service you should register your broadcast receivers per https://developer.android.com/guide/components/broadcasts#context-registered-receivers
 
     // com.geeksville.mesh.x broadcast intents, where x is:
-    // RECEIVED_DATA  for data received from other nodes.  payload will contain a DataPacket
+
+    // RECEIVED_DATA for data received from other nodes.  payload will contain a DataPacket, this action is DEPRECATED (because it sends all received data)
+    // far better to instead use RECEIVED.<portnumm>
+
+    // RECEIVED.<portnumm> -  will **only** deliver packets for the specified port number.  If a wellknown portnums.proto name for portnum is known it will be used
+    // (i.e. com.geeksville.mesh.RECEIVED.TEXT_MESSAGE_APP) else the numeric portnum will be included as a base 10 integer (com.geeksville.mesh.RECEIVED.4403 etc...)
+
     // NODE_CHANGE  for new IDs appearing or disappearing
     // CONNECTION_CHANGED for losing/gaining connection to the packet radio
     // MESSAGE_STATUS_CHANGED for any message status changes (for sent messages only, other messages come via RECEIVED_DATA.  payload will contain a message ID and a MessageStatus)

app/src/main/java/com/geeksville/mesh/MainActivity.kt

@@ -569,7 +569,7 @@ class MainActivity : AppCompatActivity(), Logging,
         val filter = IntentFilter()
         filter.addAction(MeshService.ACTION_MESH_CONNECTED)
         filter.addAction(MeshService.ACTION_NODE_CHANGE)
-        filter.addAction(MeshService.ACTION_RECEIVED_DATA)
+        filter.addAction(MeshService.actionReceived(Portnums.PortNum.TEXT_MESSAGE_APP_VALUE))
         filter.addAction((MeshService.ACTION_MESSAGE_STATUS))
         registerReceiver(meshServiceReceiver, filter)
         receiverRegistered = true;
@@ -641,8 +641,7 @@ class MainActivity : AppCompatActivity(), Logging,
                     model.isConnected.value = oldConnection
                 }
             }
-        }
-        else {
+        } else {
             // For other connection states, just slam them in
             model.isConnected.value = connected
         }
@@ -717,18 +716,12 @@ class MainActivity : AppCompatActivity(), Logging,
                         }
                     }
 
-                    MeshService.ACTION_RECEIVED_DATA -> {
-                        debug("received new data from service")
+                    MeshService.actionReceived(Portnums.PortNum.TEXT_MESSAGE_APP_VALUE) -> {
+                        debug("received new message from service")
                         val payload =
                             intent.getParcelableExtra<DataPacket>(EXTRA_PAYLOAD)!!
 
-                        when (payload.dataType) {
-                            Portnums.PortNum.TEXT_MESSAGE_APP_VALUE -> {
-                                model.messagesState.addMessage(payload)
-                            }
-                            else ->
-                                debug("activity only cares about text messages, ignoring dataType ${payload.dataType}")
-                        }
+                        model.messagesState.addMessage(payload)
                     }
 
                     MeshService.ACTION_MESSAGE_STATUS -> {

app/src/main/java/com/geeksville/mesh/service/MeshService.kt

@@ -53,7 +53,20 @@ class MeshService : Service(), Logging {
         const val NODENUM_BROADCAST = (0xffffffff).toInt()
 
         /// Intents broadcast by MeshService
+
+        @Deprecated(message = "Does not filter by port number.  For legacy reasons only broadcast for UNKNOWN_APP, switch to ACTION_RECEIVED")
         const val ACTION_RECEIVED_DATA = "$prefix.RECEIVED_DATA"
+
+        fun actionReceived(portNum: String) = "$prefix.RECEIVED.$portNum"
+
+        /// generate a RECEIVED action filter string that includes either the portnumber as an int, or preferably a symbolic name from portnums.proto
+        fun actionReceived(portNum: Int): String {
+            val portType = Portnums.PortNum.forNumber(portNum)
+            val portStr = portType?.toString() ?: portNum.toString()
+
+            return actionReceived(portStr)
+        }
+
         const val ACTION_NODE_CHANGE = "$prefix.NODE_CHANGE"
         const val ACTION_MESH_CONNECTED = "$prefix.MESH_CONNECTED"
         const val ACTION_MESSAGE_STATUS = "$prefix.MESSAGE_STATUS"

app/src/main/java/com/geeksville/mesh/service/MeshServiceBroadcasts.kt

@@ -5,6 +5,7 @@ import android.content.Intent
 import android.os.Parcelable
 import com.geeksville.mesh.DataPacket
 import com.geeksville.mesh.NodeInfo
+import com.geeksville.mesh.Portnums
 
 class MeshServiceBroadcasts(
     private val context: Context,
@@ -12,12 +13,17 @@ class MeshServiceBroadcasts(
     private val getConnectionState: () -> MeshService.ConnectionState
 ) {
     /**
-     * The RECEIVED_OPAQUE:
+     * Broadcast some received data
      * Payload will be a DataPacket
      */
     fun broadcastReceivedData(payload: DataPacket) {
-        val intent = Intent(MeshService.ACTION_RECEIVED_DATA).putExtra(EXTRA_PAYLOAD, payload)
-        explicitBroadcast(intent)
+
+        explicitBroadcast(Intent(MeshService.actionReceived(payload.dataType)).putExtra(EXTRA_PAYLOAD, payload))
+
+        // For the time being we ALSO broadcast using old ACTION_RECEIVED_DATA field for any oldschool opaque packets
+        // newer packets (that have a non zero portnum) are only broadcast using the standard mechanism.
+        if(payload.dataType == Portnums.PortNum.UNKNOWN_APP_VALUE)
+            explicitBroadcast(Intent(MeshService.ACTION_RECEIVED_DATA).putExtra(EXTRA_PAYLOAD, payload))
     }
 
     fun broadcastNodeChange(info: NodeInfo) {

app/src/main/java/com/geeksville/mesh/service/MeshServiceNotifications.kt

@@ -73,7 +73,7 @@ class MeshServiceNotifications(
         val builder = NotificationCompat.Builder(context, channelId).setOngoing(true)
             .setPriority(NotificationCompat.PRIORITY_MIN)
             .setCategory(category)
-            .setSmallIcon(android.R.drawable.stat_sys_data_bluetooth)
+            .setSmallIcon(R.drawable.app_icon)
             .setContentTitle(summaryString) // leave this off for now so our notification looks smaller
             .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
             .setContentIntent(openAppIntent)

app/src/main/res/drawable-anydpi/app_icon.xml

@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF"
+    android:alpha="0.8">
+  <group android:scaleX="0.24"
+      android:scaleY="0.24"
+      android:translateY="5.4">
+    <path
+        android:pathData="M64.716,13.073L37.867,52.447L32.204,48.585L61.878,5.068C62.516,4.132 63.575,3.572 64.707,3.571C65.839,3.57 66.899,4.128 67.538,5.063L97.281,48.512L91.625,52.384L64.716,13.073Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M8.379,52.406L39.741,6.415L34.078,2.553L2.716,48.544L8.379,52.406Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>

app/src/main/res/drawable/app_icon2.xml

@@ -1,7 +0,0 @@
-<vector android:height="108dp" android:tint="?attr/colorControlNormal"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="108dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <group android:scaleX="0.5" android:scaleY="0.5" android:translateX="6" android:translateY="6">
-    <path android:fillColor="@android:color/white" android:pathData="M12,5c-3.87,0 -7,3.13 -7,7h2c0,-2.76 2.24,-5 5,-5s5,2.24 5,5h2c0,-3.87 -3.13,-7 -7,-7zM13,14.29c0.88,-0.39 1.5,-1.26 1.5,-2.29 0,-1.38 -1.12,-2.5 -2.5,-2.5S9.5,10.62 9.5,12c0,1.02 0.62,1.9 1.5,2.29v3.3L7.59,21 9,22.41l3,-3 3,3L16.41,21 13,17.59v-3.3zM12,1C5.93,1 1,5.93 1,12h2c0,-4.97 4.03,-9 9,-9s9,4.03 9,9h2c0,-6.07 -4.93,-11 -11,-11z"/>
-    </group>
-</vector>

app/src/main/res/drawable/ic_launcher2_background.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="3.7795277"
+      android:scaleY="3.7795277">
+    <path
+        android:pathData="M0.1623,0.1772l28.2505,0l0,28.2205l-28.2505,0z"
+        android:strokeWidth="0.529167"
+        android:fillColor="#67ea94"/>
+  </group>
+</vector>

app/src/main/res/drawable/ic_launcher2_foreground.xml

@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="2.4944882"
+      android:scaleY="2.4944882"
+      android:translateX="18.36"
+      android:translateY="18.36">
+    <path
+        android:pathData="m16.9229,9.3914 l-4.8076,13.3628 -1.0141,-1.3106 5.3136,-14.7693c0.1142,-0.3174 0.3038,-0.5075 0.5065,-0.5079 0.2028,-0.0003 0.3925,0.1891 0.507,0.5062l5.3259,14.7461 -1.0128,1.3141z"
+        android:strokeLineJoin="round"
+        android:fillColor="#2c2d3c"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="m6.8349,22.7403 l5.6159,-15.6089 -1.0141,-1.3106 -5.6159,15.6089z"
+        android:strokeLineJoin="round"
+        android:fillColor="#2c2d3c"
+        android:fillType="evenOdd"/>
+  </group>
+</vector>

app/src/main/res/drawable/ic_launcher_new_background.xml

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    android:height="108dp"
-    android:width="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#3DDC84"
-          android:pathData="M0,0h108v108h-108z"/>
-    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-</vector>

app/src/main/res/drawable/ic_launcher_new_foreground.xml

@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108"
-    android:tint="#2C2D3C">
-  <group android:scaleX="2.61"
-      android:scaleY="2.61"
-      android:translateX="22.68"
-      android:translateY="22.68">
-      <path
-          android:fillColor="@android:color/white"
-          android:pathData="M12,5c-3.87,0 -7,3.13 -7,7h2c0,-2.76 2.24,-5 5,-5s5,2.24 5,5h2c0,-3.87 -3.13,-7 -7,-7zM13,14.29c0.88,-0.39 1.5,-1.26 1.5,-2.29 0,-1.38 -1.12,-2.5 -2.5,-2.5S9.5,10.62 9.5,12c0,1.02 0.62,1.9 1.5,2.29v3.3L7.59,21 9,22.41l3,-3 3,3L16.41,21 13,17.59v-3.3zM12,1C5.93,1 1,5.93 1,12h2c0,-4.97 4.03,-9 9,-9s9,4.03 9,9h2c0,-6.07 -4.93,-11 -11,-11z"/>
-  </group>
-</vector>

app/src/main/res/layout/activity_main.xml

@@ -37,12 +37,13 @@
                         android:id="@+id/imageView5"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
                         android:contentDescription="@string/application_icon"
                         android:scaleType="center"
                         android:scaleX="1.5"
                         android:scaleY="1.5"
-                        app:srcCompat="@drawable/ic_baseline_settings_input_antenna_24" />
+                        app:srcCompat="@drawable/app_icon"
+                        tools:layout_editor_absoluteX="16dp"
+                        tools:layout_editor_absoluteY="18dp" />
 
                     <TextView
                         android:id="@+id/title"

app/src/main/res/layout/adapter_message_layout.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:contentDescription="Message delivery status">
+    android:contentDescription="@string/message_delivery_status">
 
     <androidx.cardview.widget.CardView
         android:id="@+id/Card"
@@ -25,10 +25,13 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
                 android:text="@string/some_username"
                 android:visibility="visible"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
                 android:id="@+id/messageText"
@@ -49,6 +52,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
+                android:contentDescription="@string/message_reception_state"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/messageText"
                 app:srcCompat="@drawable/cloud_on" />
@@ -58,7 +62,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
+                android:layout_marginBottom="8dp"
+                android:contentDescription="@string/message_reception_time"
                 android:text="3 minutes ago"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/messageStatusIcon"
                 app:layout_constraintTop_toBottomOf="@id/messageText" />
 

app/src/main/res/mipmap-anydpi-v26/ic_launcher2.xml

@@ -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="@drawable/ic_launcher2_background"/>
+    <foreground android:drawable="@drawable/ic_launcher2_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher2_round.xml

@@ -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="@drawable/ic_launcher2_background"/>
+    <foreground android:drawable="@drawable/ic_launcher2_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_new.xml

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

app/src/main/res/mipmap-anydpi-v26/ic_launcher_new_round.xml

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

app/src/main/res/values/strings.xml

@@ -80,4 +80,7 @@
     <string name="updating_firmware">Updating firmware, wait up to eight minutes...</string>
     <string name="update_successful">Update successful</string>
     <string name="update_failed">Update failed</string>
+    <string name="message_reception_time">message reception time</string>
+    <string name="message_reception_state">message reception state</string>
+    <string name="message_delivery_status">Message delivery status</string>
 </resources>

build.gradle

@@ -10,7 +10,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:4.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"