Release version 2.0

app/build.gradle

@@ -7,10 +7,10 @@ android {
 
     defaultConfig {
         applicationId "com.danefinlay.ttsutil"
-        minSdkVersion 20
+        minSdkVersion 21
         targetSdkVersion 28
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "2.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
@@ -38,9 +38,10 @@ dependencies {
     androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.2')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:preference-v7:28.0.0'
     implementation 'org.jetbrains.anko:anko-sdk15:0.9'
     implementation 'org.jetbrains.anko:anko-support-v4:0.9.1'
-    implementation 'com.android.support.constraint:constraint-layout:2.0.0-beta3'
+    implementation 'com.android.support.constraint:constraint-layout:2.0.0-beta6'
     implementation 'com.android.support:design:28.0.0'
     testImplementation 'junit:junit:4.13-beta-3'
 }

app/src/main/java/com/danefinlay/ttsutil/ApplicationEx.kt

@@ -21,18 +21,47 @@
 package com.danefinlay.ttsutil
 
 import android.app.Application
+import android.content.res.Resources
 import android.media.AudioAttributes
 import android.media.AudioFocusRequest
 import android.media.AudioManager
 import android.media.AudioManager.OnAudioFocusChangeListener
 import android.os.Build
+import android.speech.tts.TextToSpeech
+import android.support.v7.preference.PreferenceManager
 import org.jetbrains.anko.audioManager
+import org.jetbrains.anko.longToast
+import org.jetbrains.anko.notificationManager
+import java.util.*
 
 class ApplicationEx : Application() {
 
     var speaker: Speaker? = null
         private set
 
+    var errorMessageId: Int? = null
+
+    /**
+     * Return the system's current locale.
+     *
+     * This will be a Locale object representing the user's preferred language as
+     * set in the system settings.
+     */
+    val currentSystemLocale: Locale
+        get() {
+            val systemConfig = Resources.getSystem().configuration
+            val systemLocale = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                systemConfig?.locales?.get(0)
+            } else {
+                @Suppress("deprecation")
+                systemConfig?.locale
+            }
+
+            // Return the system locale. Fallback on the default JVM locale if
+            // necessary.
+            return systemLocale ?: Locale.getDefault()
+        }
+
     private val audioFocusGain = AudioManager.AUDIOFOCUS_GAIN_TRANSIENT
     private val audioFocusRequest: AudioFocusRequest by lazy {
         if (Build.VERSION.SDK_INT > Build.VERSION_CODES.O) {
@@ -89,15 +118,44 @@ class ApplicationEx : Application() {
         }
     }
 
-    fun startSpeaker() {
+    fun startSpeaker(initListener: TextToSpeech.OnInitListener,
+                     preferredEngine: String?) {
         if (speaker == null) {
-            speaker = Speaker(this, true)
+            // Try to get the preferred engine package from shared preferences if
+            // it is null.
+            val engineName = preferredEngine ?:
+            PreferenceManager.getDefaultSharedPreferences(this)
+                    .getString("pref_tts_engine", null)
+
+            // Initialise the Speaker object.
+            speaker = Speaker(this, true, initListener,
+                    engineName)
         }
     }
 
+    /**
+     * Show the speaker error message (if set) or the default speaker not ready
+     * message.
+     */
+    fun showSpeakerNotReadyMessage() {
+        val defaultMessageId = R.string.speaker_not_ready_message
+        val errorMessageId = errorMessageId
+        longToast(errorMessageId ?: defaultMessageId)
+    }
+
     fun freeSpeaker() {
         speaker?.free()
         speaker = null
+
+        // Cancel any TTS notifications present.
+        notificationManager.cancel(SPEAKING_NOTIFICATION_ID)
+        notificationManager.cancel(SYNTHESIS_NOTIFICATION_ID)
+    }
+
+    fun reinitialiseSpeaker(initListener: TextToSpeech.OnInitListener,
+                            preferredEngine: String?) {
+        freeSpeaker()
+        startSpeaker(initListener, preferredEngine)
     }
 
     override fun onLowMemory() {

app/src/main/java/com/danefinlay/ttsutil/Notifications.kt

@@ -20,7 +20,6 @@
 
 package com.danefinlay.ttsutil
 
-import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
@@ -93,9 +92,10 @@ private fun getNotificationBuilder(ctx: Context, notificationId: Int):
 }
 
 
-fun buildSpeakerNotification(ctx: Context, notificationId: Int): Notification {
+fun speakerNotificationBuilder(ctx: Context, notificationId: Int):
+        NotificationCompat.Builder {
     val builder = getNotificationBuilder(ctx, notificationId)
-    builder.apply {
+    return builder.apply {
         // Set the title and text depending on the notification ID.
         when (notificationId) {
             SPEAKING_NOTIFICATION_ID -> {
@@ -111,5 +111,4 @@ fun buildSpeakerNotification(ctx: Context, notificationId: Int): Notification {
             }
         }
     }
-    return builder.build()
 }