adding some more conversation details UI fixes

This commit is contained in:
tibbi 2023-01-01 23:10:12 +01:00
parent d42fa509b4
commit b0225c1693
3 changed files with 42 additions and 54 deletions

View file

@ -2,10 +2,10 @@ package com.simplemobiletools.smsmessenger.activities
import android.os.Bundle
import androidx.core.content.res.ResourcesCompat
import com.simplemobiletools.commons.extensions.adjustAlpha
import com.simplemobiletools.commons.extensions.applyColorFilter
import com.simplemobiletools.commons.extensions.getProperPrimaryColor
import com.simplemobiletools.commons.extensions.getProperTextColor
import com.simplemobiletools.commons.helpers.HIGHER_ALPHA
import com.simplemobiletools.commons.extensions.updateTextColors
import com.simplemobiletools.commons.helpers.NavigationIcon
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.commons.models.SimpleContact
@ -45,18 +45,17 @@ class ConversationDetailsActivity : SimpleActivity() {
override fun onResume() {
super.onResume()
setupToolbar(conversation_details_toolbar, NavigationIcon.Arrow)
updateTextColors(conversation_details_holder)
val primaryColor = getProperPrimaryColor()
conversation_name_heading.setTextColor(primaryColor)
members_heading.setTextColor(primaryColor)
}
private fun setupTextViews() {
val textColor = getProperTextColor()
val headingColor = textColor.adjustAlpha(HIGHER_ALPHA)
members_heading.setTextColor(headingColor)
conversation_name_heading.setTextColor(headingColor)
conversation_name.apply {
setTextColor(textColor)
ResourcesCompat.getDrawable(resources, R.drawable.ic_edit_vector, theme)?.apply {
applyColorFilter(textColor)
applyColorFilter(getProperTextColor())
setCompoundDrawablesWithIntrinsicBounds(null, null, this, null)
}

View file

@ -4,10 +4,10 @@ import android.app.Activity
import android.content.DialogInterface.BUTTON_POSITIVE
import android.view.ViewGroup
import androidx.appcompat.app.AlertDialog
import androidx.core.widget.doAfterTextChanged
import com.simplemobiletools.commons.extensions.getAlertDialogBuilder
import com.simplemobiletools.commons.extensions.setupDialogStuff
import com.simplemobiletools.commons.extensions.showKeyboard
import com.simplemobiletools.commons.extensions.toast
import com.simplemobiletools.smsmessenger.R
import com.simplemobiletools.smsmessenger.models.Conversation
import kotlinx.android.synthetic.main.dialog_rename_conversation.view.*
@ -25,11 +25,8 @@ class RenameConversationDialog(
if (conversation.usesCustomTitle) {
setText(conversation.title)
}
hint = conversation.title
doAfterTextChanged {
dialog?.getButton(BUTTON_POSITIVE)?.isEnabled = !it.isNullOrEmpty()
}
hint = conversation.title
}
}
@ -41,11 +38,15 @@ class RenameConversationDialog(
dialog = alertDialog
alertDialog.showKeyboard(view.rename_conv_edit_text)
alertDialog.getButton(BUTTON_POSITIVE).apply {
val newTitle = view.rename_conv_edit_text.text.toString()
isEnabled = newTitle.isNotEmpty() && (newTitle != conversation.title)
setOnClickListener {
val newTitle = view.rename_conv_edit_text.text.toString()
if (newTitle.isEmpty()) {
activity.toast(R.string.empty_name)
return@setOnClickListener
}
callback(newTitle)
alertDialog.dismiss()
callback(view.rename_conv_edit_text.text.toString())
}
}
}