forked from upstream-mirrors/quik
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:
@@ -36,12 +36,11 @@ import com.moez.QKSMS.common.util.extensions.autoScrollToStart
|
||||
import com.moez.QKSMS.common.util.extensions.resolveThemeColor
|
||||
import com.moez.QKSMS.common.util.extensions.setBackgroundTint
|
||||
import com.moez.QKSMS.common.util.extensions.setVisible
|
||||
import com.moez.QKSMS.common.util.extensions.viewBinding
|
||||
import com.moez.QKSMS.databinding.QkreplyActivityBinding
|
||||
import com.moez.QKSMS.feature.compose.MessagesAdapter
|
||||
import dagger.android.AndroidInjection
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.qkreply_activity.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class QkReplyActivity : QkThemedActivity(), QkReplyView {
|
||||
@@ -50,11 +49,10 @@ class QkReplyActivity : QkThemedActivity(), QkReplyView {
|
||||
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
|
||||
|
||||
override val menuItemIntent: Subject<Int> = PublishSubject.create()
|
||||
override val textChangedIntent by lazy { binding.message.textChanges() }
|
||||
override val changeSimIntent by lazy { binding.sim.clicks() }
|
||||
override val sendIntent by lazy { binding.send.clicks() }
|
||||
override val textChangedIntent by lazy { message.textChanges() }
|
||||
override val changeSimIntent by lazy { sim.clicks() }
|
||||
override val sendIntent by lazy { send.clicks() }
|
||||
|
||||
private val binding by viewBinding(QkreplyActivityBinding::inflate)
|
||||
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[QkReplyViewModel::class.java] }
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
@@ -63,27 +61,27 @@ class QkReplyActivity : QkThemedActivity(), QkReplyView {
|
||||
super.onCreate(savedInstanceState)
|
||||
|
||||
setFinishOnTouchOutside(prefs.qkreplyTapDismiss.get())
|
||||
setContentView(binding.root)
|
||||
setContentView(R.layout.qkreply_activity)
|
||||
window.setBackgroundDrawable(null)
|
||||
window.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
|
||||
window.setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
|
||||
viewModel.bindView(this)
|
||||
|
||||
binding.toolbar.clipToOutline = true
|
||||
toolbar.clipToOutline = true
|
||||
|
||||
binding.messages.adapter = adapter
|
||||
binding.messages.adapter?.autoScrollToStart(binding.messages)
|
||||
binding.messages.adapter?.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
|
||||
override fun onChanged() = binding.messages.scrollToPosition(adapter.itemCount - 1)
|
||||
messages.adapter = adapter
|
||||
messages.adapter?.autoScrollToStart(messages)
|
||||
messages.adapter?.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
|
||||
override fun onChanged() = messages.scrollToPosition(adapter.itemCount - 1)
|
||||
})
|
||||
|
||||
// These theme attributes don't apply themselves on API 21
|
||||
if (Build.VERSION.SDK_INT <= 22) {
|
||||
binding.toolbar.setBackgroundTint(resolveThemeColor(R.attr.colorPrimary))
|
||||
binding.background.setBackgroundTint(resolveThemeColor(android.R.attr.windowBackground))
|
||||
binding.messageBackground.setBackgroundTint(resolveThemeColor(R.attr.bubbleColor))
|
||||
binding.composeBackgroundGradient.setBackgroundTint(resolveThemeColor(android.R.attr.windowBackground))
|
||||
binding.composeBackgroundSolid.setBackgroundTint(resolveThemeColor(android.R.attr.windowBackground))
|
||||
toolbar.setBackgroundTint(resolveThemeColor(R.attr.colorPrimary))
|
||||
background.setBackgroundTint(resolveThemeColor(android.R.attr.windowBackground))
|
||||
messageBackground.setBackgroundTint(resolveThemeColor(R.attr.bubbleColor))
|
||||
composeBackgroundGradient.setBackgroundTint(resolveThemeColor(android.R.attr.windowBackground))
|
||||
composeBackgroundSolid.setBackgroundTint(resolveThemeColor(android.R.attr.windowBackground))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -96,24 +94,24 @@ class QkReplyActivity : QkThemedActivity(), QkReplyView {
|
||||
|
||||
title = state.title
|
||||
|
||||
binding.toolbar.menu.findItem(R.id.expand)?.isVisible = !state.expanded
|
||||
binding.toolbar.menu.findItem(R.id.collapse)?.isVisible = state.expanded
|
||||
toolbar.menu.findItem(R.id.expand)?.isVisible = !state.expanded
|
||||
toolbar.menu.findItem(R.id.collapse)?.isVisible = state.expanded
|
||||
|
||||
adapter.data = state.data
|
||||
|
||||
binding.counter.text = state.remaining
|
||||
binding.counter.setVisible(binding.counter.text.isNotBlank())
|
||||
counter.text = state.remaining
|
||||
counter.setVisible(counter.text.isNotBlank())
|
||||
|
||||
binding.sim.setVisible(state.subscription != null)
|
||||
binding.sim.contentDescription = getString(R.string.compose_sim_cd, state.subscription?.displayName)
|
||||
binding.simIndex.text = "${state.subscription?.simSlotIndex?.plus(1)}"
|
||||
sim.setVisible(state.subscription != null)
|
||||
sim.contentDescription = getString(R.string.compose_sim_cd, state.subscription?.displayName)
|
||||
simIndex.text = "${state.subscription?.simSlotIndex?.plus(1)}"
|
||||
|
||||
binding.send.isEnabled = state.canSend
|
||||
binding.send.imageAlpha = if (state.canSend) 255 else 128
|
||||
send.isEnabled = state.canSend
|
||||
send.imageAlpha = if (state.canSend) 255 else 128
|
||||
}
|
||||
|
||||
override fun setDraft(draft: String) {
|
||||
binding.message.setText(draft)
|
||||
message.setText(draft)
|
||||
}
|
||||
|
||||
override fun onCreateOptionsMenu(menu: Menu?): Boolean {
|
||||
|
||||
Reference in New Issue
Block a user