jeena/sms-translate
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

updating commons and target SDK to 31

Browse source
This commit is contained in:
tibbi 2022-04-12 09:45:18 +02:00
parent 7ed5c667ef
commit 45874d13d4
18 changed files with 101 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
View file

@ -93,8 +93,8 @@ class MainActivity : SimpleActivity() {
override fun onResume() {
super.onResume()
if (storedTextColor != config.textColor) {
(conversations_list.adapter as? ConversationsAdapter)?.updateTextColor(config.textColor)
if (storedTextColor != getProperTextColor()) {
(conversations_list.adapter as? ConversationsAdapter)?.updateTextColor(getProperTextColor())
}
if (storedFontSize != config.fontSize) {
@ -104,10 +104,10 @@ class MainActivity : SimpleActivity() {
(conversations_list.adapter as? ConversationsAdapter)?.updateDrafts()
updateTextColors(main_coordinator)
val adjustedPrimaryColor = getAdjustedPrimaryColor()
no_conversations_placeholder_2.setTextColor(adjustedPrimaryColor)
val properPrimaryColor = getProperPrimaryColor()
no_conversations_placeholder_2.setTextColor(properPrimaryColor)
no_conversations_placeholder_2.underlineText()
conversations_fastscroller.updateColors(adjustedPrimaryColor)
conversations_fastscroller.updateColors(properPrimaryColor)
checkShortcut()
}
@ -156,7 +156,7 @@ class MainActivity : SimpleActivity() {
}
private fun storeStateVariables() {
storedTextColor = config.textColor
storedTextColor = getProperTextColor()
storedFontSize = config.fontSize
}

23
app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt
View file

@ -9,12 +9,14 @@ import com.google.gson.Gson
import com.reddit.indicatorfastscroll.FastScrollItemIndicator
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.*
import com.simplemobiletools.commons.helpers.MyContactsContentProvider
import com.simplemobiletools.commons.helpers.PERMISSION_READ_CONTACTS
import com.simplemobiletools.commons.helpers.SimpleContactsHelper
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.commons.models.RadioItem
import com.simplemobiletools.commons.models.SimpleContact
import com.simplemobiletools.smsmessenger.R
import com.simplemobiletools.smsmessenger.adapters.ContactsAdapter
import com.simplemobiletools.smsmessenger.extensions.config
import com.simplemobiletools.smsmessenger.extensions.getSuggestedContacts
import com.simplemobiletools.smsmessenger.extensions.getThreadId
import com.simplemobiletools.smsmessenger.helpers.*
@ -22,7 +24,6 @@ import kotlinx.android.synthetic.main.activity_new_conversation.*
import kotlinx.android.synthetic.main.item_suggested_contact.view.*
import java.net.URLDecoder
import java.util.*
import kotlin.collections.ArrayList
class NewConversationActivity : SimpleActivity() {
private var allContacts = ArrayList<SimpleContact>()
@ -45,7 +46,7 @@ class NewConversationActivity : SimpleActivity() {
override fun onResume() {
super.onResume()
no_contacts_placeholder_2.setTextColor(getAdjustedPrimaryColor())
no_contacts_placeholder_2.setTextColor(getProperPrimaryColor())
no_contacts_placeholder_2.underlineText()
}
@ -78,7 +79,7 @@ class NewConversationActivity : SimpleActivity() {
new_conversation_confirm.beVisibleIf(searchString.length > 2)
}
new_conversation_confirm.applyColorFilter(config.textColor)
new_conversation_confirm.applyColorFilter(getProperTextColor())
new_conversation_confirm.setOnClickListener {
val number = new_conversation_address.value
launchThreadActivity(number, number)
@ -92,12 +93,12 @@ class NewConversationActivity : SimpleActivity() {
}
}
val adjustedPrimaryColor = getAdjustedPrimaryColor()
contacts_letter_fastscroller.textColor = config.textColor.getColorStateList()
contacts_letter_fastscroller.pressedTextColor = adjustedPrimaryColor
val properPrimaryColor = getProperPrimaryColor()
contacts_letter_fastscroller.textColor = getProperTextColor().getColorStateList()
contacts_letter_fastscroller.pressedTextColor = properPrimaryColor
contacts_letter_fastscroller_thumb.setupWithFastScroller(contacts_letter_fastscroller)
contacts_letter_fastscroller_thumb?.textColor = adjustedPrimaryColor.getContrastColor()
contacts_letter_fastscroller_thumb?.thumbColor = adjustedPrimaryColor.getColorStateList()
contacts_letter_fastscroller_thumb?.textColor = properPrimaryColor.getContrastColor()
contacts_letter_fastscroller_thumb?.thumbColor = properPrimaryColor.getColorStateList()
}
private fun isThirdPartyIntent(): Boolean {
@ -188,7 +189,7 @@ class NewConversationActivity : SimpleActivity() {
val contact = it
layoutInflater.inflate(R.layout.item_suggested_contact, null).apply {
suggested_contact_name.text = contact.name
suggested_contact_name.setTextColor(baseConfig.textColor)
suggested_contact_name.setTextColor(getProperTextColor())
if (!isDestroyed) {
SimpleContactsHelper(this@NewConversationActivity).loadContactImage(contact.photoUri, suggested_contact_image, contact.name)

4
app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/SettingsActivity.kt
View file

@ -48,7 +48,7 @@ class SettingsActivity : SimpleActivity() {
}
arrayOf(settings_color_customization_label, settings_general_settings_label, settings_outgoing_messages_label, settings_notifications_label).forEach {
it.setTextColor(getAdjustedPrimaryColor())
it.setTextColor(getProperPrimaryColor())
}
arrayOf(
@ -57,7 +57,7 @@ class SettingsActivity : SimpleActivity() {
settings_outgoing_messages_holder,
settings_notifications_holder
).forEach {
it.background.applyColorFilter(baseConfig.backgroundColor.getContrastColor())
it.background.applyColorFilter(getProperBackgroundColor().getContrastColor())
}
}

19
app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
View file

@ -46,7 +46,6 @@ import com.simplemobiletools.smsmessenger.helpers.*
import com.simplemobiletools.smsmessenger.models.*
import com.simplemobiletools.smsmessenger.receivers.SmsStatusDeliveredReceiver
import com.simplemobiletools.smsmessenger.receivers.SmsStatusSentReceiver
import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.activity_thread.*
import kotlinx.android.synthetic.main.item_attachment.view.*
import kotlinx.android.synthetic.main.item_selected_contact.view.*
@ -351,13 +350,13 @@ class ThreadActivity : SimpleActivity() {
private fun setupButtons() {
updateTextColors(thread_holder)
val textColor = config.textColor
val textColor = getProperTextColor()
thread_send_message.applyColorFilter(textColor)
confirm_manage_contacts.applyColorFilter(textColor)
thread_add_attachment.applyColorFilter(textColor)
val adjustedPrimaryColor = getAdjustedPrimaryColor()
thread_messages_fastscroller.updateColors(adjustedPrimaryColor)
val properPrimaryColor = getProperPrimaryColor()
thread_messages_fastscroller.updateColors(properPrimaryColor)
thread_character_counter.beVisibleIf(config.showCharacterCounter)
thread_character_counter.setTextSize(TypedValue.COMPLEX_UNIT_PX, getTextSize())
@ -487,7 +486,7 @@ class ThreadActivity : SimpleActivity() {
currentSIMCardIndex = availableSIMs.indexOfFirstOrNull { it.subscriptionId == config.getUseSIMIdAtNumber(numbers.first()) } ?: 0
thread_select_sim_icon.applyColorFilter(config.textColor)
thread_select_sim_icon.applyColorFilter(getProperTextColor())
thread_select_sim_icon.beVisible()
thread_select_sim_number.beVisible()
@ -500,7 +499,7 @@ class ThreadActivity : SimpleActivity() {
}
}
thread_select_sim_number.setTextColor(config.textColor.getContrastColor())
thread_select_sim_number.setTextColor(getProperTextColor().getContrastColor())
thread_select_sim_number.text = (availableSIMCards[currentSIMCardIndex].id).toString()
}
}
@ -557,19 +556,19 @@ class ThreadActivity : SimpleActivity() {
}
private fun showSelectedContacts() {
val adjustedColor = getAdjustedPrimaryColor()
val properPrimaryColor = getProperPrimaryColor()
val views = ArrayList<View>()
participants.forEach {
val contact = it
layoutInflater.inflate(R.layout.item_selected_contact, null).apply {
val selectedContactBg = resources.getDrawable(R.drawable.item_selected_contact_background)
(selectedContactBg as LayerDrawable).findDrawableByLayerId(R.id.selected_contact_bg).applyColorFilter(adjustedColor)
(selectedContactBg as LayerDrawable).findDrawableByLayerId(R.id.selected_contact_bg).applyColorFilter(properPrimaryColor)
selected_contact_holder.background = selectedContactBg
selected_contact_name.text = contact.name
selected_contact_name.setTextColor(adjustedColor.getContrastColor())
selected_contact_remove.applyColorFilter(adjustedColor.getContrastColor())
selected_contact_name.setTextColor(properPrimaryColor.getContrastColor())
selected_contact_remove.applyColorFilter(properPrimaryColor.getContrastColor())
selected_contact_remove.setOnClickListener {
if (contact.rawId != participants.first().rawId) {