Minor fixes

- README.md updated
- Lib version 2.2
- App version 2.0.7

Author: Thomas Reny

MultiChannelDetectionLibrary/build.gradle

@@ -5,13 +5,13 @@ plugins {
 
 android {
     compileSdkVersion 30
-    buildToolsVersion "30.0.2"
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 20
-        versionName "2.0"
+        versionCode 22
+        versionName "2.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -38,7 +38,7 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.3.0'
-    testImplementation 'junit:junit:4.+'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     implementation 'com.aldebaran:qisdk:1.7.5'

MultiChannelDetectionLibrary/src/main/java/com/softbankrobotics/multichanneldetectionlibrary/MultiChannelDetection.kt

@@ -29,7 +29,7 @@ import com.softbankrobotics.multichanneldetectionlibrary.utils.SaveFileHelper
 class MultiChannelDetection(activity: MultiChannelDetectionCallbacks) {
 
     companion object {
-        private const val TAG = "MSI_HumanDetection"
+        private const val TAG = "MultiChannelDetection"
         // Save Map
         const val mapFileName = "mapData.txt"
         // Localize

README.md

@@ -1,8 +1,9 @@
-# Pepper Covid Assistant
+# MultiChannelDetection Library
 
 ## Library
 
-The module HumanDetection use both the native detection with the QiSDK and the library pepper-mask-detection to improve the detection of masked user.
+The module MultiChannelDetection uses both the native Human detection with the QiSDK and the library pepper-mask-detection to improve the detection of masked users.
+Regardless of the system detecting a human, this module will inform your application.
 
 ## How it work
 
@@ -22,7 +23,7 @@ Add the dependency on the face detection lib to your app build.gradle in the dep
 
 ```
 dependencies {
-	implementation 'com.github.softbankrobotics-labs:MultiChannelDetectionLibrary:2.1'
+	implementation 'com.github.softbankrobotics-labs:MultiChannelDetectionLibrary:2.2'
 }
 ```
 
@@ -36,7 +37,6 @@ class MainActivity : RobotActivity(), RobotLifecycleCallbacks, MultiChannelDetec
 
     private val KEY_REQUEST_PERMISSION = 102
 
-    ---
 }
 ```
 
@@ -187,7 +187,8 @@ List of options
 
 ## Application
 
-Pepper Covid Assistant is a application for Pepper to prevent and inform about the Covid19 and show a use case of the mask detection library
+This repository contains the library and a sample app to explain how to use it.
+Pepper Covid Assistant is an application for Pepper to prevent and inform about the Covid19 and show a use case of the MultiChannelDetection library.
 
 ## Features
 
@@ -215,7 +216,6 @@ Conversational Content
 * 'com.aldebaran:qisdk-conversationalcontent-greetings:0.19.1-experimental-05'
 * 'com.aldebaran:qisdk-conversationalcontent-askrobotname:0.19.1-experimental-05'
 * 'com.aldebaran:qisdk-conversationalcontent-robotabilities:0.19.1-experimental-05'
-* 'com.aldebaran:qisdk-conversationalcontent-notunderstood:0.19.1-experimental-05'
 * 'com.aldebaran:qisdk-conversationalcontent-repeat:0.19.1-experimental-05'
 * 'com.aldebaran:qisdk-conversationalcontent-volumecontrol:0.19.1-experimental-05'
 

app/build.gradle

@@ -3,15 +3,15 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.softbankrobotics.peppercovidassistant"
         minSdkVersion 23
-        targetSdkVersion 29
-        versionCode 206
-        versionName "2.0.6"
+        targetSdkVersion 30
+        versionCode 207
+        versionName "2.0.7"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -45,10 +45,10 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     implementation 'com.aldebaran:qisdk:1.7.5'
@@ -59,12 +59,12 @@ dependencies {
     implementation 'com.aldebaran:qisdk-conversationalcontent-greetings:0.19.1-experimental-05'
     implementation 'com.aldebaran:qisdk-conversationalcontent-askrobotname:0.19.1-experimental-05'
     implementation 'com.aldebaran:qisdk-conversationalcontent-robotabilities:0.19.1-experimental-05'
-    implementation 'com.aldebaran:qisdk-conversationalcontent-notunderstood:0.19.1-experimental-05'
     implementation 'com.aldebaran:qisdk-conversationalcontent-repeat:0.19.1-experimental-05'
     implementation 'com.aldebaran:qisdk-conversationalcontent-volumecontrol:0.19.1-experimental-05'
 
     //Google Gms Services
     implementation 'com.google.android.gms:play-services-vision:20.1.3'
 
     implementation project(':MultiChannelDetectionLibrary')
+
 }

app/src/main/java/com/softbankrobotics/peppercovidassistant/utils/ChatData.kt

@@ -27,19 +27,19 @@ import kotlin.collections.HashMap
  * @param qiContext  the activity qiContext
  * @param locale     the android locale you want to build the chat in
  * @param topicNames the names of the .top file you want to use in this chat bot
- * @param conversationContents : the conversationalContents
+ * @param conversationalContents : the conversationalContents
  * @param buildChat  if you are running the chat in the same activity that builds this object
  *
  * this should be set to true, otherwise set it to false and use startChat
  */
 
 class ChatData(
-    private val activity: Activity,
-    private val qiContext: QiContext,
-    private val locale: Locale,
-    private val topicNames: List<String>,
-    private val conversationContents: List<AbstractConversationalContent> = listOf(),
-    private val buildChat: Boolean?
+        private val activity: Activity,
+        private val qiContext: QiContext,
+        private val locale: Locale,
+        private val topicNames: List<String>,
+        private val conversationalContents: List<AbstractConversationalContent> = listOf(),
+        private val buildChat: Boolean?
 )
 {
     private val topics: MutableMap<String, Topic>
@@ -106,7 +106,7 @@ class ChatData(
         chat = ConversationalContentChatBuilder.with(qiContext)
             .withChatbot(qiChatbot)
             .withLocale(qiLocale)
-            .withConversationalContents(this.conversationContents)
+            .withConversationalContents(this.conversationalContents)
             .build()
     }
 

build.gradle

@@ -4,13 +4,13 @@ apply plugin: 'maven'
 group = 'com.github.softbankrobotics-labs'
 
 buildscript {
-    ext.kotlin_version = "1.4.21"
+    ext.kotlin_version = "1.4.32"
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.1"
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong