chore: Release v1.3.0

README.md

@@ -30,24 +30,24 @@ Our chat channel is on gitter here: https://gitter.im/fossasia/susi_android
 
 <table>
   <tr>
-    <td><img src="docs/_static/login.png" height = "480" width="270"></td>
-    <td><img src="docs/_static/signup.png" height = "480" width="270"></td>
-    <td><img src="docs/_static/voice_input.png" height = "480" width="270"></td>
+    <td><img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/login.png" height = "480" width="270"></td>
+    <td><img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/signup.png" height = "480" width="270"></td>
+    <td><img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/voice_input.png" height = "480" width="270"></td>
   </tr>
   <tr>
-    <td><img src="docs/_static/chat.png" height = "480" width="270"></td>
-    <td><img src="docs/_static/skills_list.png" height = "480" width="270"></td>
-    <td><img src="docs/_static/skills.png" height = "480" width="270"></td>
+    <td><img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/chat.png" height = "480" width="270"></td>
+    <td><img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/skills_list.png" height = "480" width="270"></td>
+    <td><img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/skills.png" height = "480" width="270"></td>
   </tr>
   <tr>
-    <td><img src="docs/_static/groupwise_skills.png" height = "480" width="270"></td>
-    <td><img src="docs/_static/rating_and_feedback.png" height = "480" width="270"></td>
-    <td><img src="docs/_static/settings1.png" height = "480" width="270"></td>
+    <td><img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/groupwise_skills.png" height = "480" width="270"></td>
+    <td><img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/rating_and_feedback.png" height = "480" width="270"></td>
+    <td><img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/settings1.png" height = "480" width="270"></td>
   </tr>
   <tr>
-    <td><img src="docs/_static/settings2.png" height = "480" width="270"></td>
-    <td><img src="docs/_static/help.png" height = "480" width="270"></td>
-    <td><img src="docs/_static/privacy.png" height = "480" width="270"></td>
+    <td><img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/settings2.png" height = "480" width="270"></td>
+    <td><img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/help.png" height = "480" width="270"></td>
+    <td><img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/privacy.png" height = "480" width="270"></td>
   </tr>
 </table>
 

app/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.diffplug.gradle.spotless" version "3.23.0"
+    id "com.diffplug.gradle.spotless" version "3.23.1"
 }
 
 def rootConfiguration = {}
@@ -22,8 +22,8 @@ android {
         applicationId "ai.susi"
         minSdkVersion rootConfiguration.minSdkVersion
         targetSdkVersion rootConfiguration.targetSdkVersion
-        versionCode 17
-        versionName "1.2.0"
+        versionCode 18
+        versionName "1.3.0"
         vectorDrawables.useSupportLibrary = true
         // for unit test
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -151,7 +151,9 @@ dependencies {
     implementation "com.jakewharton.timber:timber:${rootConfiguration.timberVersion}"
 
     //Shimmer
-    implementation 'com.facebook.shimmer:shimmer:0.4.0'
+    implementation "com.facebook.shimmer:shimmer:${rootConfiguration.shimmerVersion}"
 
+    //Smart LOck authentication
+    implementation "com.google.android.gms:play-services-auth:${rootConfiguration.playServiceAuthVersion}"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${rootConfiguration.kotlinVersion}"
 }

app/config.gradle

@@ -23,4 +23,6 @@ ext {
     customTabsVersion = '28.0.0'
     jUnitVersion = '4.12'
     mockitoCoreVersion = '1.10.19'
+    playServiceAuthVersion='16.0.1'
+    shimmerVersion = "0.5.0"
 }

app/src/main/AndroidManifest.xml

@@ -20,6 +20,7 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:vmSafeMode="true">
         <activity android:name=".chat.search.ChatSearchActivity"></activity>
         <activity
@@ -93,6 +94,14 @@
                 android:value="org.fossasia.susi.ai.login.LoginActivity" />
         </activity>
 
+        <activity android:name=".device.managedevices.ManageDeviceActivity"
+            android:label="Manage Devices"
+            android:theme="@style/PreferencesThemeLight">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.fossasia.susi.ai.skills.SkillsActivity" />
+        </activity>
+
         <activity
             android:name=".skills.feedback.FeedbackActivity"
             android:label="See All Reviews"

app/src/main/java/org/fossasia/susi/ai/chat/ChatActivity.kt

@@ -101,10 +101,9 @@ class ChatActivity : AppCompatActivity(), IChatView {
         setUpUI()
         initializationMethod(firstRun)
 
-        example = if (intent.getStringExtra("example") != null) {
-            intent.getStringExtra("example")
-        } else {
-            ""
+        if (intent.hasExtra("example")) {
+            example = intent.getStringExtra("example")
+            intent.removeExtra("example")
         }
 
         networkStateReceiver = object : BroadcastReceiver() {
@@ -114,7 +113,7 @@ class ChatActivity : AppCompatActivity(), IChatView {
         }
         searchChat.visibility = View.VISIBLE
         fabsetting.visibility = View.VISIBLE
-        voiceSearchChat.visibility = View.GONE
+        voiceSearchChat.visibility = View.VISIBLE
     }
 
     override fun onTouchEvent(event: MotionEvent): Boolean {
@@ -356,6 +355,7 @@ class ChatActivity : AppCompatActivity(), IChatView {
         hideSoftKeyboard(this, window.decorView)
         searchChat.visibility = View.GONE
         fabsetting.visibility = View.GONE
+        voiceSearchChat.visibility = View.GONE
         val fragmentTransaction = supportFragmentManager.beginTransaction()
         fragmentTransaction.replace(R.id.speechToTextFrame, STTFragment())
         fragmentTransaction.addToBackStack(null)
@@ -550,6 +550,7 @@ class ChatActivity : AppCompatActivity(), IChatView {
         chatPresenter.getUndeliveredMessages()
 
         if (!example.isEmpty()) {
+            Timber.d("Message is not empty.")
             chatPresenter.addToNonDeliveredList(example, example)
             example = ""
         }

app/src/main/java/org/fossasia/susi/ai/chat/STTfragment.kt

@@ -3,9 +3,11 @@ package org.fossasia.susi.ai.chat
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.os.Handler
 import android.speech.RecognitionListener
 import android.speech.RecognizerIntent
 import android.speech.SpeechRecognizer
+import android.speech.tts.TextToSpeech
 import android.support.annotation.NonNull
 import android.support.v4.app.Fragment
 import android.support.v7.widget.LinearLayoutManager
@@ -19,7 +21,9 @@ import kotlinx.android.synthetic.main.fragment_sttframe.view.*
 import org.fossasia.susi.ai.R
 import org.fossasia.susi.ai.chat.adapters.recycleradapters.VoiceCommandsAdapter
 import org.fossasia.susi.ai.chat.contract.IChatPresenter
+import org.fossasia.susi.ai.helper.PrefManager
 import timber.log.Timber
+import java.util.Locale
 
 /**
  * Created by meeera on 17/8/17.
@@ -28,6 +32,9 @@ class STTFragment : Fragment() {
     lateinit var recognizer: SpeechRecognizer
     lateinit var chatPresenter: IChatPresenter
     private val thisActivity = activity
+    private var textToSpeech: TextToSpeech? = null
+    private val mainHandler: Handler = Handler()
+    private val subHandler: Handler = Handler()
 
     override fun onAttach(context: Context?) {
         super.onAttach(context)
@@ -39,27 +46,60 @@ class STTFragment : Fragment() {
         val rootView = inflater.inflate(R.layout.fragment_sttframe, container, false)
         if (thisActivity is ChatActivity)
             thisActivity.fabsetting.hide()
-        promptSpeechInput()
         setupCommands(rootView)
         return rootView
     }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+
+        recognizer = SpeechRecognizer
+                .createSpeechRecognizer(activity?.applicationContext)
+
+        mainHandler.post(runnable)
+        if (!PrefManager.getBoolean(R.string.used_voice, true)) {
+            subHandler.postDelayed(delayRunnable, 1500)
+        }
+
+        super.onViewCreated(view, savedInstanceState)
+    }
+
+    private val runnable: Runnable = Runnable {
+        textToSpeech = TextToSpeech(requireContext(), TextToSpeech.OnInitListener { status ->
+            if (status != TextToSpeech.ERROR) {
+                val locale = textToSpeech?.language
+                textToSpeech?.language = locale
+                if (!PrefManager.getBoolean(R.string.used_voice, false)) {
+                    textToSpeech?.speak(getString(R.string.voice_welcome), TextToSpeech.QUEUE_FLUSH, null)
+                    PrefManager.putBoolean(R.string.used_voice, true)
+                } else {
+                    promptSpeechInput()
+                }
+            }
+        })
+    }
+
+    private val delayRunnable: Runnable = Runnable {
+        promptSpeechInput()
+    }
+
     private fun setupCommands(rootView: View) {
         var voiceCommand = getResources().getStringArray(R.array.voiceCommands)
         var voiceCommandsList = voiceCommand.toCollection(ArrayList())
         rootView.clickableCommands.layoutManager = LinearLayoutManager(activity, LinearLayoutManager.HORIZONTAL, false)
         rootView.clickableCommands.adapter = VoiceCommandsAdapter(voiceCommandsList, activity)
     }
+
     private fun promptSpeechInput() {
         val intent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH)
         intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL,
                 RecognizerIntent.LANGUAGE_MODEL_FREE_FORM)
         intent.putExtra(RecognizerIntent.EXTRA_CALLING_PACKAGE,
                 "com.domain.app")
+        intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE, Locale.getDefault())
         intent.putExtra(RecognizerIntent.EXTRA_PARTIAL_RESULTS, true)
+        intent.putExtra(RecognizerIntent.EXTRA_SPEECH_INPUT_POSSIBLY_COMPLETE_SILENCE_LENGTH_MILLIS, 5000)
+        intent.putExtra(RecognizerIntent.EXTRA_SPEECH_INPUT_COMPLETE_SILENCE_LENGTH_MILLIS, 5000)
 
-        recognizer = SpeechRecognizer
-                .createSpeechRecognizer(activity?.applicationContext)
         val listener = object : RecognitionListener {
             override fun onResults(results: Bundle) {
                 val voiceResults = results
@@ -81,6 +121,9 @@ class STTFragment : Fragment() {
                     chatPresenter.startHotwordDetection()
                 }
                 (activity as ChatActivity).fabsetting.show()
+                activity?.searchChat?.show()
+                activity?.voiceSearchChat?.show()
+                activity?.btnSpeak?.isEnabled = true
                 activity?.supportFragmentManager?.popBackStackImmediate()
             }
 
@@ -94,6 +137,10 @@ class STTFragment : Fragment() {
                 speechProgress?.onResultOrOnError()
                 recognizer.destroy()
                 activity?.fabsetting?.show()
+                activity?.searchChat?.show()
+                activity?.voiceSearchChat?.show()
+                activity?.btnSpeak?.isEnabled = true
+                chatPresenter.startHotwordDetection()
                 activity?.supportFragmentManager?.popBackStackImmediate()
             }
 
@@ -134,7 +181,16 @@ class STTFragment : Fragment() {
             thisActivity.enableVoiceInput()
             thisActivity.fabsetting.show()
         }
+        if (textToSpeech != null) {
+            textToSpeech?.stop()
+        }
         recognizer.cancel()
         recognizer.destroy()
     }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        mainHandler.removeCallbacks(runnable)
+        subHandler.removeCallbacks(delayRunnable)
+    }
 }

app/src/main/java/org/fossasia/susi/ai/chat/adapters/recycleradapters/VoiceCommandsAdapter.kt

@@ -6,8 +6,13 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import kotlinx.android.synthetic.main.activity_chat.searchChat
+import kotlinx.android.synthetic.main.activity_chat.voiceSearchChat
+import kotlinx.android.synthetic.main.activity_chat.fabsetting
+import kotlinx.android.synthetic.main.activity_chat.btnSpeak
 import kotlinx.android.synthetic.main.item_voice_commands.view.voiceCommand
 import org.fossasia.susi.ai.R
+import org.fossasia.susi.ai.chat.ChatActivity
 import org.fossasia.susi.ai.chat.ChatPresenter
 import org.fossasia.susi.ai.chat.contract.IChatPresenter
 
@@ -32,13 +37,16 @@ class VoiceCommandsAdapter(val items: ArrayList<String>, val context: Context?)
         val voiceCommand: TextView = view.voiceCommand
 
         init {
-            view.setOnClickListener {
-                val chatMessage = items[adapterPosition]
-                val splits = chatMessage.split("\n".toRegex()).dropLastWhile { it.isEmpty() }
-                val message = splits.joinToString(" ")
-                if (!chatMessage.isEmpty()) {
-                    chatPresenter.sendMessage(message, items[adapterPosition])
-                }
+            voiceCommand.setOnClickListener {
+                val message = items[adapterPosition]
+                val this_activity = context
+                (this_activity as ChatActivity).setText(message)
+                this_activity.searchChat.show()
+                this_activity.voiceSearchChat.show()
+                this_activity.fabsetting.show()
+                this_activity.btnSpeak.isEnabled = true
+                chatPresenter.startHotwordDetection()
+                this_activity.supportFragmentManager.popBackStackImmediate()
             }
         }
     }