Revert "Implement ViewBinding"

This reverts commit 37d8c45379.

# Conflicts:
#	build.gradle
#	presentation/src/main/java/com/moez/QKSMS/common/widget/AvatarView.kt
#	presentation/src/main/java/com/moez/QKSMS/common/widget/TextInputDialog.kt
#	presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt
#	presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt
#	presentation/src/main/java/com/moez/QKSMS/feature/conversationinfo/ConversationInfoController.kt
#	presentation/src/main/java/com/moez/QKSMS/feature/conversations/ConversationsAdapter.kt
#	presentation/src/main/java/com/moez/QKSMS/feature/main/MainActivity.kt
#	presentation/src/main/java/com/moez/QKSMS/feature/settings/SettingsController.kt
This commit is contained in:
Moez Bhatti
2021-02-07 14:30:40 -05:00
parent 03606c053a
commit 062adb76ac
78 changed files with 1207 additions and 1216 deletions
@@ -30,9 +30,9 @@ import com.moez.QKSMS.common.base.QkThemedActivity
import com.moez.QKSMS.common.util.FontProvider
import com.moez.QKSMS.common.util.extensions.setBackgroundTint
import com.moez.QKSMS.common.util.extensions.setTint
import com.moez.QKSMS.common.util.extensions.viewBinding
import com.moez.QKSMS.databinding.ScheduledActivityBinding
import dagger.android.AndroidInjection
import kotlinx.android.synthetic.main.collapsing_toolbar.*
import kotlinx.android.synthetic.main.scheduled_activity.*
import javax.inject.Inject
@@ -45,16 +45,15 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
override val messageClickIntent by lazy { messageAdapter.clicks }
override val messageMenuIntent by lazy { dialog.adapter.menuItemClicks }
override val composeIntent by lazy { binding.compose.clicks() }
override val upgradeIntent by lazy { binding.upgrade.clicks() }
override val composeIntent by lazy { compose.clicks() }
override val upgradeIntent by lazy { upgrade.clicks() }
private val binding by viewBinding(ScheduledActivityBinding::inflate)
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[ScheduledViewModel::class.java] }
override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this)
super.onCreate(savedInstanceState)
setContentView(binding.root)
setContentView(R.layout.scheduled_activity)
setTitle(R.string.scheduled_title)
showBackButton(true)
viewModel.bindView(this)
@@ -62,33 +61,33 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
if (!prefs.systemFont.get()) {
fontProvider.getLato { lato ->
val typeface = Typeface.create(lato, Typeface.BOLD)
binding.appBarLayout.collapsingToolbar.setCollapsedTitleTypeface(typeface)
binding.appBarLayout.collapsingToolbar.setExpandedTitleTypeface(typeface)
collapsingToolbar.setCollapsedTitleTypeface(typeface)
collapsingToolbar.setExpandedTitleTypeface(typeface)
}
}
dialog.title = getString(R.string.scheduled_options_title)
dialog.adapter.setData(R.array.scheduled_options)
messageAdapter.emptyView = binding.empty
binding.messages.adapter = messageAdapter
messageAdapter.emptyView = empty
messages.adapter = messageAdapter
colors.theme().let { theme ->
binding.sampleMessage.setBackgroundTint(theme.theme)
binding.sampleMessage.setTextColor(theme.textPrimary)
binding.compose.setTint(theme.textPrimary)
binding.compose.setBackgroundTint(theme.theme)
binding.upgrade.setBackgroundTint(theme.theme)
binding.upgradeIcon.setTint(theme.textPrimary)
binding.upgradeLabel.setTextColor(theme.textPrimary)
sampleMessage.setBackgroundTint(theme.theme)
sampleMessage.setTextColor(theme.textPrimary)
compose.setTint(theme.textPrimary)
compose.setBackgroundTint(theme.theme)
upgrade.setBackgroundTint(theme.theme)
upgradeIcon.setTint(theme.textPrimary)
upgradeLabel.setTextColor(theme.textPrimary)
}
}
override fun render(state: ScheduledState) {
messageAdapter.updateData(state.scheduledMessages)
binding.compose.isVisible = state.upgraded
binding.upgrade.isVisible = !state.upgraded
compose.isVisible = state.upgraded
upgrade.isVisible = !state.upgraded
}
override fun showMessageOptions() {
@@ -20,13 +20,14 @@ package com.moez.QKSMS.feature.scheduled
import android.content.Context
import android.net.Uri
import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.core.view.isVisible
import androidx.recyclerview.widget.RecyclerView
import com.moez.QKSMS.R
import com.moez.QKSMS.common.base.QkRealmAdapter
import com.moez.QKSMS.common.base.QkViewHolder
import com.moez.QKSMS.common.util.DateFormatter
import com.moez.QKSMS.databinding.ScheduledMessageListItemBinding
import com.moez.QKSMS.model.Contact
import com.moez.QKSMS.model.Recipient
import com.moez.QKSMS.model.ScheduledMessage
@@ -34,6 +35,8 @@ import com.moez.QKSMS.repository.ContactRepository
import com.moez.QKSMS.util.PhoneNumberUtils
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.scheduled_message_list_item.*
import kotlinx.android.synthetic.main.scheduled_message_list_item.view.*
import javax.inject.Inject
class ScheduledMessageAdapter @Inject constructor(
@@ -41,7 +44,7 @@ class ScheduledMessageAdapter @Inject constructor(
private val contactRepo: ContactRepository,
private val dateFormatter: DateFormatter,
private val phoneNumberUtils: PhoneNumberUtils
) : QkRealmAdapter<ScheduledMessage, ScheduledMessageListItemBinding>() {
) : QkRealmAdapter<ScheduledMessage>() {
private val contacts by lazy { contactRepo.getContacts() }
private val contactCache = ContactCache()
@@ -49,34 +52,36 @@ class ScheduledMessageAdapter @Inject constructor(
val clicks: Subject<Long> = PublishSubject.create()
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder<ScheduledMessageListItemBinding> {
return QkViewHolder(parent, ScheduledMessageListItemBinding::inflate).apply {
binding.attachments.adapter = ScheduledMessageAttachmentAdapter(context)
binding.attachments.setRecycledViewPool(imagesViewPool)
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
val view = LayoutInflater.from(parent.context).inflate(R.layout.scheduled_message_list_item, parent, false)
binding.root.setOnClickListener {
view.attachments.adapter = ScheduledMessageAttachmentAdapter(context)
view.attachments.setRecycledViewPool(imagesViewPool)
return QkViewHolder(view).apply {
view.setOnClickListener {
val message = getItem(adapterPosition) ?: return@setOnClickListener
clicks.onNext(message.id)
}
}
}
override fun onBindViewHolder(holder: QkViewHolder<ScheduledMessageListItemBinding>, position: Int) {
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
val message = getItem(position) ?: return
// GroupAvatarView only accepts recipients, so map the phone numbers to recipients
holder.binding.avatars.recipients = message.recipients.map { address -> Recipient(address = address) }
holder.avatars.recipients = message.recipients.map { address -> Recipient(address = address) }
holder.binding.recipients.text = message.recipients.joinToString(",") { address ->
holder.recipients.text = message.recipients.joinToString(",") { address ->
contactCache[address]?.name?.takeIf { it.isNotBlank() } ?: address
}
holder.binding.date.text = dateFormatter.getScheduledTimestamp(message.date)
holder.binding.body.text = message.body
holder.date.text = dateFormatter.getScheduledTimestamp(message.date)
holder.body.text = message.body
val adapter = holder.binding.attachments.adapter as ScheduledMessageAttachmentAdapter
val adapter = holder.attachments.adapter as ScheduledMessageAttachmentAdapter
adapter.data = message.attachments.map(Uri::parse)
holder.binding.attachments.isVisible = message.attachments.isNotEmpty()
holder.attachments.isVisible = message.attachments.isNotEmpty()
}
/**
@@ -20,27 +20,31 @@ package com.moez.QKSMS.feature.scheduled
import android.content.Context
import android.net.Uri
import android.view.LayoutInflater
import android.view.ViewGroup
import com.moez.QKSMS.R
import com.moez.QKSMS.common.base.QkAdapter
import com.moez.QKSMS.common.base.QkViewHolder
import com.moez.QKSMS.databinding.ScheduledMessageImageListItemBinding
import com.moez.QKSMS.util.GlideApp
import kotlinx.android.synthetic.main.attachment_image_list_item.view.*
import kotlinx.android.synthetic.main.scheduled_message_image_list_item.*
import javax.inject.Inject
class ScheduledMessageAttachmentAdapter @Inject constructor(
private val context: Context
) : QkAdapter<Uri, ScheduledMessageImageListItemBinding>() {
) : QkAdapter<Uri>() {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder<ScheduledMessageImageListItemBinding> {
return QkViewHolder(parent, ScheduledMessageImageListItemBinding::inflate).apply {
binding.thumbnail.clipToOutline = true
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
val view = LayoutInflater.from(parent.context).inflate(R.layout.scheduled_message_image_list_item, parent, false)
view.thumbnail.clipToOutline = true
return QkViewHolder(view)
}
override fun onBindViewHolder(holder: QkViewHolder<ScheduledMessageImageListItemBinding>, position: Int) {
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
val attachment = getItem(position)
GlideApp.with(context).load(attachment).into(holder.binding.thumbnail)
GlideApp.with(context).load(attachment).into(holder.thumbnail)
}
}