Added possibility to nickname accounts
This commit is contained in:
@@ -27,6 +27,7 @@ class AccountActivity : AppCompatActivity() {
|
||||
private lateinit var acc: Account
|
||||
private lateinit var ua: UserAgent
|
||||
private lateinit var uri: TextView
|
||||
private lateinit var nickName: EditText
|
||||
private lateinit var displayName: EditText
|
||||
private lateinit var aor: String
|
||||
private lateinit var authUser: EditText
|
||||
@@ -70,6 +71,7 @@ class AccountActivity : AppCompatActivity() {
|
||||
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
||||
|
||||
uri = binding.Uri
|
||||
nickName = binding.NickName
|
||||
displayName = binding.DisplayName
|
||||
authUser = binding.AuthUser
|
||||
authPass = binding.AuthPass
|
||||
@@ -99,7 +101,10 @@ class AccountActivity : AppCompatActivity() {
|
||||
if (intent.getBooleanExtra("new", false))
|
||||
initAccountFromConfig(this)
|
||||
|
||||
title = aor.split(":")[1]
|
||||
title = if (acc.nickName != "")
|
||||
acc.nickName
|
||||
else
|
||||
aor.split(":")[1]
|
||||
|
||||
initLayoutFromAccount(acc)
|
||||
|
||||
@@ -202,6 +207,7 @@ class AccountActivity : AppCompatActivity() {
|
||||
private fun initLayoutFromAccount(acc: Account) {
|
||||
|
||||
uri.text = acc.luri
|
||||
nickName.setText(acc.nickName)
|
||||
displayName.setText(acc.displayName)
|
||||
authUser.setText(acc.authUser)
|
||||
|
||||
@@ -346,6 +352,26 @@ class AccountActivity : AppCompatActivity() {
|
||||
when (item.itemId) {
|
||||
|
||||
R.id.checkIcon -> {
|
||||
|
||||
val nn = nickName.text.toString().trim()
|
||||
if (nn != acc.nickName) {
|
||||
if (Account.checkDisplayName(nn)) {
|
||||
if (nn == "" || Account.uniqueNickName(nn)) {
|
||||
acc.nickName = nn
|
||||
Log.d(TAG, "New nickname is ${acc.nickName}")
|
||||
save = true
|
||||
} else {
|
||||
Utils.alertView(this, getString(R.string.notice),
|
||||
String.format(getString(R.string.non_unique_account_nickname), nn))
|
||||
return false
|
||||
}
|
||||
} else {
|
||||
Utils.alertView(this, getString(R.string.notice),
|
||||
String.format(getString(R.string.invalid_account_nickname), nn))
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
val dn = displayName.text.toString().trim()
|
||||
if (dn != acc.displayName) {
|
||||
if (Account.checkDisplayName(dn)) {
|
||||
@@ -649,6 +675,10 @@ class AccountActivity : AppCompatActivity() {
|
||||
}
|
||||
|
||||
private fun bindTitles() {
|
||||
binding.NickNameTitle.setOnClickListener{
|
||||
Utils.alertView(this, getString(R.string.nickname),
|
||||
getString(R.string.account_nickname_help))
|
||||
}
|
||||
binding.DisplayNameTitle.setOnClickListener{
|
||||
Utils.alertView(this, getString(R.string.display_name),
|
||||
getString(R.string.display_name_help))
|
||||
|
||||
Reference in New Issue
Block a user