mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-20 12:48:53 +01:00
migrate more
This commit is contained in:
@@ -24,22 +24,20 @@ import android.view.LayoutInflater
|
|||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import androidx.annotation.ArrayRes
|
import androidx.annotation.ArrayRes
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import dev.octoshrimpy.quik.R
|
|
||||||
import dev.octoshrimpy.quik.common.base.QkAdapter
|
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.Colors
|
||||||
import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor
|
import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor
|
||||||
import dev.octoshrimpy.quik.common.util.extensions.setVisible
|
import dev.octoshrimpy.quik.common.util.extensions.setVisible
|
||||||
|
import dev.octoshrimpy.quik.databinding.MenuListItemBinding
|
||||||
import io.reactivex.disposables.CompositeDisposable
|
import io.reactivex.disposables.CompositeDisposable
|
||||||
import io.reactivex.subjects.PublishSubject
|
import io.reactivex.subjects.PublishSubject
|
||||||
import io.reactivex.subjects.Subject
|
import io.reactivex.subjects.Subject
|
||||||
import kotlinx.android.synthetic.main.menu_list_item.*
|
|
||||||
import kotlinx.android.synthetic.main.menu_list_item.view.*
|
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
data class MenuItem(val title: String, val actionId: Int)
|
data class MenuItem(val title: String, val actionId: Int)
|
||||||
|
|
||||||
class MenuItemAdapter @Inject constructor(private val context: Context, private val colors: Colors) : QkAdapter<MenuItem, QkViewHolder>() {
|
class MenuItemAdapter @Inject constructor(private val context: Context, private val colors: Colors) : QkAdapter<MenuItem, QkBindingViewHolder<MenuListItemBinding>>() {
|
||||||
|
|
||||||
val menuItemClicks: Subject<Int> = PublishSubject.create()
|
val menuItemClicks: Subject<Int> = PublishSubject.create()
|
||||||
|
|
||||||
@@ -63,31 +61,30 @@ class MenuItemAdapter @Inject constructor(private val context: Context, private
|
|||||||
.mapIndexed { index, title -> MenuItem(title, valueInts?.getOrNull(index) ?: index) }
|
.mapIndexed { index, title -> MenuItem(title, valueInts?.getOrNull(index) ?: index) }
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
|
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder<MenuListItemBinding> {
|
||||||
val layoutInflater = LayoutInflater.from(parent.context)
|
val binding = MenuListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
|
||||||
val view = layoutInflater.inflate(R.layout.menu_list_item, parent, false)
|
|
||||||
|
|
||||||
val states = arrayOf(
|
val states = arrayOf(
|
||||||
intArrayOf(android.R.attr.state_activated),
|
intArrayOf(android.R.attr.state_activated),
|
||||||
intArrayOf(-android.R.attr.state_activated))
|
intArrayOf(-android.R.attr.state_activated))
|
||||||
|
|
||||||
val text = parent.context.resolveThemeColor(android.R.attr.textColorTertiary)
|
val text = parent.context.resolveThemeColor(android.R.attr.textColorTertiary)
|
||||||
view.check.imageTintList = ColorStateList(states, intArrayOf(colors.theme().theme, text))
|
binding.check.imageTintList = ColorStateList(states, intArrayOf(colors.theme().theme, text))
|
||||||
|
|
||||||
return QkViewHolder(view).apply {
|
return QkBindingViewHolder(binding).apply {
|
||||||
view.setOnClickListener {
|
binding.root.setOnClickListener {
|
||||||
val menuItem = getItem(adapterPosition)
|
val menuItem = getItem(adapterPosition)
|
||||||
menuItemClicks.onNext(menuItem.actionId)
|
menuItemClicks.onNext(menuItem.actionId)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
|
override fun onBindViewHolder(holder: QkBindingViewHolder<MenuListItemBinding>, position: Int) {
|
||||||
val menuItem = getItem(position)
|
val menuItem = getItem(position)
|
||||||
|
|
||||||
holder.title.text = menuItem.title
|
holder.binding.title.text = menuItem.title
|
||||||
holder.check.isActivated = (menuItem.actionId == selectedItem)
|
holder.binding.check.isActivated = (menuItem.actionId == selectedItem)
|
||||||
holder.check.setVisible(selectedItem != null)
|
holder.binding.check.setVisible(selectedItem != null)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
|
override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
|
||||||
|
|||||||
@@ -20,8 +20,11 @@ package dev.octoshrimpy.quik.common.base
|
|||||||
|
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
|
import androidx.viewbinding.ViewBinding
|
||||||
import kotlinx.android.extensions.LayoutContainer
|
import kotlinx.android.extensions.LayoutContainer
|
||||||
|
|
||||||
open class QkViewHolder(view: View) : RecyclerView.ViewHolder(view), LayoutContainer {
|
open class QkViewHolder(view: View) : RecyclerView.ViewHolder(view), LayoutContainer {
|
||||||
override val containerView: View = view
|
override val containerView: View = view
|
||||||
}
|
}
|
||||||
|
|
||||||
|
open class QkBindingViewHolder<T : ViewBinding>(val binding: T) : QkViewHolder(binding.root)
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ package dev.octoshrimpy.quik.common.widget
|
|||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.util.AttributeSet
|
import android.util.AttributeSet
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
|
||||||
import android.widget.FrameLayout
|
import android.widget.FrameLayout
|
||||||
import dev.octoshrimpy.quik.R
|
import dev.octoshrimpy.quik.R
|
||||||
import dev.octoshrimpy.quik.common.Navigator
|
import dev.octoshrimpy.quik.common.Navigator
|
||||||
|
|||||||
@@ -20,31 +20,29 @@ package dev.octoshrimpy.quik.common.widget
|
|||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.util.AttributeSet
|
import android.util.AttributeSet
|
||||||
import android.view.View
|
import android.view.LayoutInflater
|
||||||
import androidx.constraintlayout.widget.ConstraintLayout
|
import androidx.constraintlayout.widget.ConstraintLayout
|
||||||
import androidx.core.view.isVisible
|
import androidx.core.view.isVisible
|
||||||
import androidx.core.view.updateLayoutParams
|
import androidx.core.view.updateLayoutParams
|
||||||
import dev.octoshrimpy.quik.R
|
|
||||||
import dev.octoshrimpy.quik.common.util.extensions.getColorCompat
|
import dev.octoshrimpy.quik.common.util.extensions.getColorCompat
|
||||||
import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor
|
import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor
|
||||||
import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint
|
import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint
|
||||||
|
import dev.octoshrimpy.quik.databinding.GroupAvatarViewBinding
|
||||||
import dev.octoshrimpy.quik.model.Recipient
|
import dev.octoshrimpy.quik.model.Recipient
|
||||||
import kotlinx.android.synthetic.main.group_avatar_view.view.*
|
|
||||||
|
|
||||||
class GroupAvatarView @JvmOverloads constructor(
|
class GroupAvatarView @JvmOverloads constructor(
|
||||||
context: Context, attrs: AttributeSet? = null
|
context: Context, attrs: AttributeSet? = null
|
||||||
) : ConstraintLayout(context, attrs) {
|
) : ConstraintLayout(context, attrs) {
|
||||||
|
|
||||||
|
private var layout: GroupAvatarViewBinding =
|
||||||
|
GroupAvatarViewBinding.inflate(LayoutInflater.from(context), this)
|
||||||
|
|
||||||
var recipients: List<Recipient> = ArrayList()
|
var recipients: List<Recipient> = ArrayList()
|
||||||
set(value) {
|
set(value) {
|
||||||
field = value.sortedWith(compareByDescending { contact -> contact.contact?.lookupKey })
|
field = value.sortedWith(compareByDescending { contact -> contact.contact?.lookupKey })
|
||||||
updateView()
|
updateView()
|
||||||
}
|
}
|
||||||
|
|
||||||
init {
|
|
||||||
View.inflate(context, R.layout.group_avatar_view, this)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onFinishInflate() {
|
override fun onFinishInflate() {
|
||||||
super.onFinishInflate()
|
super.onFinishInflate()
|
||||||
|
|
||||||
@@ -54,18 +52,18 @@ class GroupAvatarView @JvmOverloads constructor(
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun updateView() {
|
private fun updateView() {
|
||||||
avatar1Frame.setBackgroundTint(when (recipients.size > 1) {
|
layout.avatar1Frame.setBackgroundTint(when (recipients.size > 1) {
|
||||||
true -> context.resolveThemeColor(android.R.attr.windowBackground)
|
true -> context.resolveThemeColor(android.R.attr.windowBackground)
|
||||||
false -> context.getColorCompat(android.R.color.transparent)
|
false -> context.getColorCompat(android.R.color.transparent)
|
||||||
})
|
})
|
||||||
avatar1Frame.updateLayoutParams<LayoutParams> {
|
layout.avatar1Frame.updateLayoutParams<LayoutParams> {
|
||||||
matchConstraintPercentWidth = if (recipients.size > 1) 0.75f else 1.0f
|
matchConstraintPercentWidth = if (recipients.size > 1) 0.75f else 1.0f
|
||||||
}
|
}
|
||||||
avatar2.isVisible = recipients.size > 1
|
layout.avatar2.isVisible = recipients.size > 1
|
||||||
|
|
||||||
|
|
||||||
recipients.getOrNull(0).run(avatar1::setRecipient)
|
recipients.getOrNull(0).run(layout.avatar1::setRecipient)
|
||||||
recipients.getOrNull(1).run(avatar2::setRecipient)
|
recipients.getOrNull(1).run(layout.avatar2::setRecipient)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,7 +27,6 @@ import android.widget.TextView
|
|||||||
import androidx.viewpager.widget.ViewPager
|
import androidx.viewpager.widget.ViewPager
|
||||||
import com.uber.autodispose.android.ViewScopeProvider
|
import com.uber.autodispose.android.ViewScopeProvider
|
||||||
import com.uber.autodispose.autoDisposable
|
import com.uber.autodispose.autoDisposable
|
||||||
import dev.octoshrimpy.quik.R
|
|
||||||
import dev.octoshrimpy.quik.common.util.Colors
|
import dev.octoshrimpy.quik.common.util.Colors
|
||||||
import dev.octoshrimpy.quik.common.util.extensions.forEach
|
import dev.octoshrimpy.quik.common.util.extensions.forEach
|
||||||
import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor
|
import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ class PreferenceView @JvmOverloads constructor(
|
|||||||
context: Context, attrs: AttributeSet? = null
|
context: Context, attrs: AttributeSet? = null
|
||||||
) : LinearLayoutCompat(context, attrs) {
|
) : LinearLayoutCompat(context, attrs) {
|
||||||
|
|
||||||
private lateinit var layout: PreferenceViewBinding
|
private var layout: PreferenceViewBinding
|
||||||
|
|
||||||
var title: String? = null
|
var title: String? = null
|
||||||
set(value) {
|
set(value) {
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ import android.view.LayoutInflater
|
|||||||
import androidx.annotation.StringRes
|
import androidx.annotation.StringRes
|
||||||
import androidx.appcompat.app.AlertDialog
|
import androidx.appcompat.app.AlertDialog
|
||||||
import androidx.core.view.isVisible
|
import androidx.core.view.isVisible
|
||||||
import dev.octoshrimpy.quik.R
|
|
||||||
import dev.octoshrimpy.quik.common.base.QkAdapter
|
import dev.octoshrimpy.quik.common.base.QkAdapter
|
||||||
import dev.octoshrimpy.quik.databinding.QkDialogBinding
|
import dev.octoshrimpy.quik.databinding.QkDialogBinding
|
||||||
|
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ class RadioPreferenceView @JvmOverloads constructor(
|
|||||||
) : ConstraintLayout(context, attrs) {
|
) : ConstraintLayout(context, attrs) {
|
||||||
|
|
||||||
@Inject lateinit var colors: Colors
|
@Inject lateinit var colors: Colors
|
||||||
private lateinit var layout: RadioPreferenceViewBinding
|
private var layout: RadioPreferenceViewBinding
|
||||||
|
|
||||||
var title: String? = null
|
var title: String? = null
|
||||||
set(value) {
|
set(value) {
|
||||||
|
|||||||
@@ -24,11 +24,11 @@ import android.view.LayoutInflater
|
|||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import dev.octoshrimpy.quik.R
|
import dev.octoshrimpy.quik.R
|
||||||
import dev.octoshrimpy.quik.common.base.QkAdapter
|
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.databinding.ChangelogListItemBinding
|
||||||
import dev.octoshrimpy.quik.manager.ChangelogManager
|
import dev.octoshrimpy.quik.manager.ChangelogManager
|
||||||
import kotlinx.android.synthetic.main.changelog_list_item.*
|
|
||||||
|
|
||||||
class ChangelogAdapter(private val context: Context) : QkAdapter<ChangelogAdapter.ChangelogItem, QkViewHolder>() {
|
class ChangelogAdapter(private val context: Context) : QkAdapter<ChangelogAdapter.ChangelogItem, QkBindingViewHolder<ChangelogListItemBinding>>() {
|
||||||
|
|
||||||
data class ChangelogItem(val type: Int, val label: String)
|
data class ChangelogItem(val type: Int, val label: String)
|
||||||
|
|
||||||
@@ -57,19 +57,18 @@ class ChangelogAdapter(private val context: Context) : QkAdapter<ChangelogAdapte
|
|||||||
data = changes
|
data = changes
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
|
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder<ChangelogListItemBinding> {
|
||||||
val view = LayoutInflater.from(parent.context).inflate(R.layout.changelog_list_item, parent, false)
|
val binding = ChangelogListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
|
||||||
return QkViewHolder(view).apply {
|
return QkBindingViewHolder(binding).apply {
|
||||||
if (viewType == 0) {
|
if (viewType == 0) {
|
||||||
changelogItem.setTypeface(changelogItem.typeface, Typeface.BOLD)
|
binding.changelogItem.setTypeface(binding.changelogItem.typeface, Typeface.BOLD)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
|
override fun onBindViewHolder(holder: QkBindingViewHolder<ChangelogListItemBinding>, position: Int) {
|
||||||
val item = getItem(position)
|
val item = getItem(position)
|
||||||
|
holder.binding.changelogItem.text = item.label
|
||||||
holder.changelogItem.text = item.label
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getItemViewType(position: Int): Int {
|
override fun getItemViewType(position: Int): Int {
|
||||||
|
|||||||
Reference in New Issue
Block a user