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
@@ -20,7 +20,6 @@ package com.moez.QKSMS.common.base
import androidx.annotation.CallSuper
import androidx.recyclerview.widget.RecyclerView
import androidx.viewbinding.ViewBinding
import io.reactivex.Flowable
import io.reactivex.disposables.Disposable
@@ -28,7 +27,7 @@ import io.reactivex.disposables.Disposable
* Base RecyclerView.Adapter that provides some convenience when creating a new Adapter, such as
* data list handing and item animations
*/
abstract class FlowableAdapter<T, Binding: ViewBinding> : QkAdapter<T, Binding>() {
abstract class FlowableAdapter<T> : QkAdapter<T>() {
var flowable: Flowable<List<T>>? = null
set(value) {
@@ -22,20 +22,14 @@ import android.annotation.SuppressLint
import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
import android.view.View
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.Toolbar
import com.moez.QKSMS.R
import com.moez.QKSMS.common.widget.QkTextView
import io.reactivex.subjects.BehaviorSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.toolbar.*
abstract class QkActivity : AppCompatActivity() {
val toolbar by lazy { findViewById<Toolbar>(R.id.toolbar)!! }
protected val menu: Subject<Menu> = BehaviorSubject.create()
protected val toolbarTitle by lazy { findViewById<QkTextView>(R.id.toolbarTitle) }
@SuppressLint("InlinedApi")
override fun onCreate(savedInstanceState: Bundle?) {
@@ -53,8 +47,8 @@ abstract class QkActivity : AppCompatActivity() {
}
}
override fun setContentView(view: View?) {
super.setContentView(view)
override fun setContentView(layoutResID: Int) {
super.setContentView(layoutResID)
setSupportActionBar(toolbar)
title = title // The title may have been set before layout inflation
}
@@ -22,7 +22,6 @@ import android.view.View
import androidx.core.view.isVisible
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.RecyclerView
import androidx.viewbinding.ViewBinding
import com.moez.QKSMS.common.util.extensions.setVisible
import io.reactivex.subjects.BehaviorSubject
import io.reactivex.subjects.Subject
@@ -31,7 +30,7 @@ import io.reactivex.subjects.Subject
* Base RecyclerView.Adapter that provides some convenience when creating a new Adapter, such as
* data list handing and item animations
*/
abstract class QkAdapter<T, Binding: ViewBinding> : RecyclerView.Adapter<QkViewHolder<Binding>>() {
abstract class QkAdapter<T> : RecyclerView.Adapter<QkViewHolder>() {
var data: List<T> = ArrayList()
set(value) {
@@ -21,17 +21,15 @@ package com.moez.QKSMS.common.base
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.annotation.LayoutRes
import androidx.annotation.StringRes
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.Toolbar
import androidx.viewbinding.ViewBinding
import com.bluelinelabs.conductor.archlifecycle.LifecycleController
import com.moez.QKSMS.R
import com.moez.QKSMS.common.widget.QkTextView
import kotlinx.android.extensions.LayoutContainer
import kotlinx.android.synthetic.*
import kotlinx.android.synthetic.main.toolbar.view.*
abstract class QkController<ViewContract : QkViewContract<State>, State, Presenter : QkPresenter<ViewContract, State>, Binding : ViewBinding>(
private val bindingInflater: (LayoutInflater, ViewGroup, Boolean) -> Binding
) : LifecycleController() {
abstract class QkController<ViewContract : QkViewContract<State>, State, Presenter : QkPresenter<ViewContract, State>> : LifecycleController(), LayoutContainer {
abstract var presenter: Presenter
@@ -41,15 +39,16 @@ abstract class QkController<ViewContract : QkViewContract<State>, State, Present
protected val themedActivity: QkThemedActivity?
get() = activity as? QkThemedActivity
private val toolbar by lazy { view?.findViewById<Toolbar>(R.id.toolbar) }
private val toolbarTitle by lazy { view?.findViewById<QkTextView>(R.id.toolbarTitle) }
override var containerView: View? = null
lateinit var binding: Binding
@LayoutRes
var layoutRes: Int = 0
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup): View {
binding = bindingInflater(inflater, container, false)
onViewCreated()
return binding.root
return inflater.inflate(layoutRes, container, false).also {
containerView = it
onViewCreated()
}
}
open fun onViewCreated() {
@@ -61,13 +60,18 @@ abstract class QkController<ViewContract : QkViewContract<State>, State, Present
fun setTitle(title: CharSequence?) {
activity?.title = title
toolbarTitle?.text = title
view?.toolbarTitle?.text = title
}
fun showBackButton(show: Boolean) {
appCompatActivity?.supportActionBar?.setDisplayHomeAsUpEnabled(show)
}
override fun onDestroyView(view: View) {
containerView = null
clearFindViewByIdCache()
}
override fun onDestroy() {
super.onDestroy()
presenter.onCleared()
@@ -20,7 +20,6 @@ package com.moez.QKSMS.common.base
import android.view.View
import androidx.recyclerview.widget.RecyclerView
import androidx.viewbinding.ViewBinding
import com.moez.QKSMS.common.util.extensions.setVisible
import io.reactivex.subjects.BehaviorSubject
import io.reactivex.subjects.Subject
@@ -31,8 +30,7 @@ import io.realm.RealmRecyclerViewAdapter
import io.realm.RealmResults
import timber.log.Timber
abstract class QkRealmAdapter<T : RealmModel, Binding : ViewBinding>
: RealmRecyclerViewAdapter<T, QkViewHolder<Binding>>(null, true) {
abstract class QkRealmAdapter<T : RealmModel> : RealmRecyclerViewAdapter<T, QkViewHolder>(null, true) {
/**
* This view can be set, and the adapter will automatically control the visibility of this view
@@ -44,6 +44,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.rxkotlin.Observables
import io.reactivex.subjects.BehaviorSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.toolbar.*
import java.util.concurrent.TimeUnit
import javax.inject.Inject
@@ -133,7 +134,7 @@ abstract class QkThemedActivity : QkActivity() {
// Set the color for the overflow and navigation icon
val textSecondary = resolveThemeColor(android.R.attr.textColorSecondary)
toolbar.overflowIcon = toolbar.overflowIcon?.apply { setTint(textSecondary) }
toolbar?.overflowIcon = toolbar?.overflowIcon?.apply { setTint(textSecondary) }
// Update the colours of the menu items
Observables.combineLatest(menu, theme) { menu, theme ->
@@ -18,16 +18,10 @@
*/
package com.moez.QKSMS.common.base
import android.view.LayoutInflater
import android.view.ViewGroup
import android.view.View
import androidx.recyclerview.widget.RecyclerView
import androidx.viewbinding.ViewBinding
class QkViewHolder<T : ViewBinding>(val binding: T) : RecyclerView.ViewHolder(binding.root) {
constructor(
parent: ViewGroup,
bindingInflator: (LayoutInflater, ViewGroup, Boolean) -> T
) : this(bindingInflator(LayoutInflater.from(parent.context), parent, false))
import kotlinx.android.extensions.LayoutContainer
class QkViewHolder(view: View) : RecyclerView.ViewHolder(view), LayoutContainer {
override val containerView: View = view
}