* Added support for Portuguese language

* Added option to turn off application sounds (beeping)

Author: thanksmister

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/BaseActivity.kt

@@ -92,6 +92,8 @@ abstract class BaseActivity : DaggerAppCompatActivity() {
                 WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON,
                 WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON)
         decorView = window.decorView
+
+        lifecycle.addObserver(dialogUtils)
     }
 
     override fun onStart(){

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/Configuration.kt

@@ -87,6 +87,10 @@ constructor(private val sharedPreferences: DPreference) {
         get() = this.sharedPreferences.getPrefBoolean(PREF_PLATFORM_BAR, true)
         set(value) = this.sharedPreferences.setPrefBoolean(PREF_PLATFORM_BAR, value)
 
+    var systemSounds: Boolean
+        get() = this.sharedPreferences.getPrefBoolean(PREF_SYSTEM_SOUNDS, true)
+        set(value) = this.sharedPreferences.setPrefBoolean(PREF_SYSTEM_SOUNDS, value)
+
     var telegramChatId: String
         get() = this.sharedPreferences.getPrefString(PREF_TELEGRAM_CHAT_ID, "")
         set(value) = this.sharedPreferences.setPrefString(PREF_TELEGRAM_CHAT_ID, value)
@@ -274,6 +278,7 @@ constructor(private val sharedPreferences: DPreference) {
         @JvmField val PREF_IMAGE_CLIENT_ID = "pref_image_client_id"
         @JvmField val PREF_INACTIVITY_TIME = "pref_inactivity_time"
         @JvmField val PREF_MODULE_NOTIFICATION = "pref_module_notification"
+        @JvmField val PREF_SYSTEM_SOUNDS = "pref_system_sounds"
         @JvmField val PREF_MODULE_TSS = "pref_module_tss"
         @JvmField val PREF_SYSTEM_NOTIFICATIONS = "pref_system_notifications"
         @JvmField val PREF_MODULE_ALERTS = "pref_module_alerts"

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/activities/MainActivity.kt

@@ -336,7 +336,11 @@ class MainActivity : BaseActivity(), ViewPager.OnPageChangeListener, ControlsFra
     override fun onMQTTException(message: String) {
         Timber.d("onMQTTException")
         this@MainActivity.runOnUiThread {
-            dialogUtils.showAlertDialog(this@MainActivity, message)
+            dialogUtils.showAlertDialog(this@MainActivity, message, DialogInterface.OnClickListener { _, _ ->
+                if (mqttModule != null) {
+                    mqttModule!!.restart()
+                }
+            })
         }
     }
 

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/fragments/AlarmSettingsFragment.kt

@@ -240,7 +240,7 @@ class AlarmSettingsFragment : PreferenceFragmentCompat(), SharedPreferences.OnSh
             }, DialogInterface.OnCancelListener {
                 confirmCode = false
                 Toast.makeText(activity, R.string.toast_code_unchanged, Toast.LENGTH_SHORT).show()
-            })
+            }, configuration.systemSounds)
         }
     }
 }

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/fragments/ControlsFragment.kt

@@ -286,7 +286,7 @@ class ControlsFragment : BaseFragment() {
                 Timber.d("onCancel")
                 dialogUtils.clearDialogs()
             }
-        }, viewModel.getAlarmCode(), false, delayTime)
+        }, viewModel.getAlarmCode(), false, delayTime, configuration.systemSounds)
     }
 
     companion object {

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/fragments/MainFragment.kt

@@ -155,7 +155,7 @@ class MainFragment : BaseFragment() {
                 override fun onCancel() {
                     dialogUtils.clearDialogs()
                 }
-            })
+            }, configuration.systemSounds)
         }
     }
 
@@ -177,7 +177,7 @@ class MainFragment : BaseFragment() {
                 override fun onCancel() {
                     dialogUtils.clearDialogs()
                 }
-            }, configuration.alarmCode, true, delayTime)
+            }, configuration.alarmCode, true, delayTime, configuration.systemSounds)
         }
     }
 
