- Use view binding in audio activity

- Fixed typos in two string names
This commit is contained in:
Juha Heinanen
2021-01-03 14:09:31 +02:00
parent 965c18a147
commit 3c4d4ba9b3
7 changed files with 37 additions and 35 deletions
@@ -8,15 +8,16 @@ import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import android.view.View import android.view.View
import android.widget.* import android.widget.*
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import com.tutpro.baresip.databinding.ActivityAudioBinding
class AudioActivity : AppCompatActivity() { class AudioActivity : AppCompatActivity() {
internal lateinit var opusBitRate: EditText private lateinit var binding: ActivityAudioBinding
internal lateinit var opusPacketLoss: EditText private lateinit var opusBitRate: EditText
internal lateinit var aec: CheckBox private lateinit var opusPacketLoss: EditText
internal lateinit var extentedFilter: CheckBox private lateinit var aec: CheckBox
private lateinit var extendedFilter: CheckBox
private var save = false private var save = false
private var reload = false private var reload = false
@@ -30,12 +31,13 @@ class AudioActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_audio) binding = ActivityAudioBinding.inflate(layoutInflater)
setContentView(binding.root)
supportActionBar?.setDisplayHomeAsUpEnabled(true) supportActionBar?.setDisplayHomeAsUpEnabled(true)
Utils.addActivity("audio") Utils.addActivity("audio")
val audioModulesList = findViewById(R.id.AudioModulesList) as LinearLayout val audioModulesList = binding.AudioModulesList
var id = 1000 var id = 1000
for (module in audioModules) { for (module in audioModules) {
val rl = RelativeLayout(this) val rl = RelativeLayout(this)
@@ -69,24 +71,24 @@ class AudioActivity : AppCompatActivity() {
audioModulesList.addView(rl) audioModulesList.addView(rl)
} }
opusBitRate = findViewById(R.id.OpusBitRate) as EditText opusBitRate = binding.OpusBitRate
val obCv = Config.variable("opus_bitrate") val obCv = Config.variable("opus_bitrate")
oldOpusBitrate = if (obCv.size == 0) "28000" else obCv[0] oldOpusBitrate = if (obCv.size == 0) "28000" else obCv[0]
opusBitRate.setText(oldOpusBitrate) opusBitRate.setText(oldOpusBitrate)
opusPacketLoss = findViewById(R.id.OpusPacketLoss) as EditText opusPacketLoss = binding.OpusPacketLoss
val oplCv = Config.variable("opus_packet_loss") val oplCv = Config.variable("opus_packet_loss")
oldOpusPacketLoss = if (oplCv.size == 0) "0" else oplCv[0] oldOpusPacketLoss = if (oplCv.size == 0) "0" else oplCv[0]
opusPacketLoss.setText(oldOpusPacketLoss) opusPacketLoss.setText(oldOpusPacketLoss)
aec = findViewById(R.id.Aec) as CheckBox aec = binding.Aec
val aecCv = Config.variable("module") val aecCv = Config.variable("module")
oldAec = aecCv.contains("webrtc_aec.so") oldAec = aecCv.contains("webrtc_aec.so")
aec.isChecked = oldAec aec.isChecked = oldAec
extentedFilter = findViewById(R.id.ExtendedFilter) as CheckBox extendedFilter = binding.ExtendedFilter
oldExtendedFilter = Config.variable("webrtc_aec_extended_filter")[0] == "yes" oldExtendedFilter = Config.variable("webrtc_aec_extended_filter")[0] == "yes"
extentedFilter.isChecked = oldExtendedFilter extendedFilter.isChecked = oldExtendedFilter
} }
@@ -176,9 +178,9 @@ class AudioActivity : AppCompatActivity() {
save = true save = true
} }
if (extentedFilter.isChecked != oldExtendedFilter) { if (extendedFilter.isChecked != oldExtendedFilter) {
Config.removeVariable("webrtc_aec_extended_filter") Config.removeVariable("webrtc_aec_extended_filter")
if (extentedFilter.isChecked) if (extendedFilter.isChecked)
Config.addLine("webrtc_aec_extended_filter yes") Config.addLine("webrtc_aec_extended_filter yes")
else else
Config.addLine("webrtc_aec_extended_filter no") Config.addLine("webrtc_aec_extended_filter no")
@@ -214,25 +216,25 @@ class AudioActivity : AppCompatActivity() {
fun onClick(v: View) { fun onClick(v: View) {
when (v) { when (v) {
findViewById(R.id.AudioModulesTitle) as TextView -> { binding.AudioModulesTitle -> {
Utils.alertView(this, getString(R.string.audio_modules_title), Utils.alertView(this, getString(R.string.audio_modules_title),
getString(R.string.audio_modules_help)) getString(R.string.audio_modules_help))
} }
findViewById(R.id.OpusBitRateTitle) as TextView-> { binding.OpusBitRateTitle -> {
Utils.alertView(this, getString(R.string.opus_bit_rate), Utils.alertView(this, getString(R.string.opus_bit_rate),
getString(R.string.opus_bit_rate_help)) getString(R.string.opus_bit_rate_help))
} }
findViewById(R.id.OpusPacketLossTitle) as TextView-> { binding.OpusPacketLossTitle -> {
Utils.alertView(this, getString(R.string.opus_packet_loss), Utils.alertView(this, getString(R.string.opus_packet_loss),
getString(R.string.opus_packet_loss_help)) getString(R.string.opus_packet_loss_help))
} }
findViewById(R.id.AecTitle) as TextView-> { binding.AecTitle -> {
Utils.alertView(this, getString(R.string.aec), Utils.alertView(this, getString(R.string.aec),
getString(R.string.aec_help)) getString(R.string.aec_help))
} }
findViewById(R.id.ExtendedFilterTitle) as TextView-> { binding.ExtendedFilterTitle -> {
Utils.alertView(this, getString(R.string.aec_extented_filter), Utils.alertView(this, getString(R.string.aec_extended_filter),
getString(R.string.aec_extented_filter_help)) getString(R.string.aec_extended_filter_help))
} }
} }
} }
+1 -1
View File
@@ -141,7 +141,7 @@
android:textSize="18sp" android:textSize="18sp"
android:textColor="@android:color/black" android:textColor="@android:color/black"
android:onClick="onClick" android:onClick="onClick"
android:text="@string/aec_extented_filter" > android:text="@string/aec_extended_filter" >
</TextView> </TextView>
<CheckBox <CheckBox
android:id="@+id/ExtendedFilter" android:id="@+id/ExtendedFilter"
+2 -2
View File
@@ -293,8 +293,8 @@
<string name="failed_to_load_module">Modulin lataaminen epäonnistui.</string> <string name="failed_to_load_module">Modulin lataaminen epäonnistui.</string>
<string name="aec">Akustinen kaiun poisto (AKP)</string> <string name="aec">Akustinen kaiun poisto (AKP)</string>
<string name="aec_help">Jos merkitty, kaikua yritetään poistaa puheluiden aikana.</string> <string name="aec_help">Jos merkitty, kaikua yritetään poistaa puheluiden aikana.</string>
<string name="aec_extented_filter">AKP laajennettu suodatin</string> <string name="aec_extended_filter">AKP laajennettu suodatin</string>
<string name="aec_extented_filter_help">Jos merkitty, kaiun poistossa käytetään laajennettua <string name="aec_extended_filter_help">Jos merkitty, kaiun poistossa käytetään laajennettua
suodatinta. suodatinta.
</string> </string>
<string name="opus_bit_rate">Opus-koodekin bittinopeus</string> <string name="opus_bit_rate">Opus-koodekin bittinopeus</string>
+2 -2
View File
@@ -212,8 +212,8 @@
<string name="confirmation">Confirmação</string> <string name="confirmation">Confirmação</string>
<string name="video_size_help">Tamanho dos quadros de vídeo que foram transmitidos (largura x altura). A configuração de fábrica é 800x600.</string> <string name="video_size_help">Tamanho dos quadros de vídeo que foram transmitidos (largura x altura). A configuração de fábrica é 800x600.</string>
<string name="video_size">Tamanho do Quadro do Vídeo</string> <string name="video_size">Tamanho do Quadro do Vídeo</string>
<string name="aec_extented_filter_help">Caso esteja marcado, o cancelamento do eco estará utilizando um filtro estendido.</string> <string name="aec_extended_filter_help">Caso esteja marcado, o cancelamento do eco estará utilizando um filtro estendido.</string>
<string name="aec_extented_filter">Filtro Estendido do AEC</string> <string name="aec_extended_filter">Filtro Estendido do AEC</string>
<string name="audio">Áudio</string> <string name="audio">Áudio</string>
<string name="tap_to_start">Toque para iniciar o aplicativo</string> <string name="tap_to_start">Toque para iniciar o aplicativo</string>
<string name="invalid_stun_password">Senha inválida \'%1$s\'</string> <string name="invalid_stun_password">Senha inválida \'%1$s\'</string>
+2 -2
View File
@@ -43,7 +43,7 @@
<string name="chat">Mensagem do Chat</string> <string name="chat">Mensagem do Chat</string>
<string name="contact_action_question">Quer ligar ou enviar mensagem para \'%1$s\'\?</string> <string name="contact_action_question">Quer ligar ou enviar mensagem para \'%1$s\'\?</string>
<string name="tls_ca_file">Ficheiro TLS CA</string> <string name="tls_ca_file">Ficheiro TLS CA</string>
<string name="aec_extented_filter_help">Caso esteja marcado, o cancelamento do eco estará utilizando um filtro estendido.</string> <string name="aec_extended_filter_help">Caso esteja marcado, o cancelamento do eco estará utilizando um filtro estendido.</string>
<string name="sip_uri_of_another_proxy_server">URI SIP de outro Servidor Proxy</string> <string name="sip_uri_of_another_proxy_server">URI SIP de outro Servidor Proxy</string>
<string name="contact_already_exists">Contato \'%1$s\' já existe.</string> <string name="contact_already_exists">Contato \'%1$s\' já existe.</string>
<string name="sip_uri_of_proxy_server">URI SIP do Servidor Proxy</string> <string name="sip_uri_of_proxy_server">URI SIP do Servidor Proxy</string>
@@ -129,7 +129,7 @@
<string name="opus_bit_rate_help">Taxa de bits máxima média usada pelo fluxo de áudio do Opus. Os valores válidos são 6000-510000. A predefinição de fábrica é 28000.</string> <string name="opus_bit_rate_help">Taxa de bits máxima média usada pelo fluxo de áudio do Opus. Os valores válidos são 6000-510000. A predefinição de fábrica é 28000.</string>
<string name="restart_request">Solicitação para Reinicialização</string> <string name="restart_request">Solicitação para Reinicialização</string>
<string name="register">Registo</string> <string name="register">Registo</string>
<string name="aec_extented_filter">Filtro Estendido do AEC</string> <string name="aec_extended_filter">Filtro Estendido do AEC</string>
<string name="restore">Restaurar</string> <string name="restore">Restaurar</string>
<string name="opus_packet_loss">Perda de pacotes Opus esperada</string> <string name="opus_packet_loss">Perda de pacotes Opus esperada</string>
<string name="transfer_request_query">Aceita transferir esta chamada para \'%1$s\'\?</string> <string name="transfer_request_query">Aceita transferir esta chamada para \'%1$s\'\?</string>
+2 -2
View File
@@ -181,8 +181,8 @@
<string name="opus_packet_loss">Ожидаемая потеря пакетов Opus</string> <string name="opus_packet_loss">Ожидаемая потеря пакетов Opus</string>
<string name="opus_bit_rate_help">Средняя максимальная скорость передачи данных, используемая в аудиопотоке Opus. Допустимые значения: 6000-510000. Значение по умолчанию - 28000.</string> <string name="opus_bit_rate_help">Средняя максимальная скорость передачи данных, используемая в аудиопотоке Opus. Допустимые значения: 6000-510000. Значение по умолчанию - 28000.</string>
<string name="opus_bit_rate">Скорость передачи данных Opus</string> <string name="opus_bit_rate">Скорость передачи данных Opus</string>
<string name="aec_extented_filter_help">Если этот флажок установлен, для подавления эха используется расширенный фильтр.</string> <string name="aec_extended_filter_help">Если этот флажок установлен, для подавления эха используется расширенный фильтр.</string>
<string name="aec_extented_filter">Расширенный фильтр AEC</string> <string name="aec_extended_filter">Расширенный фильтр AEC</string>
<string name="audio_modules_help">Аудиокодеки, предоставленные выбранными модулями, доступны для использования в аккаунтах.</string> <string name="audio_modules_help">Аудиокодеки, предоставленные выбранными модулями, доступны для использования в аккаунтах.</string>
<string name="audio">Аудио</string> <string name="audio">Аудио</string>
<string name="tls_ca_file_help">Если этот флажок установлен, файл ca_certs.crt, содержащий сертификаты TLS центров сертификации, был или будет загружен из каталога загрузки.</string> <string name="tls_ca_file_help">Если этот флажок установлен, файл ca_certs.crt, содержащий сертификаты TLS центров сертификации, был или будет загружен из каталога загрузки.</string>
+2 -2
View File
@@ -263,8 +263,8 @@
<string name="failed_to_load_module">Failed to load module.</string> <string name="failed_to_load_module">Failed to load module.</string>
<string name="aec">Acoustic Echo Cancellation</string> <string name="aec">Acoustic Echo Cancellation</string>
<string name="aec_help">If checked, echo cancellation is attempted on call audio.</string> <string name="aec_help">If checked, echo cancellation is attempted on call audio.</string>
<string name="aec_extented_filter">AEC Extented Filter</string> <string name="aec_extended_filter">AEC Extended Filter</string>
<string name="aec_extented_filter_help">If checked, echo cancellation is using extended filter.</string> <string name="aec_extended_filter_help">If checked, echo cancellation is using extended filter.</string>
<string name="opus_bit_rate">Opus Bit Rate</string> <string name="opus_bit_rate">Opus Bit Rate</string>
<string name="opus_bit_rate_help">Average maximum bit rate used by Opus audio stream. <string name="opus_bit_rate_help">Average maximum bit rate used by Opus audio stream.
Valid values are 6000-510000. Factory default is 28000.</string> Valid values are 6000-510000. Factory default is 28000.</string>