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:
@@ -23,14 +23,15 @@ import android.graphics.Color
|
||||
import android.graphics.drawable.GradientDrawable
|
||||
import android.util.AttributeSet
|
||||
import android.view.MotionEvent
|
||||
import android.view.View
|
||||
import androidx.constraintlayout.widget.ConstraintLayout
|
||||
import com.moez.QKSMS.R
|
||||
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.common.util.extensions.within
|
||||
import com.moez.QKSMS.databinding.HsvPickerViewBinding
|
||||
import io.reactivex.subjects.BehaviorSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.hsv_picker_view.view.*
|
||||
|
||||
class HSVPickerView @JvmOverloads constructor(
|
||||
context: Context, attrs: AttributeSet? = null
|
||||
@@ -38,8 +39,6 @@ class HSVPickerView @JvmOverloads constructor(
|
||||
|
||||
val selectedColor: Subject<Int> = BehaviorSubject.create()
|
||||
|
||||
private val binding = viewBinding(HsvPickerViewBinding::inflate)
|
||||
|
||||
private val hues = arrayOf(0xFFFF0000, 0xFFFFFF00, 0xFF00FF00, 0xFF00FFFF, 0xFF0000FF, 0xFFFF00FF, 0xFFFF0000)
|
||||
.map { it.toInt() }.toIntArray()
|
||||
|
||||
@@ -53,10 +52,12 @@ class HSVPickerView @JvmOverloads constructor(
|
||||
}
|
||||
|
||||
init {
|
||||
View.inflate(context, R.layout.hsv_picker_view, this)
|
||||
|
||||
var swatchX = 0f
|
||||
var swatchY = 0f
|
||||
|
||||
binding.saturation.setOnTouchListener { _, event ->
|
||||
saturation.setOnTouchListener { _, event ->
|
||||
setupBounds()
|
||||
when (event.action) {
|
||||
MotionEvent.ACTION_DOWN -> {
|
||||
@@ -67,8 +68,8 @@ class HSVPickerView @JvmOverloads constructor(
|
||||
|
||||
MotionEvent.ACTION_MOVE -> {
|
||||
// Calculate the new x/y position
|
||||
binding.swatch.x = (event.rawX + swatchX + min).within(min, max)
|
||||
binding.swatch.y = (event.rawY + swatchY + min).within(min, max)
|
||||
swatch.x = (event.rawX + swatchX + min).within(min, max)
|
||||
swatch.y = (event.rawY + swatchY + min).within(min, max)
|
||||
|
||||
updateSelectedColor()
|
||||
}
|
||||
@@ -84,7 +85,7 @@ class HSVPickerView @JvmOverloads constructor(
|
||||
|
||||
var hueThumbX = 0f
|
||||
|
||||
binding.hueGroup.setOnTouchListener { _, event ->
|
||||
hueGroup.setOnTouchListener { _, event ->
|
||||
setupBounds()
|
||||
when (event.action) {
|
||||
MotionEvent.ACTION_DOWN -> {
|
||||
@@ -95,8 +96,8 @@ class HSVPickerView @JvmOverloads constructor(
|
||||
MotionEvent.ACTION_MOVE -> {
|
||||
val x = (event.rawX + hueThumbX + min).within(min, max)
|
||||
|
||||
binding.hueThumb.x = x
|
||||
hue = (binding.hueThumb.x - min) / (max - min) * 360
|
||||
hueThumb.x = x
|
||||
hue = (hueThumb.x - min) / (max - min) * 360
|
||||
|
||||
updateSelectedColor()
|
||||
}
|
||||
@@ -110,14 +111,14 @@ class HSVPickerView @JvmOverloads constructor(
|
||||
true
|
||||
}
|
||||
|
||||
binding.hueTrack.clipToOutline = true
|
||||
binding.hueTrack.setImageDrawable(GradientDrawable(GradientDrawable.Orientation.LEFT_RIGHT, hues))
|
||||
hueTrack.clipToOutline = true
|
||||
hueTrack.setImageDrawable(GradientDrawable(GradientDrawable.Orientation.LEFT_RIGHT, hues))
|
||||
}
|
||||
|
||||
private fun setupBounds() {
|
||||
if (min == 0f || max == 0f) {
|
||||
min = binding.saturation.x - binding.swatch.width / 2
|
||||
max = min + binding.saturation.width
|
||||
min = saturation.x - swatch.width / 2
|
||||
max = min + saturation.width
|
||||
}
|
||||
}
|
||||
|
||||
@@ -125,10 +126,10 @@ class HSVPickerView @JvmOverloads constructor(
|
||||
setupBounds()
|
||||
|
||||
val range = max - min
|
||||
val hsv = floatArrayOf(hue, (binding.swatch.x - min) / range, 1 - (binding.swatch.y - min) / range)
|
||||
val hsv = floatArrayOf(hue, (swatch.x - min) / range, 1 - (swatch.y - min) / range)
|
||||
val color = Color.HSVToColor(hsv)
|
||||
|
||||
binding.swatch.setTint(color)
|
||||
swatch.setTint(color)
|
||||
selectedColor.onNext(color)
|
||||
}
|
||||
|
||||
@@ -144,9 +145,9 @@ class HSVPickerView @JvmOverloads constructor(
|
||||
setupBounds()
|
||||
val range = max - min
|
||||
|
||||
binding.hueThumb.x = range * hsv[0] / 360 + min
|
||||
binding.swatch.x = range * hsv[1] + min
|
||||
binding.swatch.y = range * (1 - hsv[2]) + min
|
||||
hueThumb.x = range * hsv[0] / 360 + min
|
||||
swatch.x = range * hsv[1] + min
|
||||
swatch.y = range * (1 - hsv[2]) + min
|
||||
|
||||
updateSelectedColor()
|
||||
}
|
||||
@@ -155,7 +156,7 @@ class HSVPickerView @JvmOverloads constructor(
|
||||
private fun updateHue() {
|
||||
val hsv = floatArrayOf(hue, 1f, 1f)
|
||||
val tint = Color.HSVToColor(hsv)
|
||||
binding.saturation.setBackgroundTint(tint)
|
||||
saturation.setBackgroundTint(tint)
|
||||
}
|
||||
|
||||
}
|
||||
@@ -25,6 +25,7 @@ import android.view.ViewGroup
|
||||
import com.google.android.flexbox.FlexDirection
|
||||
import com.google.android.flexbox.FlexWrap
|
||||
import com.google.android.flexbox.FlexboxLayout
|
||||
import com.moez.QKSMS.R
|
||||
import com.moez.QKSMS.common.base.QkAdapter
|
||||
import com.moez.QKSMS.common.base.QkViewHolder
|
||||
import com.moez.QKSMS.common.util.Colors
|
||||
@@ -32,16 +33,17 @@ import com.moez.QKSMS.common.util.extensions.dpToPx
|
||||
import com.moez.QKSMS.common.util.extensions.setBackgroundTint
|
||||
import com.moez.QKSMS.common.util.extensions.setTint
|
||||
import com.moez.QKSMS.common.util.extensions.setVisible
|
||||
import com.moez.QKSMS.databinding.ThemeListItemBinding
|
||||
import com.moez.QKSMS.databinding.ThemePaletteListItemBinding
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.theme_list_item.view.*
|
||||
import kotlinx.android.synthetic.main.theme_palette_list_item.*
|
||||
import kotlinx.android.synthetic.main.theme_palette_list_item.view.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class ThemeAdapter @Inject constructor(
|
||||
private val context: Context,
|
||||
private val colors: Colors
|
||||
) : QkAdapter<List<Int>, ThemePaletteListItemBinding>() {
|
||||
) : QkAdapter<List<Int>>() {
|
||||
|
||||
val colorSelected: Subject<Int> = PublishSubject.create()
|
||||
|
||||
@@ -59,14 +61,15 @@ class ThemeAdapter @Inject constructor(
|
||||
|
||||
private var iconTint = 0
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder<ThemePaletteListItemBinding> {
|
||||
return QkViewHolder(parent, ThemePaletteListItemBinding::inflate).apply {
|
||||
binding.palette.flexWrap = FlexWrap.WRAP
|
||||
binding.palette.flexDirection = FlexDirection.ROW
|
||||
}
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
|
||||
val view = LayoutInflater.from(parent.context).inflate(R.layout.theme_palette_list_item, parent, false)
|
||||
view.palette.flexWrap = FlexWrap.WRAP
|
||||
view.palette.flexDirection = FlexDirection.ROW
|
||||
|
||||
return QkViewHolder(view)
|
||||
}
|
||||
|
||||
override fun onBindViewHolder(holder: QkViewHolder<ThemePaletteListItemBinding>, position: Int) {
|
||||
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
|
||||
val palette = getItem(position)
|
||||
|
||||
val screenWidth = Resources.getSystem().displayMetrics.widthPixels
|
||||
@@ -78,15 +81,15 @@ class ThemeAdapter @Inject constructor(
|
||||
}
|
||||
val swatchPadding = (screenWidth - size * 5) / 12
|
||||
|
||||
holder.binding.palette.removeAllViews()
|
||||
holder.binding.palette.setPadding(swatchPadding, swatchPadding, swatchPadding, swatchPadding)
|
||||
holder.palette.removeAllViews()
|
||||
holder.palette.setPadding(swatchPadding, swatchPadding, swatchPadding, swatchPadding)
|
||||
|
||||
(palette.subList(0, 5) + palette.subList(5, 10).reversed())
|
||||
.mapIndexed { index, color ->
|
||||
ThemeListItemBinding.inflate(LayoutInflater.from(context), holder.binding.palette, false).apply {
|
||||
LayoutInflater.from(context).inflate(R.layout.theme_list_item, holder.palette, false).apply {
|
||||
|
||||
// Send clicks to the selected subject
|
||||
root.setOnClickListener { colorSelected.onNext(color) }
|
||||
setOnClickListener { colorSelected.onNext(color) }
|
||||
|
||||
// Apply the color to the view
|
||||
theme.setBackgroundTint(color)
|
||||
@@ -96,15 +99,15 @@ class ThemeAdapter @Inject constructor(
|
||||
check.setTint(iconTint)
|
||||
|
||||
// Update the size so that the spacing is perfectly even
|
||||
root.layoutParams = (root.layoutParams as FlexboxLayout.LayoutParams).apply {
|
||||
layoutParams = (layoutParams as FlexboxLayout.LayoutParams).apply {
|
||||
height = size
|
||||
width = size
|
||||
isWrapBefore = index % 5 == 0
|
||||
setMargins(swatchPadding, swatchPadding, swatchPadding, swatchPadding)
|
||||
}
|
||||
}.root
|
||||
}
|
||||
}
|
||||
.forEach { theme -> holder.binding.palette.addView(theme) }
|
||||
.forEach { theme -> holder.palette.addView(theme) }
|
||||
}
|
||||
|
||||
}
|
||||
+21
-21
@@ -29,19 +29,18 @@ import com.moez.QKSMS.common.util.Colors
|
||||
import com.moez.QKSMS.common.util.extensions.dpToPx
|
||||
import com.moez.QKSMS.common.util.extensions.setBackgroundTint
|
||||
import com.moez.QKSMS.common.util.extensions.setVisible
|
||||
import com.moez.QKSMS.databinding.ThemePickerControllerBinding
|
||||
import com.moez.QKSMS.feature.themepicker.injection.ThemePickerModule
|
||||
import com.moez.QKSMS.injection.appComponent
|
||||
import io.reactivex.Observable
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.theme_picker_controller.*
|
||||
import kotlinx.android.synthetic.main.theme_picker_hsv.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class ThemePickerController(
|
||||
val recipientId: Long = 0L
|
||||
) : QkController<ThemePickerView, ThemePickerState, ThemePickerPresenter, ThemePickerControllerBinding>(
|
||||
ThemePickerControllerBinding::inflate
|
||||
), ThemePickerView {
|
||||
) : QkController<ThemePickerView, ThemePickerState, ThemePickerPresenter>(), ThemePickerView {
|
||||
|
||||
@Inject override lateinit var presenter: ThemePickerPresenter
|
||||
|
||||
@@ -57,17 +56,19 @@ class ThemePickerController(
|
||||
.themePickerModule(ThemePickerModule(this))
|
||||
.build()
|
||||
.inject(this)
|
||||
|
||||
layoutRes = R.layout.theme_picker_controller
|
||||
}
|
||||
|
||||
override fun onViewCreated() {
|
||||
binding.pager.offscreenPageLimit = 1
|
||||
binding.pager.adapter = themePagerAdapter
|
||||
binding.tabs.pager = binding.pager
|
||||
pager.offscreenPageLimit = 1
|
||||
pager.adapter = themePagerAdapter
|
||||
tabs.pager = pager
|
||||
|
||||
themeAdapter.data = colors.materialColors
|
||||
|
||||
binding.materialColors.layoutManager = LinearLayoutManager(activity)
|
||||
binding.materialColors.adapter = themeAdapter
|
||||
materialColors.layoutManager = LinearLayoutManager(activity)
|
||||
materialColors.adapter = themeAdapter
|
||||
}
|
||||
|
||||
override fun onAttach(view: View) {
|
||||
@@ -85,13 +86,12 @@ class ThemePickerController(
|
||||
super.onDetach(view)
|
||||
|
||||
themedActivity?.supportActionBar?.let { toolbar ->
|
||||
ObjectAnimator.ofFloat(toolbar, "elevation", toolbar.elevation, 8.dpToPx(toolbar.themedContext).toFloat())
|
||||
.start()
|
||||
ObjectAnimator.ofFloat(toolbar, "elevation", toolbar.elevation, 8.dpToPx(toolbar.themedContext).toFloat()).start()
|
||||
}
|
||||
}
|
||||
|
||||
override fun showQksmsPlusSnackbar() {
|
||||
Snackbar.make(binding.contentView, R.string.toast_qksms_plus, Snackbar.LENGTH_LONG).run {
|
||||
Snackbar.make(contentView, R.string.toast_qksms_plus, Snackbar.LENGTH_LONG).run {
|
||||
setAction(R.string.button_more) { viewQksmsPlusSubject.onNext(Unit) }
|
||||
setActionTextColor(colors.theme().theme)
|
||||
show()
|
||||
@@ -100,26 +100,26 @@ class ThemePickerController(
|
||||
|
||||
override fun themeSelected(): Observable<Int> = themeAdapter.colorSelected
|
||||
|
||||
override fun hsvThemeSelected(): Observable<Int> = binding.hsvPicker.picker.selectedColor
|
||||
override fun hsvThemeSelected(): Observable<Int> = picker.selectedColor
|
||||
|
||||
override fun clearHsvThemeClicks(): Observable<*> = binding.hsvPicker.clear.clicks()
|
||||
override fun clearHsvThemeClicks(): Observable<*> = clear.clicks()
|
||||
|
||||
override fun applyHsvThemeClicks(): Observable<*> = binding.hsvPicker.apply.clicks()
|
||||
override fun applyHsvThemeClicks(): Observable<*> = apply.clicks()
|
||||
|
||||
override fun viewQksmsPlusClicks(): Observable<*> = viewQksmsPlusSubject
|
||||
|
||||
override fun render(state: ThemePickerState) {
|
||||
binding.tabs.setRecipientId(state.recipientId)
|
||||
tabs.setRecipientId(state.recipientId)
|
||||
|
||||
binding.hsvPicker.hex.setText(Integer.toHexString(state.newColor).takeLast(6))
|
||||
hex.setText(Integer.toHexString(state.newColor).takeLast(6))
|
||||
|
||||
binding.hsvPicker.applyGroup.setVisible(state.applyThemeVisible)
|
||||
binding.hsvPicker.apply.setBackgroundTint(state.newColor)
|
||||
binding.hsvPicker.apply.setTextColor(state.newTextColor)
|
||||
applyGroup.setVisible(state.applyThemeVisible)
|
||||
apply.setBackgroundTint(state.newColor)
|
||||
apply.setTextColor(state.newTextColor)
|
||||
}
|
||||
|
||||
override fun setCurrentTheme(color: Int) {
|
||||
binding.hsvPicker.picker.setColor(color)
|
||||
picker.setColor(color)
|
||||
themeAdapter.selectedColor = color
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user