Use onClick listeners for all activity titles

app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt

@@ -98,6 +98,8 @@ class AccountActivity : AppCompatActivity() {
 
         initLayoutFromAccount(acc)
 
+        bindTitles()
+
     }
 
     private fun initAccountFromConfig(ctx: AccountActivity) {
@@ -637,29 +639,36 @@ class AccountActivity : AppCompatActivity() {
         super.onPause()
     }
 
-    fun onClick(v: View) {
+    private fun bindTitles() {
-        when (v) {
+        binding.DisplayNameTitle.setOnClickListener{
-            binding.DisplayNameTitle -> {
             Utils.alertView(this, getString(R.string.display_name),
                 getString(R.string.display_name_help))
         }
-            binding.AuthUserTitle -> {
+        binding.AuthUserTitle.setOnClickListener {
-                Utils.alertView(this, getString(R.string.authentication_username),
+            Utils.alertView(
-                        getString(R.string.authentication_username_help))
+                this, getString(R.string.authentication_username),
+                getString(R.string.authentication_username_help)
+            )
         }
-            binding.AuthPassTitle -> {
+        binding.AuthPassTitle.setOnClickListener {
-                Utils.alertView(this, getString(R.string.authentication_password),
+            Utils.alertView(
-                        getString(R.string.authentication_password_help))
+                this, getString(R.string.authentication_password),
+                getString(R.string.authentication_password_help)
+            )
         }
-            binding.OutboundProxyTitle -> {
+        binding.OutboundProxyTitle.setOnClickListener {
-                Utils.alertView(this, getString(R.string.outbound_proxies),
+            Utils.alertView(
-                        getString(R.string.outbound_proxies_help))
+                this, getString(R.string.outbound_proxies),
+                getString(R.string.outbound_proxies_help)
+            )
         }
-            binding.RegTitle -> {
+        binding.RegTitle.setOnClickListener {
-                Utils.alertView(this, getString(R.string.register),
+            Utils.alertView(
-                        getString(R.string.register_help))
+                this, getString(R.string.register),
+                getString(R.string.register_help)
+            )
         }
-            binding.AudioCodecsTitle -> {
+        binding.AudioCodecsTitle.setOnClickListener {
             val i = Intent(this, CodecsActivity::class.java)
             val b = Bundle()
             b.putString("aor", aor)
@@ -667,46 +676,65 @@ class AccountActivity : AppCompatActivity() {
             i.putExtras(b)
             startActivity(i)
         }
-            binding.MediaNatTitle -> {
+        binding.MediaNatTitle.setOnClickListener {
-                Utils.alertView(this, getString(R.string.media_nat),
+            Utils.alertView(
-                        getString(R.string.media_nat_help))
+                this, getString(R.string.media_nat),
+                getString(R.string.media_nat_help)
+            )
         }
-            binding.StunServerTitle -> {
+        binding.StunServerTitle.setOnClickListener {
-                Utils.alertView(this, getString(R.string.stun_server),
+            Utils.alertView(
-                        getString(R.string.stun_server_help))
+                this, getString(R.string.stun_server),
+                getString(R.string.stun_server_help)
+            )
         }
-            binding.StunUserTitle -> {
+        binding.StunUserTitle.setOnClickListener {
-                Utils.alertView(this, getString(R.string.stun_username),
+            Utils.alertView(
-                        getString(R.string.stun_username_help))
+                this, getString(R.string.stun_username),
+                getString(R.string.stun_username_help)
+            )
         }
-            binding.StunPassTitle -> {
+        binding.StunPassTitle.setOnClickListener {
-                Utils.alertView(this, getString(R.string.stun_password),
+            Utils.alertView(
-                        getString(R.string.stun_password_help))
+                this, getString(R.string.stun_password),
+                getString(R.string.stun_password_help)
+            )
         }
-            binding.MediaEncTitle -> {
+        binding.MediaEncTitle.setOnClickListener {
-                Utils.alertView(this, getString(R.string.media_encryption),
+            Utils.alertView(
-                        getString(R.string.media_encryption_help))
+                this, getString(R.string.media_encryption),
+                getString(R.string.media_encryption_help)
+            )
         }
-            binding.PreferIPv6MediaTitle -> {
+        binding.PreferIPv6Media.setOnClickListener {
-                Utils.alertView(this, getString(R.string.prefer_ipv6_media),
+            Utils.alertView(
-                        getString(R.string.prefer_ipv6_media_help))
+                this, getString(R.string.prefer_ipv6_media),
+                getString(R.string.prefer_ipv6_media_help)
+            )
         }
-            binding.DtmfModeTitle -> {
+        binding.DtmfModeTitle.setOnClickListener {
-                Utils.alertView(this, getString(R.string.dtmf_mode),
+            Utils.alertView(
-                        getString(R.string.dtmf_mode_help))
+                this, getString(R.string.dtmf_mode),
+                getString(R.string.dtmf_mode_help)
+            )
         }
-            binding.AnswerModeTitle -> {
+        binding.AnswerModeTitle.setOnClickListener {
-                Utils.alertView(this, getString(R.string.answer_mode),
+            Utils.alertView(
-                        getString(R.string.answer_mode_help))
+                this, getString(R.string.answer_mode),
+                getString(R.string.answer_mode_help)
+            )
         }
-            binding.VoicemailUriTitle -> {
+        binding.VoicemailUriTitle.setOnClickListener {
-                Utils.alertView(this, getString(R.string.voicemail_uri),
+            Utils.alertView(
-                        getString(R.string.voicemain_uri_help))
+                this, getString(R.string.voicemail_uri),
-            }
+                getString(R.string.voicemain_uri_help)
-            binding.DefaultTitle -> {
+            )
-                Utils.alertView(this, getString(R.string.default_account),
-                        getString(R.string.default_account_help))
         }
+        binding.DefaultTitle.setOnClickListener {
+            Utils.alertView(
+                this, getString(R.string.default_account),
+                getString(R.string.default_account_help)
+            )
         }
     }
 

app/src/main/kotlin/com/tutpro/baresip/AudioActivity.kt

@@ -5,7 +5,6 @@ import android.util.TypedValue
 import android.view.Gravity
 import android.view.Menu
 import android.view.MenuItem
-import android.view.View
 import android.widget.*
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
@@ -84,6 +83,8 @@ class AudioActivity : AppCompatActivity() {
         oldAec = aecCv.contains("webrtc_aecm.so")
         aec.isChecked = oldAec
 
+        bindTitles()
+
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -198,26 +199,24 @@ class AudioActivity : AppCompatActivity() {
         super.onBackPressed()
     }
 
-    fun onClick(v: View) {
+    private fun bindTitles() {
-        when (v) {
+        binding.AudioModulesTitle.setOnClickListener {
-            binding.AudioModulesTitle -> {
             Utils.alertView(this, getString(R.string.audio_modules_title),
                     getString(R.string.audio_modules_help))
         }
-            binding.OpusBitRateTitle -> {
+        binding.OpusBitRateTitle.setOnClickListener {
             Utils.alertView(this, getString(R.string.opus_bit_rate),
                     getString(R.string.opus_bit_rate_help))
         }
-            binding.OpusPacketLossTitle -> {
+        binding.OpusPacketLossTitle.setOnClickListener {
             Utils.alertView(this, getString(R.string.opus_packet_loss),
                     getString(R.string.opus_packet_loss_help))
         }
-            binding.AecTitle -> {
+        binding.AecTitle.setOnClickListener {
             Utils.alertView(this, getString(R.string.aec),
                     getString(R.string.aec_help))
         }
     }
-    }
 
     private fun checkOpusBitRate(opusBitRate: String): Boolean {
         val number = opusBitRate.toIntOrNull() ?: return false

app/src/main/kotlin/com/tutpro/baresip/CodecsActivity.kt

@@ -86,6 +86,15 @@ class CodecsActivity : AppCompatActivity() {
             }
         }
 
+        binding.CodecsTitle.setOnClickListener {
+            if (media == "audio")
+                Utils.alertView(this, getString(R.string.audio_codecs),
+                    getString(R.string.audio_codecs_help))
+            else
+                Utils.alertView(this, getString(R.string.video_codecs),
+                    getString(R.string.video_codecs_help))
+        }
+
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -168,17 +177,4 @@ class CodecsActivity : AppCompatActivity() {
         super.onPause()
     }
 
-    fun onClick(v: View) {
-        when (v) {
-            binding.CodecsTitle -> {
-                if (media == "audio")
-                    Utils.alertView(this, getString(R.string.audio_codecs),
-                            getString(R.string.audio_codecs_help))
-                else
-                    Utils.alertView(this, getString(R.string.video_codecs),
-                            getString(R.string.video_codecs_help))
-            }
-        }
-    }
-
 }

app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt

@@ -271,6 +271,8 @@ class ConfigActivity : AppCompatActivity() {
             }
         }
 
+        bindTitles()
+
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -442,56 +444,54 @@ class ConfigActivity : AppCompatActivity() {
 
     }
 
-    fun onClick(v: View) {
+    fun bindTitles() {
-        when (v) {
+        binding.AutoStartTitle.setOnClickListener {
-            binding.AutoStartTitle -> {
             Utils.alertView(this, getString(R.string.start_automatically),
                     getString(R.string.start_automatically_help))
         }
-            binding.ListenAddressTitle -> {
+        binding.ListenAddressTitle.setOnClickListener {
             Utils.alertView(this, getString(R.string.listen_address),
                     getString(R.string.listen_address_help))
         }
-            binding.DnsServersTitle  -> {
+        binding.DnsServersTitle .setOnClickListener {
             Utils.alertView(this, getString(R.string.dns_servers),
                     getString(R.string.dns_servers_help))
         }
-            binding.CertificateFileTitle  -> {
+        binding.CertificateFileTitle .setOnClickListener {
             Utils.alertView(this, getString(R.string.tls_certificate_file),
                     getString(R.string.tls_certificate_file_help))
         }
-            binding.VerifyServerTitle  -> {
+        binding.VerifyServerTitle .setOnClickListener {
             Utils.alertView(this, getString(R.string.verify_server),
                     getString(R.string.verify_server_help))
         }
-            binding.CAFileTitle -> {
+        binding.CAFileTitle.setOnClickListener {
             Utils.alertView(this, getString(R.string.tls_ca_file),
                     getString(R.string.tls_ca_file_help))
         }
-            binding.AudioTitle  -> {
+        binding.AudioTitle .setOnClickListener {
             startActivity(Intent(this, AudioActivity::class.java))
         }
-            binding.VolumeTitle -> {
+        binding.VolumeTitle.setOnClickListener {
             Utils.alertView(this, getString(R.string.default_call_volume),
                     getString(R.string.default_call_volume_help))
         }
-            binding.DarkThemeTitle -> {
+        binding.DarkThemeTitle.setOnClickListener {
             Utils.alertView(this, getString(R.string.dark_theme),
                     getString(R.string.dark_theme_help))
         }
-            binding.DebugTitle -> {
+        binding.DebugTitle.setOnClickListener {
             Utils.alertView(this, getString(R.string.debug), getString(R.string.debug_help))
         }
-            binding.SipTraceTitle -> {
+        binding.SipTraceTitle.setOnClickListener {
             Utils.alertView(this, getString(R.string.sip_trace),
                     getString(R.string.sip_trace_help))
         }
-            binding.ResetTitle -> {
+        binding.ResetTitle.setOnClickListener {
             Utils.alertView(this, getString(R.string.reset_config),
                     getString(R.string.reset_config_help))
         }
     }
-    }
 
     private fun checkDnsServers(dnsServers: String): Boolean {
         if (dnsServers.isEmpty()) return true

app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt

@@ -161,6 +161,11 @@ class ContactActivity : AppCompatActivity() {
 
         }
 
+        binding.AndroidTitle.setOnClickListener {
+            Utils.alertView(this, getString(R.string.android),
+                getString(R.string.android_contact_help))
+        }
+
         Utils.addActivity("contact,$newContact,$uOrI")
 
     }
@@ -319,13 +324,6 @@ class ContactActivity : AppCompatActivity() {
 
     }
 
-    fun onClick(v: View) {
-        when (v) {
-            binding.AndroidTitle ->
-                Utils.alertView(this, getString(R.string.android), getString(R.string.android_contact_help))
-        }
-    }
-
     private fun showTextAvatar(name: String, color: Int) {
         textAvatarView.visibility = View.VISIBLE
         cardAvatarView.visibility = View.GONE

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

@@ -31,7 +31,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="18sp"
-            android:onClick="onClick"
             android:text="@string/display_name" >
         </TextView>
 
@@ -50,7 +49,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="18sp"
-            android:onClick="onClick"
             android:text="@string/authentication_username" >
         </TextView>
 
@@ -69,7 +67,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="18sp"
-            android:onClick="onClick"
             android:text="@string/authentication_password" >
         </TextView>
 
@@ -93,7 +90,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="18sp"
-            android:onClick="onClick"
             android:text="@string/outbound_proxies" >
         </TextView>
 
@@ -128,7 +124,6 @@
                 android:layout_alignParentStart="true"
                 android:layout_toStartOf="@id/Register"
                 android:textSize="18sp"
-                android:onClick="onClick"
                 android:text="@string/register" >
             </TextView>
             <CheckBox
@@ -148,7 +143,6 @@
             android:paddingTop="10dp"
             android:textSize="18sp"
             android:textStyle="bold"
-            android:onClick="onClick"
             android:text="@string/audio_codecs" >
         </TextView>
 
@@ -158,7 +152,6 @@
             android:layout_height="wrap_content"
             android:paddingTop="10dp"
             android:textSize="18sp"
-            android:onClick="onClick"
             android:text="@string/media_encryption" >
         </TextView>
 
@@ -175,7 +168,6 @@
             android:layout_height="wrap_content"
             android:paddingTop="16dp"
             android:textSize="18sp"
-            android:onClick="onClick"
             android:text="@string/media_nat" >
         </TextView>
 
@@ -192,7 +184,6 @@
             android:layout_height="wrap_content"
             android:paddingTop="10dp"
             android:textSize="18sp"
-            android:onClick="onClick"
             android:text="@string/stun_server" >
         </TextView>
 
@@ -213,7 +204,6 @@
             android:layout_height="wrap_content"
             android:paddingTop="10dp"
             android:textSize="18sp"
-            android:onClick="onClick"
             android:text="@string/stun_username" >
         </TextView>
 
@@ -233,7 +223,6 @@
             android:layout_height="wrap_content"
             android:paddingTop="10dp"
             android:textSize="18sp"
-            android:onClick="onClick"
             android:text="@string/stun_password" >
         </TextView>
 
@@ -265,7 +254,6 @@
                 android:layout_toStartOf="@id/PreferIPv6Media"
                 android:paddingTop="10dp"
                 android:textSize="18sp"
-                android:onClick="onClick"
                 android:text="@string/prefer_ipv6_media" >
             </TextView>
             <CheckBox
@@ -284,7 +272,6 @@
             android:layout_height="wrap_content"
             android:paddingTop="10dp"
             android:textSize="18sp"
-            android:onClick="onClick"
             android:text="@string/dtmf_mode" >
         </TextView>
 
@@ -301,7 +288,6 @@
             android:layout_height="wrap_content"
             android:paddingTop="10dp"
             android:textSize="18sp"
-            android:onClick="onClick"
             android:text="@string/answer_mode" >
         </TextView>
 
@@ -318,7 +304,6 @@
             android:layout_height="wrap_content"
             android:paddingTop="10dp"
             android:textSize="18sp"
-            android:onClick="onClick"
             android:text="@string/voicemail_uri" >
         </TextView>
 
@@ -344,7 +329,6 @@
                 android:layout_alignParentStart="true"
                 android:layout_toStartOf="@id/Default"
                 android:textSize="18sp"
-                android:onClick="onClick"
                 android:text="@string/default_account" >
             </TextView>
             <CheckBox

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

@@ -25,7 +25,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textSize="18sp"
-                android:onClick="onClick"
                 android:text="@string/audio_modules_title" >
             </TextView>
             <LinearLayout
@@ -49,7 +48,6 @@
                 android:layout_alignParentStart="true"
                 android:layout_centerVertical="true"
                 android:textSize="18sp"
-                android:onClick="onClick"
                 android:text="@string/opus_bit_rate" >
             </TextView>
             <EditText
@@ -79,7 +77,6 @@
                 android:layout_alignParentStart="true"
                 android:layout_centerVertical="true"
                 android:textSize="18sp"
-                android:onClick="onClick"
                 android:text="@string/opus_packet_loss" >
             </TextView>
             <EditText
@@ -109,7 +106,6 @@
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@id/Aec"
                 android:textSize="18sp"
-                android:onClick="onClick"
                 android:text="@string/aec" >
             </TextView>
             <CheckBox

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

@@ -14,7 +14,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="20sp"
-        android:onClick="onClick"
         android:text="@string/audio_codecs" >
     </TextView>
 

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

@@ -28,7 +28,6 @@
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@id/AutoStart"
                 android:textSize="18sp"
-                android:onClick="onClick"
                 android:text="@string/start_automatically" >
             </TextView>
             <CheckBox
@@ -46,7 +45,6 @@
             android:id="@+id/ListenAddressTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:onClick="onClick"
             android:text="@string/listen_address"
             android:textSize="18sp" >
         </TextView>
@@ -66,7 +64,6 @@
             android:id="@+id/DnsServersTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:onClick="onClick"
             android:text="@string/dns_servers"
             android:textSize="18sp">
         </TextView>
@@ -94,7 +91,6 @@
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@id/CertificateFile"
                 android:textSize="18sp"
-                android:onClick="onClick"
                 android:text="@string/tls_certificate_file" >
             </TextView>
             <CheckBox
@@ -121,7 +117,6 @@
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@id/VerifyServer"
                 android:textSize="18sp"
-                android:onClick="onClick"
                 android:text="@string/verify_server" >
             </TextView>
             <CheckBox
@@ -148,7 +143,6 @@
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@id/CAFile"
                 android:textSize="18sp"
-                android:onClick="onClick"
                 android:text="@string/tls_ca_file" >
             </TextView>
             <CheckBox
@@ -169,7 +163,6 @@
             android:layout_marginBottom="16dp"
             android:textSize="18sp"
             android:textStyle="bold"
-            android:onClick="onClick"
             android:text="@string/audio" >
         </TextView>
 
@@ -186,7 +179,6 @@
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@id/VolumeSpinner"
                 android:textSize="18sp"
-                android:onClick="onClick"
                 android:text="@string/default_call_volume" >
             </TextView>
             <Spinner
@@ -212,7 +204,6 @@
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@id/DarkTheme"
                 android:textSize="18sp"
-                android:onClick="onClick"
                 android:text="@string/dark_theme" >
             </TextView>
             <CheckBox
@@ -239,7 +230,6 @@
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@id/Debug"
                 android:textSize="18sp"
-                android:onClick="onClick"
                 android:text="@string/debug" >
             </TextView>
             <CheckBox
@@ -266,7 +256,6 @@
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@id/SipTrace"
                 android:textSize="18sp"
-                android:onClick="onClick"
                 android:text="@string/sip_trace" >
             </TextView>
             <CheckBox
@@ -293,7 +282,6 @@
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@id/Reset"
                 android:textSize="18sp"
-                android:onClick="onClick"
                 android:text="@string/reset_config" >
             </TextView>
             <CheckBox

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

@@ -89,7 +89,6 @@
             android:layout_alignParentStart="true"
             android:layout_toStartOf="@id/Android"
             android:textSize="18sp"
-            android:onClick="onClick"
             android:text="@string/android" >
         </TextView>
         <CheckBox