fenix
/
Simple-SMS-Messenger
mirror of https://github.com/SimpleMobileTools/Simple-SMS-Messenger.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updating commons

This commit is contained in:
tibbi 2023-09-11 13:01:19 +02:00
parent 3b9d5c4e50
commit 1d370269c1
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
View File

@ -185,7 +185,7 @@ class MainActivity : SimpleActivity() {
private fun refreshMenuItems() { private fun refreshMenuItems() {
binding.mainMenu.getToolbar().menu.apply { binding.mainMenu.getToolbar().menu.apply {
findItem(R.id.more_apps_from_us).isVisible = !resources.getBoolean(R.bool.hide_google_relations) findItem(R.id.more_apps_from_us).isVisible = !resources.getBoolean(com.simplemobiletools.commons.R.bool.hide_google_relations)
findItem(R.id.show_recycle_bin).isVisible = config.useRecycleBin findItem(R.id.show_recycle_bin).isVisible = config.useRecycleBin
} }
} }
@ -583,7 +583,7 @@ class MainActivity : SimpleActivity() {
FAQItem(com.simplemobiletools.commons.R.string.faq_9_title_commons, com.simplemobiletools.commons.R.string.faq_9_text_commons) FAQItem(com.simplemobiletools.commons.R.string.faq_9_title_commons, com.simplemobiletools.commons.R.string.faq_9_text_commons)
) )
if (!resources.getBoolean(R.bool.hide_google_relations)) { if (!resources.getBoolean(com.simplemobiletools.commons.R.bool.hide_google_relations)) {
faqItems.add(FAQItem(com.simplemobiletools.commons.R.string.faq_2_title_commons, com.simplemobiletools.commons.R.string.faq_2_text_commons)) faqItems.add(FAQItem(com.simplemobiletools.commons.R.string.faq_2_title_commons, com.simplemobiletools.commons.R.string.faq_2_text_commons))
faqItems.add(FAQItem(com.simplemobiletools.commons.R.string.faq_6_title_commons, com.simplemobiletools.commons.R.string.faq_6_text_commons)) faqItems.add(FAQItem(com.simplemobiletools.commons.R.string.faq_6_title_commons, com.simplemobiletools.commons.R.string.faq_6_text_commons))
} }

4
app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/AttachmentsAdapter.kt
View File

@ -177,13 +177,13 @@ class AttachmentsAdapter(
.override(size, size) .override(size, size)
.apply(options) .apply(options)
.listener(object : RequestListener<Drawable> { .listener(object : RequestListener<Drawable> {
override fun onLoadFailed(e: GlideException?, model: Any?, target: Target<Drawable>?, isFirstResource: Boolean): Boolean { override fun onLoadFailed(e: GlideException?, model: Any?, target: Target<Drawable>, isFirstResource: Boolean): Boolean {
removeAttachment(attachment) removeAttachment(attachment)
activity.toast(com.simplemobiletools.commons.R.string.unknown_error_occurred) activity.toast(com.simplemobiletools.commons.R.string.unknown_error_occurred)
return false return false
} }
override fun onResourceReady(dr: Drawable?, a: Any?, t: Target<Drawable>?, d: DataSource?, i: Boolean): Boolean { override fun onResourceReady(dr: Drawable, a: Any, t: Target<Drawable>, d: DataSource, i: Boolean): Boolean {
binding.thumbnail.beVisible() binding.thumbnail.beVisible()
binding.playIcon.beVisibleIf(attachment.mimetype.isVideoMimeType()) binding.playIcon.beVisibleIf(attachment.mimetype.isVideoMimeType())
binding.compressionProgress.beGone() binding.compressionProgress.beGone()

4
app/src/main/kotlin/com/simplemobiletools/smsmessenger/adapters/ThreadAdapter.kt
View File

@ -418,13 +418,13 @@ class ThreadAdapter(
.load(uri) .load(uri)
.apply(options) .apply(options)
.listener(object : RequestListener<Drawable> { .listener(object : RequestListener<Drawable> {
override fun onLoadFailed(e: GlideException?, model: Any?, target: Target<Drawable>?, isFirstResource: Boolean): Boolean { override fun onLoadFailed(e: GlideException?, model: Any?, target: Target<Drawable>, isFirstResource: Boolean): Boolean {
threadMessagePlayOutline.beGone() threadMessagePlayOutline.beGone()
threadMessageAttachmentsHolder.removeView(imageView.root) threadMessageAttachmentsHolder.removeView(imageView.root)
return false return false
} }
override fun onResourceReady(dr: Drawable?, a: Any?, t: Target<Drawable>?, d: DataSource?, i: Boolean) = false override fun onResourceReady(dr: Drawable, a: Any, t: Target<Drawable>, d: DataSource, i: Boolean) = false
}) })
// limit attachment sizes to avoid causing OOM // limit attachment sizes to avoid causing OOM

2
gradle/libs.versions.toml
View File

@ -13,7 +13,7 @@ eventbus = "3.3.1"
#Room #Room
room = "2.6.0-alpha03" room = "2.6.0-alpha03"
#Simple Mobile Tools #Simple Mobile Tools
simple-commons = "adb7dea7ee" simple-commons = "e1603ee2d6"
android-smsmms = "c3e678befd" android-smsmms = "c3e678befd"
indicator-fast-scroll = "4524cd0b61" indicator-fast-scroll = "4524cd0b61"
#Gradle #Gradle