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

- String and layout related improvements.

Browse Source
This commit is contained in:
Juha Heinanen
2019-05-08 21:33:35 +03:00
parent 6faf86bd2a
commit 884b762fbf
5 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt
+6 -5
View File
@@ -3,6 +3,7 @@ package com.tutpro.baresip
import android.app.Activity
import android.content.Context
import android.content.Intent
import android.content.res.Resources
import android.os.Bundle
import android.support.v7.app.AlertDialog
import android.view.LayoutInflater
@@ -38,8 +39,11 @@ class AccountListAdapter(private val cxt: Context, private val rows: ArrayList<A
actionView.setOnClickListener { _ ->
Log.d("Baresip", "Delete button clicked")
val deleteDialog = AlertDialog.Builder(cxt)
deleteDialog.setMessage("Do you want to delete account ${ua.account.aor}?")
deleteDialog.setPositiveButton("Delete") { dialog, _ ->
deleteDialog.setMessage("${cxt.getString(R.string.delete_account)} ${ua.account.aor}?")
deleteDialog.setPositiveButton(cxt.getText(R.string.cancel)) { dialog, _ ->
dialog.dismiss()
}
deleteDialog.setNegativeButton(cxt.getText(R.string.delete)) { dialog, _ ->
Api.ua_destroy(ua.uap)
UserAgent.remove(ua)
AccountsActivity.generateAccounts()
@@ -47,9 +51,6 @@ class AccountListAdapter(private val cxt: Context, private val rows: ArrayList<A
this.notifyDataSetChanged()
dialog.dismiss()
}
deleteDialog.setNegativeButton("No") { dialog, _ ->
dialog.dismiss()
}
deleteDialog.create().show()
}
return rowView
app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt
+2 -2
View File
@@ -103,13 +103,13 @@ class ChatActivity : AppCompatActivity() {
builder.setMessage(String.format(getString(R.string.long_message_question),
chatPeer))
.setPositiveButton(getString(R.string.cancel), dialogClickListener)
.setNegativeButton(getString(R.string.delete_message), dialogClickListener)
.setNegativeButton(getString(R.string.delete), dialogClickListener)
.setNeutralButton(getString(R.string.add_contact), dialogClickListener)
.show()
else
builder.setMessage(getText(R.string.short_message_question))
.setPositiveButton(getString(R.string.cancel), dialogClickListener)
.setNegativeButton(getString(R.string.delete_message), dialogClickListener)
.setNegativeButton(getString(R.string.delete), dialogClickListener)
.show()
true
}
app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt
+8 -8
View File
@@ -84,16 +84,16 @@ class ChatsActivity: AppCompatActivity() {
val builder = AlertDialog.Builder(this@ChatsActivity, R.style.Theme_AppCompat)
val peer = ContactsActivity.contactName(uaMessages[pos].peerUri)
if (peer.startsWith("sip:"))
builder.setMessage("Do you want to delete chat with peer " +
"${Utils.friendlyUri(peer, Utils.aorDomain(aor))} or add peer to contacts?")
.setPositiveButton("Cancel", dialogClickListener)
.setNegativeButton("Delete Chat", dialogClickListener)
.setNeutralButton("Add Contact", dialogClickListener)
builder.setMessage(String.format(getString(R.string.long_chat_question),
Utils.friendlyUri(peer, Utils.aorDomain(aor))))
.setPositiveButton(getText(R.string.cancel), dialogClickListener)
.setNegativeButton(getText(R.string.delete), dialogClickListener)
.setNeutralButton(getText(R.string.add_contact), dialogClickListener)
.show()
else
builder.setMessage("Do you want to delete chat with '$peer'?")
.setPositiveButton("Cancel", dialogClickListener)
.setNegativeButton("Delete Chat", dialogClickListener)
builder.setMessage("${getString(R.string.short_chat_question)} '$peer'?")
.setPositiveButton(getText(R.string.cancel), dialogClickListener)
.setNegativeButton(getText(R.string.delete), dialogClickListener)
.show()
true
}