From 3cdaf26317e6ce3fb781f35eedb839be084d59af Mon Sep 17 00:00:00 2001 From: Ben Iofel Date: Fri, 5 Sep 2025 01:44:06 -0400 Subject: [PATCH] more migrations --- .../com/moez/QKSMS/common/base/QkActivity.kt | 7 ++ .../QKSMS/common/widget/PreferenceView.kt | 4 +- .../QKSMS/feature/backup/BackupActivity.kt | 10 +-- .../feature/blocking/BlockingActivity.kt | 10 +-- .../filters/MessageContentFiltersAdapter.kt | 25 ++++--- .../manager/BlockingManagerPreferenceView.kt | 17 +++-- .../blocking/numbers/BlockedNumbersAdapter.kt | 19 +++-- .../moez/QKSMS/feature/main/SearchAdapter.kt | 36 +++++----- .../moez/QKSMS/feature/plus/PlusActivity.kt | 72 +++++++++---------- .../ScheduledMessageAttachmentAdapter.kt | 30 ++++---- .../main/res/layout/qksms_plus_activity.xml | 6 +- 11 files changed, 123 insertions(+), 113 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/base/QkActivity.kt b/presentation/src/main/java/com/moez/QKSMS/common/base/QkActivity.kt index 89a583fe..3a49726b 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/base/QkActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/base/QkActivity.kt @@ -22,6 +22,7 @@ import android.annotation.SuppressLint import android.os.Bundle import android.view.Menu import android.view.MenuItem +import android.view.View import android.view.WindowManager import androidx.appcompat.app.AppCompatActivity import dev.octoshrimpy.quik.util.Preferences @@ -63,6 +64,12 @@ abstract class QkActivity : AppCompatActivity() { title = title // The title may have been set before layout inflation } + override fun setContentView(view: View?) { + super.setContentView(view) + setSupportActionBar(toolbar) + title = title // The title may have been set before layout inflation + } + override fun setTitle(titleId: Int) { title = getString(titleId) } diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt index b1400f39..8486e510 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt @@ -38,6 +38,8 @@ class PreferenceView @JvmOverloads constructor( private var layout: PreferenceViewBinding + val titleTextView: TextView get() = layout.titleView + var title: String? = null set(value) { field = value @@ -96,4 +98,4 @@ class PreferenceView @JvmOverloads constructor( } } -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt index 8c7e7ba5..fdf7b8ac 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/backup/BackupActivity.kt @@ -25,19 +25,21 @@ import com.bluelinelabs.conductor.RouterTransaction import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkThemedActivity -import kotlinx.android.synthetic.main.container_activity.* +import dev.octoshrimpy.quik.databinding.ContainerActivityBinding class BackupActivity : QkThemedActivity() { private lateinit var router: Router + private lateinit var binding: ContainerActivityBinding override fun onCreate(savedInstanceState: Bundle?) { AndroidInjection.inject(this) super.onCreate(savedInstanceState) - setContentView(R.layout.container_activity) + binding = ContainerActivityBinding.inflate(layoutInflater) + setContentView(binding.root) - router = Conductor.attachRouter(this, container, savedInstanceState) + router = Conductor.attachRouter(this, binding.container, savedInstanceState) if (!router.hasRootController()) { router.setRoot(RouterTransaction.with(BackupController())) } @@ -49,4 +51,4 @@ class BackupActivity : QkThemedActivity() { } } -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingActivity.kt index a30f4863..8afc1554 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/BlockingActivity.kt @@ -25,18 +25,20 @@ import com.bluelinelabs.conductor.RouterTransaction import dagger.android.AndroidInjection import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkThemedActivity -import kotlinx.android.synthetic.main.container_activity.* +import dev.octoshrimpy.quik.databinding.ContainerActivityBinding class BlockingActivity : QkThemedActivity() { private lateinit var router: Router + private lateinit var binding: ContainerActivityBinding override fun onCreate(savedInstanceState: Bundle?) { AndroidInjection.inject(this) super.onCreate(savedInstanceState) - setContentView(R.layout.container_activity) + binding = ContainerActivityBinding.inflate(layoutInflater) + setContentView(binding.root) - router = Conductor.attachRouter(this, container, savedInstanceState) + router = Conductor.attachRouter(this, binding.container, savedInstanceState) if (!router.hasRootController()) { router.setRoot(RouterTransaction.with(BlockingController())) } @@ -48,4 +50,4 @@ class BlockingActivity : QkThemedActivity() { } } -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersAdapter.kt index 894e8c66..afd7df03 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/filters/MessageContentFiltersAdapter.kt @@ -23,33 +23,32 @@ import android.view.View import android.view.ViewGroup import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkRealmAdapter -import dev.octoshrimpy.quik.common.base.QkViewHolder +import dev.octoshrimpy.quik.common.base.QkBindingViewHolder import dev.octoshrimpy.quik.model.MessageContentFilter import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject -import kotlinx.android.synthetic.main.message_content_filter_list_item.* -import kotlinx.android.synthetic.main.message_content_filter_list_item.view.* +import dev.octoshrimpy.quik.databinding.MessageContentFilterListItemBinding -class MessageContentFiltersAdapter : QkRealmAdapter() { +class MessageContentFiltersAdapter : QkRealmAdapter>() { val removeMessageContentFilter: Subject = PublishSubject.create() - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - val view = LayoutInflater.from(parent.context).inflate(R.layout.message_content_filter_list_item, parent, false) - return QkViewHolder(view).apply { - containerView.removeFilter.setOnClickListener { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder { + val binding = MessageContentFilterListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) + return QkBindingViewHolder(binding).apply { + binding.removeFilter.setOnClickListener { val filter = getItem(adapterPosition) ?: return@setOnClickListener removeMessageContentFilter.onNext(filter.id) } } } - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + override fun onBindViewHolder(holder: QkBindingViewHolder, position: Int) { val item = getItem(position)!! - holder.caseIcon.visibility = if (item.caseSensitive) View.VISIBLE else View.GONE - holder.regexIcon.visibility = if (item.isRegex) View.VISIBLE else View.GONE - holder.contactsIcon.visibility = if (item.includeContacts) View.VISIBLE else View.GONE - holder.filter.text = item.value + holder.binding.caseIcon.visibility = if (item.caseSensitive) View.VISIBLE else View.GONE + holder.binding.regexIcon.visibility = if (item.isRegex) View.VISIBLE else View.GONE + holder.binding.contactsIcon.visibility = if (item.includeContacts) View.VISIBLE else View.GONE + holder.binding.filter.text = item.value } } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPreferenceView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPreferenceView.kt index c1576ec7..a668d4bf 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPreferenceView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/manager/BlockingManagerPreferenceView.kt @@ -22,6 +22,7 @@ package dev.octoshrimpy.quik.feature.blocking.manager import android.content.Context import android.graphics.drawable.Drawable import android.util.AttributeSet +import android.view.LayoutInflater import android.view.View import android.widget.ImageView import android.widget.TextView @@ -29,12 +30,15 @@ import androidx.constraintlayout.widget.ConstraintLayout import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.util.extensions.resolveThemeAttribute import dev.octoshrimpy.quik.common.util.extensions.setVisible -import kotlinx.android.synthetic.main.blocking_manager_preference_view.view.* +import dev.octoshrimpy.quik.databinding.BlockingManagerPreferenceViewBinding class BlockingManagerPreferenceView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null ) : ConstraintLayout(context, attrs) { + private val binding: BlockingManagerPreferenceViewBinding = + BlockingManagerPreferenceViewBinding.inflate(LayoutInflater.from(context), this) + var icon: Drawable? = null set(value) { field = value @@ -42,7 +46,7 @@ class BlockingManagerPreferenceView @JvmOverloads constructor( if (isInEditMode) { findViewById(R.id.iconView).setImageDrawable(value) } else { - iconView.setImageDrawable(value) + binding.iconView.setImageDrawable(value) } } @@ -53,7 +57,7 @@ class BlockingManagerPreferenceView @JvmOverloads constructor( if (isInEditMode) { findViewById(R.id.titleView).text = value } else { - titleView.text = value + binding.titleView.text = value } } @@ -67,13 +71,12 @@ class BlockingManagerPreferenceView @JvmOverloads constructor( setVisible(value?.isNotEmpty() == true) } } else { - summaryView.text = value - summaryView.setVisible(value?.isNotEmpty() == true) + binding.summaryView.text = value + binding.summaryView.setVisible(value?.isNotEmpty() == true) } } init { - View.inflate(context, R.layout.blocking_manager_preference_view, this) setBackgroundResource(context.resolveThemeAttribute(R.attr.selectableItemBackground)) context.obtainStyledAttributes(attrs, R.styleable.BlockingManagerPreferenceView).run { @@ -83,7 +86,7 @@ class BlockingManagerPreferenceView @JvmOverloads constructor( // If there's a custom view used for the preference's widget, inflate it getResourceId(R.styleable.BlockingManagerPreferenceView_widget, -1).takeIf { it != -1 }?.let { id -> - View.inflate(context, id, widgetFrame) + View.inflate(context, id, binding.widgetFrame) } recycle() diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersAdapter.kt index c18bdb63..e08bd9bb 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/blocking/numbers/BlockedNumbersAdapter.kt @@ -22,31 +22,30 @@ import android.view.LayoutInflater import android.view.ViewGroup import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkRealmAdapter -import dev.octoshrimpy.quik.common.base.QkViewHolder +import dev.octoshrimpy.quik.common.base.QkBindingViewHolder import dev.octoshrimpy.quik.model.BlockedNumber import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject -import kotlinx.android.synthetic.main.blocked_number_list_item.* -import kotlinx.android.synthetic.main.blocked_number_list_item.view.* +import dev.octoshrimpy.quik.databinding.BlockedNumberListItemBinding -class BlockedNumbersAdapter : QkRealmAdapter() { +class BlockedNumbersAdapter : QkRealmAdapter>() { val unblockAddress: Subject = PublishSubject.create() - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - val view = LayoutInflater.from(parent.context).inflate(R.layout.blocked_number_list_item, parent, false) - return QkViewHolder(view).apply { - containerView.unblock.setOnClickListener { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder { + val binding = BlockedNumberListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) + return QkBindingViewHolder(binding).apply { + binding.unblock.setOnClickListener { val number = getItem(adapterPosition) ?: return@setOnClickListener unblockAddress.onNext(number.id) } } } - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + override fun onBindViewHolder(holder: QkBindingViewHolder, position: Int) { val item = getItem(position)!! - holder.number.text = item.address + holder.binding.number.text = item.address } } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt index 61200d67..437bcbf6 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/main/SearchAdapter.kt @@ -27,14 +27,13 @@ import android.view.ViewGroup import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.Navigator import dev.octoshrimpy.quik.common.base.QkAdapter -import dev.octoshrimpy.quik.common.base.QkViewHolder +import dev.octoshrimpy.quik.common.base.QkBindingViewHolder import dev.octoshrimpy.quik.common.util.Colors import dev.octoshrimpy.quik.common.util.DateFormatter import dev.octoshrimpy.quik.common.util.extensions.setVisible import dev.octoshrimpy.quik.extensions.removeAccents import dev.octoshrimpy.quik.model.SearchResult -import kotlinx.android.synthetic.main.search_list_item.* -import kotlinx.android.synthetic.main.search_list_item.view.* +import dev.octoshrimpy.quik.databinding.SearchListItemBinding import javax.inject.Inject class SearchAdapter @Inject constructor( @@ -42,26 +41,25 @@ class SearchAdapter @Inject constructor( private val context: Context, private val dateFormatter: DateFormatter, private val navigator: Navigator -) : QkAdapter() { +) : QkAdapter>() { private val highlightColor: Int by lazy { colors.theme().highlight } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - val layoutInflater = LayoutInflater.from(parent.context) - val view = layoutInflater.inflate(R.layout.search_list_item, parent, false) - return QkViewHolder(view).apply { - view.setOnClickListener { + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder { + val binding = SearchListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) + return QkBindingViewHolder(binding).apply { + itemView.setOnClickListener { val result = getItem(adapterPosition) navigator.showConversation(result.conversation.id, result.query.takeIf { result.messages > 0 }) } } } - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + override fun onBindViewHolder(holder: QkBindingViewHolder, position: Int) { val previous = data.getOrNull(position - 1) val result = getItem(position) - holder.resultsHeader.setVisible(result.messages > 0 && previous?.messages == 0) + holder.binding.resultsHeader.setVisible(result.messages > 0 && previous?.messages == 0) val query = result.query val title = SpannableString(result.conversation.getTitle()) @@ -71,23 +69,23 @@ class SearchAdapter @Inject constructor( title.setSpan(BackgroundColorSpan(highlightColor), index, index + query.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) index = title.indexOf(query, index + query.length, true) } - holder.title.text = title + holder.binding.title.text = title - holder.avatars.recipients = result.conversation.recipients + holder.binding.avatars.recipients = result.conversation.recipients when (result.messages == 0) { true -> { - holder.date.setVisible(true) - holder.date.text = dateFormatter.getConversationTimestamp(result.conversation.date) - holder.snippet.text = when (result.conversation.me) { + holder.binding.date.setVisible(true) + holder.binding.date.text = dateFormatter.getConversationTimestamp(result.conversation.date) + holder.binding.snippet.text = when (result.conversation.me) { true -> context.getString(R.string.main_sender_you, result.conversation.snippet) false -> result.conversation.snippet } } false -> { - holder.date.setVisible(false) - holder.snippet.text = context.getString(R.string.main_message_results, result.messages) + holder.binding.date.setVisible(false) + holder.binding.snippet.text = context.getString(R.string.main_message_results, result.messages) } } } @@ -101,4 +99,4 @@ class SearchAdapter @Inject constructor( old.conversation.id == new.conversation.id // Conversation id is the same && old.messages == new.messages // Result count is the same } -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt index 222f1b3d..0a606f49 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/plus/PlusActivity.kt @@ -36,9 +36,7 @@ import dev.octoshrimpy.quik.common.util.extensions.setVisible import dev.octoshrimpy.quik.common.widget.PreferenceView import dev.octoshrimpy.quik.feature.plus.experiment.UpgradeButtonExperiment import dev.octoshrimpy.quik.manager.BillingManager -import kotlinx.android.synthetic.main.collapsing_toolbar.* -import kotlinx.android.synthetic.main.preference_view.view.* -import kotlinx.android.synthetic.main.qksms_plus_activity.* +import dev.octoshrimpy.quik.databinding.QksmsPlusActivityBinding import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch @@ -52,66 +50,68 @@ class PlusActivity : QkThemedActivity(), PlusView { @Inject lateinit var viewModelFactory: ViewModelProvider.Factory private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[PlusViewModel::class.java] } + private lateinit var binding: QksmsPlusActivityBinding - override val upgradeIntent by lazy { upgrade.clicks() } - override val upgradeDonateIntent by lazy { upgradeDonate.clicks() } - override val donateIntent by lazy { donate.clicks() } - override val themeClicks by lazy { themes.clicks() } - override val scheduleClicks by lazy { schedule.clicks() } - override val backupClicks by lazy { backup.clicks() } - override val delayedClicks by lazy { delayed.clicks() } - override val nightClicks by lazy { night.clicks() } + override val upgradeIntent get() = binding.upgrade.clicks() + override val upgradeDonateIntent get() = binding.upgradeDonate.clicks() + override val donateIntent get() = binding.donate.clicks() + override val themeClicks get() = binding.themes.clicks() + override val scheduleClicks get() = binding.schedule.clicks() + override val backupClicks get() = binding.backup.clicks() + override val delayedClicks get() = binding.delayed.clicks() + override val nightClicks get() = binding.night.clicks() override fun onCreate(savedInstanceState: Bundle?) { AndroidInjection.inject(this) super.onCreate(savedInstanceState) - setContentView(R.layout.qksms_plus_activity) + binding = QksmsPlusActivityBinding.inflate(layoutInflater) + setContentView(binding.root) setTitle(R.string.title_qksms_plus) showBackButton(true) viewModel.bindView(this) - free.setVisible(false) + binding.free.setVisible(false) if (!prefs.systemFont.get()) { fontProvider.getLato { lato -> val typeface = Typeface.create(lato, Typeface.BOLD) - collapsingToolbar.setCollapsedTitleTypeface(typeface) - collapsingToolbar.setExpandedTitleTypeface(typeface) + binding.toolbarLayout.collapsingToolbar.setCollapsedTitleTypeface(typeface) + binding.toolbarLayout.collapsingToolbar.setExpandedTitleTypeface(typeface) } } // Make the list titles bold - linearLayout.children - .mapNotNull { it as? PreferenceView } - .map { it.titleView } - .forEach { it.setTypeface(it.typeface, Typeface.BOLD) } + binding.linearLayout.children + .mapNotNull { it as? PreferenceView } + .map { it.titleTextView } + .forEach { it.setTypeface(it.typeface, Typeface.BOLD) } val textPrimary = resolveThemeColor(android.R.attr.textColorPrimary) - collapsingToolbar.setCollapsedTitleTextColor(textPrimary) - collapsingToolbar.setExpandedTitleColor(textPrimary) + binding.toolbarLayout.collapsingToolbar.setCollapsedTitleTextColor(textPrimary) + binding.toolbarLayout.collapsingToolbar.setExpandedTitleColor(textPrimary) val theme = colors.theme().theme - donate.setBackgroundTint(theme) - upgrade.setBackgroundTint(theme) - thanksIcon.setTint(theme) + binding.donate.setBackgroundTint(theme) + binding.upgrade.setBackgroundTint(theme) + binding.thanksIcon.setTint(theme) } override fun render(state: PlusState) { - description.text = getString(R.string.qksms_plus_description_summary, state.upgradePrice) - upgrade.text = getString(upgradeButtonExperiment.variant, state.upgradePrice, state.currency) - upgradeDonate.text = getString(R.string.qksms_plus_upgrade_donate, state.upgradeDonatePrice, state.currency) + binding.description.text = getString(R.string.qksms_plus_description_summary, state.upgradePrice) + binding.upgrade.text = getString(upgradeButtonExperiment.variant, state.upgradePrice, state.currency) + binding.upgradeDonate.text = getString(R.string.qksms_plus_upgrade_donate, state.upgradeDonatePrice, state.currency) val fdroid = true - free.setVisible(fdroid) - toUpgrade.setVisible(!fdroid && !state.upgraded) - upgraded.setVisible(!fdroid && state.upgraded) + binding.free.setVisible(fdroid) + binding.toUpgrade.setVisible(!fdroid && !state.upgraded) + binding.upgraded.setVisible(!fdroid && state.upgraded) - themes.isEnabled = state.upgraded - schedule.isEnabled = state.upgraded - backup.isEnabled = state.upgraded - delayed.isEnabled = state.upgraded - night.isEnabled = state.upgraded + binding.themes.isEnabled = state.upgraded + binding.schedule.isEnabled = state.upgraded + binding.backup.isEnabled = state.upgraded + binding.delayed.isEnabled = state.upgraded + binding.night.isEnabled = state.upgraded } override fun initiatePurchaseFlow(billingManager: BillingManager, sku: String) { @@ -125,4 +125,4 @@ class PlusActivity : QkThemedActivity(), PlusView { } } -} \ No newline at end of file +} diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAttachmentAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAttachmentAdapter.kt index 147cd7e4..ae01c494 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAttachmentAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/scheduled/ScheduledMessageAttachmentAdapter.kt @@ -25,44 +25,40 @@ import android.view.View import android.view.ViewGroup import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.base.QkAdapter -import dev.octoshrimpy.quik.common.base.QkViewHolder +import dev.octoshrimpy.quik.common.base.QkBindingViewHolder import dev.octoshrimpy.quik.extensions.getName import dev.octoshrimpy.quik.feature.extensions.LoadBestIconIntoImageView import dev.octoshrimpy.quik.feature.extensions.loadBestIconIntoImageView -import kotlinx.android.synthetic.main.scheduled_message_image_list_item.fileName -import kotlinx.android.synthetic.main.scheduled_message_image_list_item.thumbnail +import dev.octoshrimpy.quik.databinding.ScheduledMessageImageListItemBinding import javax.inject.Inject class ScheduledMessageAttachmentAdapter @Inject constructor( private val context: Context -) : QkAdapter() { +) : QkAdapter>() { - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder { - return QkViewHolder( - LayoutInflater - .from(parent.context) - .inflate(R.layout.scheduled_message_image_list_item, parent, false) + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder = + QkBindingViewHolder( + ScheduledMessageImageListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) ) - } - override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + override fun onBindViewHolder(holder: QkBindingViewHolder, position: Int) { val uri = getItem(position) // set best image and text to use for icon - when (getItem(position).loadBestIconIntoImageView(context, holder.thumbnail)) { + when (getItem(position).loadBestIconIntoImageView(context, holder.binding.thumbnail)) { LoadBestIconIntoImageView.Missing -> { - holder.fileName.text = context.getString(R.string.attachment_missing) - holder.fileName.visibility = View.VISIBLE + holder.binding.fileName.text = context.getString(R.string.attachment_missing) + holder.binding.fileName.visibility = View.VISIBLE } LoadBestIconIntoImageView.ActivityIcon, LoadBestIconIntoImageView.DefaultAudioIcon, LoadBestIconIntoImageView.GenericIcon -> { // generic style icon used, also show name - holder.fileName.text = uri.getName(context) - holder.fileName.visibility = View.VISIBLE + holder.binding.fileName.text = uri.getName(context) + holder.binding.fileName.visibility = View.VISIBLE } - else -> holder.fileName.visibility = View.GONE + else -> holder.binding.fileName.visibility = View.GONE } } } diff --git a/presentation/src/main/res/layout/qksms_plus_activity.xml b/presentation/src/main/res/layout/qksms_plus_activity.xml index 5ffa1f48..05e885b2 100644 --- a/presentation/src/main/res/layout/qksms_plus_activity.xml +++ b/presentation/src/main/res/layout/qksms_plus_activity.xml @@ -23,7 +23,9 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + - \ No newline at end of file +