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:
@@ -22,22 +22,21 @@ import android.os.Bundle
|
||||
import com.bluelinelabs.conductor.Conductor
|
||||
import com.bluelinelabs.conductor.Router
|
||||
import com.bluelinelabs.conductor.RouterTransaction
|
||||
import com.moez.QKSMS.R
|
||||
import com.moez.QKSMS.common.base.QkThemedActivity
|
||||
import com.moez.QKSMS.common.util.extensions.viewBinding
|
||||
import com.moez.QKSMS.databinding.ContainerActivityBinding
|
||||
import dagger.android.AndroidInjection
|
||||
import kotlinx.android.synthetic.main.container_activity.*
|
||||
|
||||
class BlockingActivity : QkThemedActivity() {
|
||||
|
||||
private val binding by viewBinding(ContainerActivityBinding::inflate)
|
||||
private lateinit var router: Router
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
AndroidInjection.inject(this)
|
||||
super.onCreate(savedInstanceState)
|
||||
setContentView(binding.root)
|
||||
setContentView(R.layout.container_activity)
|
||||
|
||||
router = Conductor.attachRouter(this, binding.container, savedInstanceState)
|
||||
router = Conductor.attachRouter(this, container, savedInstanceState)
|
||||
if (!router.hasRootController()) {
|
||||
router.setRoot(RouterTransaction.with(BlockingController()))
|
||||
}
|
||||
|
||||
@@ -26,22 +26,20 @@ import com.moez.QKSMS.common.QkChangeHandler
|
||||
import com.moez.QKSMS.common.base.QkController
|
||||
import com.moez.QKSMS.common.util.Colors
|
||||
import com.moez.QKSMS.common.util.extensions.animateLayoutChanges
|
||||
import com.moez.QKSMS.common.widget.QkSwitch
|
||||
import com.moez.QKSMS.databinding.BlockingControllerBinding
|
||||
import com.moez.QKSMS.feature.blocking.manager.BlockingManagerController
|
||||
import com.moez.QKSMS.feature.blocking.messages.BlockedMessagesController
|
||||
import com.moez.QKSMS.feature.blocking.numbers.BlockedNumbersController
|
||||
import com.moez.QKSMS.injection.appComponent
|
||||
import kotlinx.android.synthetic.main.blocking_controller.*
|
||||
import kotlinx.android.synthetic.main.settings_switch_widget.view.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class BlockingController : QkController<BlockingView, BlockingState, BlockingPresenter, BlockingControllerBinding>(
|
||||
BlockingControllerBinding::inflate
|
||||
), BlockingView {
|
||||
class BlockingController : QkController<BlockingView, BlockingState, BlockingPresenter>(), BlockingView {
|
||||
|
||||
override val blockingManagerIntent by lazy { binding.blockingManager.clicks() }
|
||||
override val blockedNumbersIntent by lazy { binding.blockedNumbers.clicks() }
|
||||
override val blockedMessagesIntent by lazy { binding.blockedMessages.clicks() }
|
||||
override val dropClickedIntent by lazy { binding.drop.clicks() }
|
||||
override val blockingManagerIntent by lazy { blockingManager.clicks() }
|
||||
override val blockedNumbersIntent by lazy { blockedNumbers.clicks() }
|
||||
override val blockedMessagesIntent by lazy { blockedMessages.clicks() }
|
||||
override val dropClickedIntent by lazy { drop.clicks() }
|
||||
|
||||
@Inject lateinit var colors: Colors
|
||||
@Inject override lateinit var presenter: BlockingPresenter
|
||||
@@ -49,11 +47,12 @@ class BlockingController : QkController<BlockingView, BlockingState, BlockingPre
|
||||
init {
|
||||
appComponent.inject(this)
|
||||
retainViewMode = RetainViewMode.RETAIN_DETACH
|
||||
layoutRes = R.layout.blocking_controller
|
||||
}
|
||||
|
||||
override fun onViewCreated() {
|
||||
super.onViewCreated()
|
||||
binding.parent.postDelayed({ binding.parent.animateLayoutChanges = true }, 100)
|
||||
parent.postDelayed({ parent?.animateLayoutChanges = true }, 100)
|
||||
}
|
||||
|
||||
override fun onAttach(view: View) {
|
||||
@@ -64,9 +63,9 @@ class BlockingController : QkController<BlockingView, BlockingState, BlockingPre
|
||||
}
|
||||
|
||||
override fun render(state: BlockingState) {
|
||||
binding.blockingManager.summary = state.blockingManager
|
||||
binding.drop.widget<QkSwitch>().isChecked = state.dropEnabled
|
||||
binding.blockedMessages.isEnabled = !state.dropEnabled
|
||||
blockingManager.summary = state.blockingManager
|
||||
drop.checkbox.isChecked = state.dropEnabled
|
||||
blockedMessages.isEnabled = !state.dropEnabled
|
||||
}
|
||||
|
||||
override fun openBlockedNumbers() {
|
||||
|
||||
+14
-11
@@ -7,16 +7,18 @@ import androidx.core.view.isVisible
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
import com.moez.QKSMS.R
|
||||
import com.moez.QKSMS.common.base.QkController
|
||||
import com.moez.QKSMS.databinding.BlockingManagerControllerBinding
|
||||
import com.moez.QKSMS.injection.appComponent
|
||||
import com.moez.QKSMS.util.Preferences
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.Single
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import kotlinx.android.synthetic.main.blocking_manager_controller.*
|
||||
import kotlinx.android.synthetic.main.blocking_manager_list_option.view.*
|
||||
import kotlinx.android.synthetic.main.radio_preference_view.view.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class BlockingManagerController : QkController<BlockingManagerView, BlockingManagerState, BlockingManagerPresenter,
|
||||
BlockingManagerControllerBinding>(BlockingManagerControllerBinding::inflate), BlockingManagerView {
|
||||
class BlockingManagerController : QkController<BlockingManagerView, BlockingManagerState, BlockingManagerPresenter>(),
|
||||
BlockingManagerView {
|
||||
|
||||
@Inject override lateinit var presenter: BlockingManagerPresenter
|
||||
|
||||
@@ -25,6 +27,7 @@ class BlockingManagerController : QkController<BlockingManagerView, BlockingMana
|
||||
init {
|
||||
appComponent.inject(this)
|
||||
retainViewMode = RetainViewMode.RETAIN_DETACH
|
||||
layoutRes = R.layout.blocking_manager_controller
|
||||
}
|
||||
|
||||
override fun onAttach(view: View) {
|
||||
@@ -39,19 +42,19 @@ class BlockingManagerController : QkController<BlockingManagerView, BlockingMana
|
||||
}
|
||||
|
||||
override fun render(state: BlockingManagerState) {
|
||||
binding.qksms.binding.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_QKSMS
|
||||
qksms.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_QKSMS
|
||||
|
||||
binding.callControl.binding.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_CC
|
||||
binding.callControl.binding.widgetFrame.isVisible = !state.callControlInstalled
|
||||
callControl.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_CC
|
||||
callControl.install.isVisible = !state.callControlInstalled
|
||||
|
||||
binding.shouldIAnswer.binding.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_SIA
|
||||
binding.shouldIAnswer.binding.widgetFrame.isVisible = !state.siaInstalled
|
||||
shouldIAnswer.radioButton.isChecked = state.blockingManager == Preferences.BLOCKING_MANAGER_SIA
|
||||
shouldIAnswer.install.isVisible = !state.siaInstalled
|
||||
}
|
||||
|
||||
override fun activityResumed(): Observable<*> = activityResumedSubject
|
||||
override fun qksmsClicked(): Observable<*> = binding.qksms.clicks()
|
||||
override fun callControlClicked(): Observable<*> = binding.callControl.clicks()
|
||||
override fun siaClicked(): Observable<*> = binding.shouldIAnswer.clicks()
|
||||
override fun qksmsClicked(): Observable<*> = qksms.clicks()
|
||||
override fun callControlClicked(): Observable<*> = callControl.clicks()
|
||||
override fun siaClicked(): Observable<*> = shouldIAnswer.clicks()
|
||||
|
||||
override fun showCopyDialog(manager: String): Single<Boolean> = Single.create { emitter ->
|
||||
AlertDialog.Builder(activity)
|
||||
|
||||
+27
-24
@@ -20,6 +20,7 @@ package com.moez.QKSMS.feature.blocking.messages
|
||||
|
||||
import android.content.Context
|
||||
import android.graphics.Typeface
|
||||
import android.view.LayoutInflater
|
||||
import android.view.ViewGroup
|
||||
import androidx.core.view.isVisible
|
||||
import com.moez.QKSMS.R
|
||||
@@ -27,63 +28,65 @@ 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.common.util.extensions.resolveThemeColor
|
||||
import com.moez.QKSMS.databinding.BlockedListItemBinding
|
||||
import com.moez.QKSMS.model.Conversation
|
||||
import com.moez.QKSMS.util.Preferences
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import kotlinx.android.synthetic.main.blocked_list_item.*
|
||||
import kotlinx.android.synthetic.main.blocked_list_item.view.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class BlockedMessagesAdapter @Inject constructor(
|
||||
private val context: Context,
|
||||
private val dateFormatter: DateFormatter
|
||||
) : QkRealmAdapter<Conversation, BlockedListItemBinding>() {
|
||||
) : QkRealmAdapter<Conversation>() {
|
||||
|
||||
val clicks: PublishSubject<Long> = PublishSubject.create()
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder<BlockedListItemBinding> {
|
||||
return QkViewHolder(parent, BlockedListItemBinding::inflate).apply {
|
||||
if (viewType == 0) {
|
||||
binding.title.setTypeface(binding.title.typeface, Typeface.BOLD)
|
||||
binding.date.setTypeface(binding.date.typeface, Typeface.BOLD)
|
||||
binding.date.setTextColor(parent.context.resolveThemeColor(android.R.attr.textColorPrimary))
|
||||
}
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
|
||||
val view = LayoutInflater.from(parent.context).inflate(R.layout.blocked_list_item, parent, false)
|
||||
|
||||
binding.root.setOnClickListener {
|
||||
if (viewType == 0) {
|
||||
view.title.setTypeface(view.title.typeface, Typeface.BOLD)
|
||||
view.date.setTypeface(view.date.typeface, Typeface.BOLD)
|
||||
view.date.setTextColor(view.context.resolveThemeColor(android.R.attr.textColorPrimary))
|
||||
}
|
||||
|
||||
return QkViewHolder(view).apply {
|
||||
view.setOnClickListener {
|
||||
val conversation = getItem(adapterPosition) ?: return@setOnClickListener
|
||||
when (toggleSelection(conversation.id, false)) {
|
||||
true -> binding.root.isActivated = isSelected(conversation.id)
|
||||
true -> view.isActivated = isSelected(conversation.id)
|
||||
false -> clicks.onNext(conversation.id)
|
||||
}
|
||||
}
|
||||
|
||||
binding.root.setOnLongClickListener {
|
||||
view.setOnLongClickListener {
|
||||
val conversation = getItem(adapterPosition) ?: return@setOnLongClickListener true
|
||||
toggleSelection(conversation.id)
|
||||
binding.root.isActivated = isSelected(conversation.id)
|
||||
view.isActivated = isSelected(conversation.id)
|
||||
true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(holder: QkViewHolder<BlockedListItemBinding>, position: Int) {
|
||||
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
|
||||
val conversation = getItem(position) ?: return
|
||||
|
||||
holder.binding.root.isActivated = isSelected(conversation.id)
|
||||
holder.containerView.isActivated = isSelected(conversation.id)
|
||||
|
||||
holder.binding.avatars.recipients = conversation.recipients
|
||||
holder.binding.title.collapseEnabled = conversation.recipients.size > 1
|
||||
holder.binding.title.text = conversation.getTitle()
|
||||
holder.binding.date.text = dateFormatter.getConversationTimestamp(conversation.date)
|
||||
holder.avatars.recipients = conversation.recipients
|
||||
holder.title.collapseEnabled = conversation.recipients.size > 1
|
||||
holder.title.text = conversation.getTitle()
|
||||
holder.date.text = dateFormatter.getConversationTimestamp(conversation.date)
|
||||
|
||||
holder.binding.blocker.text = when (conversation.blockingClient) {
|
||||
holder.blocker.text = when (conversation.blockingClient) {
|
||||
Preferences.BLOCKING_MANAGER_CC -> context.getString(R.string.blocking_manager_call_control_title)
|
||||
Preferences.BLOCKING_MANAGER_SIA -> context.getString(R.string.blocking_manager_sia_title)
|
||||
else -> null
|
||||
}
|
||||
|
||||
holder.binding.reason.text = conversation.blockReason
|
||||
holder.binding.blocker.isVisible = holder.binding.blocker.text.isNotEmpty()
|
||||
holder.binding.reason.isVisible = holder.binding.blocker.text.isNotEmpty()
|
||||
holder.reason.text = conversation.blockReason
|
||||
holder.blocker.isVisible = holder.blocker.text.isNotEmpty()
|
||||
holder.reason.isVisible = holder.blocker.text.isNotEmpty()
|
||||
}
|
||||
|
||||
override fun getItemViewType(position: Int): Int {
|
||||
|
||||
+7
-5
@@ -27,15 +27,16 @@ import android.view.View
|
||||
import com.moez.QKSMS.R
|
||||
import com.moez.QKSMS.common.base.QkController
|
||||
import com.moez.QKSMS.common.util.Colors
|
||||
import com.moez.QKSMS.databinding.BlockedMessagesControllerBinding
|
||||
import com.moez.QKSMS.feature.blocking.BlockingDialog
|
||||
import com.moez.QKSMS.injection.appComponent
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.blocked_messages_controller.*
|
||||
import kotlinx.android.synthetic.main.container_activity.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class BlockedMessagesController : QkController<BlockedMessagesView, BlockedMessagesState, BlockedMessagesPresenter,
|
||||
BlockedMessagesControllerBinding>(BlockedMessagesControllerBinding::inflate), BlockedMessagesView {
|
||||
class BlockedMessagesController : QkController<BlockedMessagesView, BlockedMessagesState, BlockedMessagesPresenter>(),
|
||||
BlockedMessagesView {
|
||||
|
||||
override val menuReadyIntent: Subject<Unit> = PublishSubject.create()
|
||||
override val optionsItemIntent: Subject<Int> = PublishSubject.create()
|
||||
@@ -53,12 +54,13 @@ class BlockedMessagesController : QkController<BlockedMessagesView, BlockedMessa
|
||||
init {
|
||||
appComponent.inject(this)
|
||||
retainViewMode = RetainViewMode.RETAIN_DETACH
|
||||
layoutRes = R.layout.blocked_messages_controller
|
||||
}
|
||||
|
||||
override fun onViewCreated() {
|
||||
super.onViewCreated()
|
||||
blockedMessagesAdapter.emptyView = binding.empty
|
||||
binding.conversations.adapter = blockedMessagesAdapter
|
||||
blockedMessagesAdapter.emptyView = empty
|
||||
conversations.adapter = blockedMessagesAdapter
|
||||
}
|
||||
|
||||
override fun onAttach(view: View) {
|
||||
|
||||
+11
-7
@@ -18,31 +18,35 @@
|
||||
*/
|
||||
package com.moez.QKSMS.feature.blocking.numbers
|
||||
|
||||
import android.view.LayoutInflater
|
||||
import android.view.ViewGroup
|
||||
import com.moez.QKSMS.R
|
||||
import com.moez.QKSMS.common.base.QkRealmAdapter
|
||||
import com.moez.QKSMS.common.base.QkViewHolder
|
||||
import com.moez.QKSMS.databinding.BlockedNumberListItemBinding
|
||||
import com.moez.QKSMS.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.*
|
||||
|
||||
class BlockedNumbersAdapter : QkRealmAdapter<BlockedNumber, BlockedNumberListItemBinding>() {
|
||||
class BlockedNumbersAdapter : QkRealmAdapter<BlockedNumber>() {
|
||||
|
||||
val unblockAddress: Subject<Long> = PublishSubject.create()
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder<BlockedNumberListItemBinding> {
|
||||
return QkViewHolder(parent, BlockedNumberListItemBinding::inflate).apply {
|
||||
binding.unblock.setOnClickListener {
|
||||
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 {
|
||||
val number = getItem(adapterPosition) ?: return@setOnClickListener
|
||||
unblockAddress.onNext(number.id)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(holder: QkViewHolder<BlockedNumberListItemBinding>, position: Int) {
|
||||
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
|
||||
val item = getItem(position)!!
|
||||
|
||||
holder.binding.number.text = item.address
|
||||
holder.number.text = item.address
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+15
-13
@@ -18,6 +18,7 @@
|
||||
*/
|
||||
package com.moez.QKSMS.feature.blocking.numbers
|
||||
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import com.jakewharton.rxbinding2.view.clicks
|
||||
@@ -26,17 +27,17 @@ import com.moez.QKSMS.common.base.QkController
|
||||
import com.moez.QKSMS.common.util.Colors
|
||||
import com.moez.QKSMS.common.util.extensions.setBackgroundTint
|
||||
import com.moez.QKSMS.common.util.extensions.setTint
|
||||
import com.moez.QKSMS.databinding.BlockedNumbersAddDialogBinding
|
||||
import com.moez.QKSMS.databinding.BlockedNumbersControllerBinding
|
||||
import com.moez.QKSMS.injection.appComponent
|
||||
import com.moez.QKSMS.util.PhoneNumberUtils
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.blocked_numbers_add_dialog.view.*
|
||||
import kotlinx.android.synthetic.main.blocked_numbers_controller.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class BlockedNumbersController : QkController<BlockedNumbersView, BlockedNumbersState, BlockedNumbersPresenter,
|
||||
BlockedNumbersControllerBinding>(BlockedNumbersControllerBinding::inflate), BlockedNumbersView {
|
||||
class BlockedNumbersController : QkController<BlockedNumbersView, BlockedNumbersState, BlockedNumbersPresenter>(),
|
||||
BlockedNumbersView {
|
||||
|
||||
@Inject override lateinit var presenter: BlockedNumbersPresenter
|
||||
@Inject lateinit var colors: Colors
|
||||
@@ -48,6 +49,7 @@ class BlockedNumbersController : QkController<BlockedNumbersView, BlockedNumbers
|
||||
init {
|
||||
appComponent.inject(this)
|
||||
retainViewMode = RetainViewMode.RETAIN_DETACH
|
||||
layoutRes = R.layout.blocked_numbers_controller
|
||||
}
|
||||
|
||||
override fun onAttach(view: View) {
|
||||
@@ -59,10 +61,10 @@ class BlockedNumbersController : QkController<BlockedNumbersView, BlockedNumbers
|
||||
|
||||
override fun onViewCreated() {
|
||||
super.onViewCreated()
|
||||
binding.add.setBackgroundTint(colors.theme().theme)
|
||||
binding.add.setTint(colors.theme().textPrimary)
|
||||
adapter.emptyView = binding.empty
|
||||
binding.numbers.adapter = adapter
|
||||
add.setBackgroundTint(colors.theme().theme)
|
||||
add.setTint(colors.theme().textPrimary)
|
||||
adapter.emptyView = empty
|
||||
numbers.adapter = adapter
|
||||
}
|
||||
|
||||
override fun render(state: BlockedNumbersState) {
|
||||
@@ -70,16 +72,16 @@ class BlockedNumbersController : QkController<BlockedNumbersView, BlockedNumbers
|
||||
}
|
||||
|
||||
override fun unblockAddress(): Observable<Long> = adapter.unblockAddress
|
||||
override fun addAddress(): Observable<*> = binding.add.clicks()
|
||||
override fun addAddress(): Observable<*> = add.clicks()
|
||||
override fun saveAddress(): Observable<String> = saveAddressSubject
|
||||
|
||||
override fun showAddDialog() {
|
||||
val binding = BlockedNumbersAddDialogBinding.inflate(activity?.layoutInflater!!)
|
||||
val textWatcher = BlockedNumberTextWatcher(binding.input, phoneNumberUtils)
|
||||
val layout = LayoutInflater.from(activity).inflate(R.layout.blocked_numbers_add_dialog, null)
|
||||
val textWatcher = BlockedNumberTextWatcher(layout.input, phoneNumberUtils)
|
||||
val dialog = AlertDialog.Builder(activity!!)
|
||||
.setView(binding.root)
|
||||
.setView(layout)
|
||||
.setPositiveButton(R.string.blocked_numbers_dialog_block) { _, _ ->
|
||||
saveAddressSubject.onNext(binding.input.text.toString())
|
||||
saveAddressSubject.onNext(layout.input.text.toString())
|
||||
}
|
||||
.setNegativeButton(R.string.button_cancel) { _, _ -> }
|
||||
.setOnDismissListener { textWatcher.dispose() }
|
||||
|
||||
Reference in New Issue
Block a user