jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use onClick listeners for all activity titles

Browse Source
This commit is contained in:
Juha Heinanen
2021-11-04 16:12:47 +02:00
parent ec7b6ddbe2
commit 78dd278048
10 changed files with 178 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
View File

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

37
app/src/main/kotlin/com/tutpro/baresip/AudioActivity.kt
View File

@ -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,24 +199,22 @@ class AudioActivity : AppCompatActivity() {
super.onBackPressed()
}
fun onClick(v: View) {
when (v) {
binding.AudioModulesTitle -> {
Utils.alertView(this, getString(R.string.audio_modules_title),
getString(R.string.audio_modules_help))
}
binding.OpusBitRateTitle -> {
Utils.alertView(this, getString(R.string.opus_bit_rate),
getString(R.string.opus_bit_rate_help))
}
binding.OpusPacketLossTitle -> {
Utils.alertView(this, getString(R.string.opus_packet_loss),
getString(R.string.opus_packet_loss_help))
}
binding.AecTitle -> {
Utils.alertView(this, getString(R.string.aec),
getString(R.string.aec_help))
}
private fun bindTitles() {
binding.AudioModulesTitle.setOnClickListener {
Utils.alertView(this, getString(R.string.audio_modules_title),
getString(R.string.audio_modules_help))
}
binding.OpusBitRateTitle.setOnClickListener {
Utils.alertView(this, getString(R.string.opus_bit_rate),
getString(R.string.opus_bit_rate_help))
}
binding.OpusPacketLossTitle.setOnClickListener {
Utils.alertView(this, getString(R.string.opus_packet_loss),
getString(R.string.opus_packet_loss_help))
}
binding.AecTitle.setOnClickListener {
Utils.alertView(this, getString(R.string.aec),
getString(R.string.aec_help))
}
}

22
app/src/main/kotlin/com/tutpro/baresip/CodecsActivity.kt
View File

@ -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))
}
}
}
}

96
app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
View File

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

12
app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt
View File

@ -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

16
app/src/main/res/layout/activity_account.xml
View File

@ -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

4
app/src/main/res/layout/activity_audio.xml
View File

@ -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

1
app/src/main/res/layout/activity_codecs.xml
View File

@ -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>

12
app/src/main/res/layout/activity_config.xml
View File

@ -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

1
app/src/main/res/layout/activity_contact.xml
View File

@ -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