@@ -188,6 +188,7 @@ class MainFragment : BaseFragment() {
             val code = configuration.alarmCode
             val disarmView = activity!!.findViewById<AlarmTriggeredView>(R.id.alarmTriggeredView)
             disarmView.setCode(code)
+            disarmView.setUseSound(configuration.systemSounds)
             disarmView.listener = object : AlarmTriggeredView.ViewListener {
                 override fun onComplete() {
                     listener!!.publishDisarmed()

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/fragments/NotificationsSettingsFragment.kt

@@ -46,6 +46,7 @@ class NotificationsSettingsFragment : PreferenceFragmentCompat(), SharedPreferen
     private var systemPreference: CheckBoxPreference? = null
     private var notificationsPreference: CheckBoxPreference? = null
     private var tssPreference: CheckBoxPreference? = null
+    private var soundPreference: CheckBoxPreference? = null
     private var alertsPreference: CheckBoxPreference? = null
     private var descriptionPreference: Preference? = null
     private var mqttOptions: MQTTOptions? = null
@@ -87,6 +88,7 @@ class NotificationsSettingsFragment : PreferenceFragmentCompat(), SharedPreferen
 
         topicPreference = findPreference(PREF_NOTIFICATION_TOPIC) as EditTextPreference
         notificationsPreference = findPreference(Configuration.PREF_MODULE_NOTIFICATION) as CheckBoxPreference
+        soundPreference = findPreference(Configuration.PREF_SYSTEM_SOUNDS) as CheckBoxPreference
         tssPreference = findPreference(Configuration.PREF_MODULE_TSS) as CheckBoxPreference
         alertsPreference = findPreference(Configuration.PREF_MODULE_ALERTS) as CheckBoxPreference
         systemPreference = findPreference(Configuration.PREF_SYSTEM_NOTIFICATIONS) as CheckBoxPreference
@@ -96,6 +98,7 @@ class NotificationsSettingsFragment : PreferenceFragmentCompat(), SharedPreferen
         tssPreference!!.isChecked = configuration.hasTssModule()
         alertsPreference!!.isChecked = configuration.hasAlertsModule()
         systemPreference!!.isChecked = configuration.hasSystemAlerts()
+        soundPreference!!.isChecked = configuration.systemSounds
 
         if (!TextUtils.isEmpty(mqttOptions!!.getNotificationTopic())) {
             topicPreference!!.text = mqttOptions!!.getNotificationTopic()
@@ -128,6 +131,10 @@ class NotificationsSettingsFragment : PreferenceFragmentCompat(), SharedPreferen
                 tssPreference!!.isEnabled = checked
                 alertsPreference!!.isEnabled = checked
             }
+            Configuration.PREF_SYSTEM_SOUNDS -> {
+                val sounds = soundPreference!!.isChecked
+                configuration.systemSounds = sounds
+            }
             Configuration.PREF_MODULE_TSS -> {
                 val tss = tssPreference!!.isChecked
                 configuration.setTssModule(tss)

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/views/BaseAlarmView.kt

@@ -16,6 +16,7 @@ abstract class BaseAlarmView : LinearLayout {
     var currentCode: Int = 0
     var codeComplete = false
     var enteredCode = ""
+    var useSystemSound: Boolean = true
 
     private var soundUtils: SoundUtils? = null
 
@@ -105,6 +106,10 @@ abstract class BaseAlarmView : LinearLayout {
         destroySoundUtils()
     }
 
+    fun setUseSound(value: Boolean) {
+        useSystemSound = value
+    }
+
     fun setCode(code: Int) {
         currentCode = code
     }
@@ -115,12 +120,18 @@ abstract class BaseAlarmView : LinearLayout {
     abstract fun reset()
 
     fun destroySoundUtils() {
+        if(!useSystemSound)
+            return
+
         if (soundUtils != null) {
             soundUtils?.destroyBuzzer()
         }
     }
 
     private fun playButtonPress() {
+        if(!useSystemSound)
+            return
+
         if (soundUtils == null) {
             soundUtils = SoundUtils(context)
             soundUtils?.init()
@@ -129,6 +140,9 @@ abstract class BaseAlarmView : LinearLayout {
     }
 
     fun playContinuousBeep() {
+        if(!useSystemSound)
+            return
+
         if (soundUtils == null) {
             soundUtils = SoundUtils(context)
             soundUtils?.init()

app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/utils/DialogUtils.kt

@@ -151,13 +151,14 @@ class DialogUtils(base: Context?) : ContextWrapper(base), LifecycleObserver {
      * it resets the timer.
      */
     fun showAlarmDisableDialog(activity: AppCompatActivity, alarmCodeListener: AlarmDisableView.ViewListener,
-                               code: Int, beep: Boolean, timeRemaining: Int) {
+                               code: Int, beep: Boolean, timeRemaining: Int, systemSounds: Boolean) {
         clearDialogs()
         val inflater = activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
         val view = inflater.inflate(R.layout.dialog_alarm_disable, null, false)
         val alarmCodeView = view.findViewById<AlarmDisableView>(R.id.alarmDisableView)
         alarmCodeView.setListener(alarmCodeListener)
         alarmCodeView.setCode(code)
+        alarmCodeView.setUseSound(systemSounds)
         alarmCodeView.startCountDown(timeRemaining)
         if (beep) {
             alarmCodeView.playContinuousBeep()
@@ -166,18 +167,19 @@ class DialogUtils(base: Context?) : ContextWrapper(base), LifecycleObserver {
         dialog!!.setOnDismissListener { alarmCodeView.destroySoundUtils() }
     }
 
-    fun showSettingsCodeDialog(activity: AppCompatActivity, code: Int, listener: SettingsCodeView.ViewListener) {
+    fun showSettingsCodeDialog(activity: AppCompatActivity, code: Int, listener: SettingsCodeView.ViewListener, systemSounds: Boolean) {
         clearDialogs()
         val inflater = activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
         val view = inflater.inflate(R.layout.dialog_settings_code, null, false)
         val settingsCodeView = view.findViewById<SettingsCodeView>(R.id.settingsCodeView)
         settingsCodeView.setCode(code)
         settingsCodeView.setListener(listener)
+        settingsCodeView.setUseSound(systemSounds)
         dialog = buildImmersiveDialog(activity, true, view, false)
     }
 
     fun showCodeDialog(activity: AppCompatActivity, confirmCode: Boolean, listener: AlarmCodeView.ViewListener,
-                       onCancelListener: DialogInterface.OnCancelListener) {
+                       onCancelListener: DialogInterface.OnCancelListener, systemSounds: Boolean) {
         clearDialogs()
         val inflater = activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
         val view = inflater.inflate(R.layout.dialog_alarm_code_set, null, false)
@@ -187,6 +189,7 @@ class DialogUtils(base: Context?) : ContextWrapper(base), LifecycleObserver {
             titleTextView.setText(R.string.text_renter_alarm_code_title)
         }
         alarmCodeView.setListener(listener)
+        alarmCodeView.setUseSound(systemSounds)
         dialog = buildImmersiveDialog(activity, true, view, false)
         dialog!!.setOnCancelListener(onCancelListener)
     }

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

@@ -246,6 +246,8 @@
     <string name="pref_camera_send_image_notes">Puedes usar Telegram, Mailgun o ambos para enviar imágenes capturadas.</string>
     <string name="menu_item_help">Ayuda</string>
     <string name="error_mailgun_credentials">Hubo un problema al enviar la imagen por correo, compruebe sus credenciales de Mailgun.</string>
+    <string name="pref_system_sounds_summary">Alternar el sonido utilizado para presionar botones y diálogos.</string>
+    <string name="pref_system_sounds_title">Sonidos del sistema</string>
 
     <string-array name="inactivity_times">
         <item>15 segundos</item>

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

@@ -246,6 +246,8 @@
     <string name="pref_camera_send_image_notes">U kunt Telegram, Mailgun of beide gebruiken om vastgelegde afbeeldingen te verzenden.</string>
     <string name="menu_item_help">Helpen</string>
     <string name="error_mailgun_credentials">Er is een probleem opgetreden bij het verzenden van de afbeelding. Controleer uw Mailgun-inloggegevens.</string>
+    <string name="pref_system_sounds_summary">Schakel het geluid in dat wordt gebruikt voor het indrukken van knoppen en dialogen.</string>
+    <string name="pref_system_sounds_title">Systeemgeluiden</string>
 
     <string-array name="inactivity_times">
         <item>15 seconden</item>