mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-16 19:18:52 +01:00
Start migration to view bindings
The codebase currently relies on kotlin synthetics to bind views, which is deprecated. This blocks future upgrades like moving to Kotlin 2.x https://developer.android.com/topic/libraries/view-binding/migration
This commit is contained in:
@@ -89,6 +89,7 @@ android {
|
||||
namespace 'dev.octoshrimpy.quik'
|
||||
buildFeatures {
|
||||
buildConfig true
|
||||
viewBinding true
|
||||
}
|
||||
if (System.getenv("CI") == "true") {
|
||||
signingConfigs.release.storePassword = System.getenv("keystore_password")
|
||||
|
||||
@@ -20,6 +20,7 @@ package dev.octoshrimpy.quik.common.widget
|
||||
|
||||
import android.content.Context
|
||||
import android.util.AttributeSet
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
import android.widget.FrameLayout
|
||||
import dev.octoshrimpy.quik.R
|
||||
@@ -27,10 +28,10 @@ import dev.octoshrimpy.quik.common.Navigator
|
||||
import dev.octoshrimpy.quik.common.util.Colors
|
||||
import dev.octoshrimpy.quik.common.util.extensions.setBackgroundTint
|
||||
import dev.octoshrimpy.quik.common.util.extensions.setTint
|
||||
import dev.octoshrimpy.quik.databinding.AvatarViewBinding
|
||||
import dev.octoshrimpy.quik.injection.appComponent
|
||||
import dev.octoshrimpy.quik.model.Recipient
|
||||
import dev.octoshrimpy.quik.util.GlideApp
|
||||
import kotlinx.android.synthetic.main.avatar_view.view.*
|
||||
import javax.inject.Inject
|
||||
|
||||
class AvatarView @JvmOverloads constructor(
|
||||
@@ -45,6 +46,7 @@ class AvatarView @JvmOverloads constructor(
|
||||
private var photoUri: String? = null
|
||||
private var lastUpdated: Long? = null
|
||||
private var theme: Colors.Theme
|
||||
private var layout: AvatarViewBinding
|
||||
|
||||
init {
|
||||
if (!isInEditMode) {
|
||||
@@ -53,7 +55,7 @@ class AvatarView @JvmOverloads constructor(
|
||||
|
||||
theme = colors.theme()
|
||||
|
||||
View.inflate(context, R.layout.avatar_view, this)
|
||||
layout = AvatarViewBinding.inflate(LayoutInflater.from(context), this)
|
||||
setBackgroundResource(R.drawable.circle)
|
||||
clipToOutline = true
|
||||
}
|
||||
@@ -81,8 +83,8 @@ class AvatarView @JvmOverloads constructor(
|
||||
private fun updateView() {
|
||||
// Apply theme
|
||||
setBackgroundTint(theme.theme)
|
||||
initial.setTextColor(theme.textPrimary)
|
||||
icon.setTint(theme.textPrimary)
|
||||
layout.initial.setTextColor(theme.textPrimary)
|
||||
layout.icon.setTint(theme.textPrimary)
|
||||
|
||||
val initials = fullName
|
||||
?.substringBefore(',')
|
||||
@@ -93,18 +95,18 @@ class AvatarView @JvmOverloads constructor(
|
||||
.map { initial -> initial.toString() }
|
||||
|
||||
if (initials.isNotEmpty()) {
|
||||
initial.text = if (initials.size > 1) initials.first() + initials.last() else initials.first()
|
||||
icon.visibility = GONE
|
||||
layout.initial.text = if (initials.size > 1) initials.first() + initials.last() else initials.first()
|
||||
layout.icon.visibility = GONE
|
||||
} else {
|
||||
initial.text = null
|
||||
icon.visibility = VISIBLE
|
||||
layout.initial.text = null
|
||||
layout.icon.visibility = VISIBLE
|
||||
}
|
||||
|
||||
photo.setImageDrawable(null)
|
||||
layout.photo.setImageDrawable(null)
|
||||
photoUri?.let { photoUri ->
|
||||
GlideApp.with(photo)
|
||||
GlideApp.with(layout.photo)
|
||||
.load(photoUri)
|
||||
.into(photo)
|
||||
.into(layout.photo)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,11 +25,11 @@ import androidx.appcompat.app.AlertDialog
|
||||
import androidx.core.view.isVisible
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.common.base.QkAdapter
|
||||
import kotlinx.android.synthetic.main.qk_dialog.view.*
|
||||
import dev.octoshrimpy.quik.databinding.QkDialogBinding
|
||||
|
||||
class QkDialog(private val context: Activity) : AlertDialog(context) {
|
||||
|
||||
private val view = LayoutInflater.from(context).inflate(R.layout.qk_dialog, null)
|
||||
private val view = QkDialogBinding.inflate(LayoutInflater.from(context))
|
||||
|
||||
@StringRes
|
||||
var titleRes: Int? = null
|
||||
@@ -99,7 +99,7 @@ class QkDialog(private val context: Activity) : AlertDialog(context) {
|
||||
}
|
||||
|
||||
init {
|
||||
setView(view)
|
||||
setView(view.root)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -23,16 +23,16 @@ import android.content.DialogInterface
|
||||
import android.view.LayoutInflater
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import dev.octoshrimpy.quik.R
|
||||
import kotlinx.android.synthetic.main.text_input_dialog.view.*
|
||||
import dev.octoshrimpy.quik.databinding.TextInputDialogBinding
|
||||
|
||||
class TextInputDialog(context: Activity, hint: String, listener: (String) -> Unit) : AlertDialog(context) {
|
||||
|
||||
private val layout = LayoutInflater.from(context).inflate(R.layout.text_input_dialog, null)
|
||||
private val layout = TextInputDialogBinding.inflate(LayoutInflater.from(context))
|
||||
|
||||
init {
|
||||
layout.field.hint = hint
|
||||
|
||||
setView(layout)
|
||||
setView(layout.root)
|
||||
setButton(DialogInterface.BUTTON_NEUTRAL, context.getString(R.string.button_cancel)) { _, _ -> }
|
||||
setButton(DialogInterface.BUTTON_NEGATIVE, context.getString(R.string.button_delete)) { _, _ -> listener("") }
|
||||
setButton(DialogInterface.BUTTON_POSITIVE, context.getString(R.string.button_save)) { _, _ ->
|
||||
|
||||
@@ -22,11 +22,11 @@ import android.view.LayoutInflater
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import dev.octoshrimpy.quik.BuildConfig
|
||||
import dev.octoshrimpy.quik.R
|
||||
import dev.octoshrimpy.quik.databinding.ChangelogDialogBinding
|
||||
import dev.octoshrimpy.quik.feature.main.MainActivity
|
||||
import dev.octoshrimpy.quik.manager.ChangelogManager
|
||||
import io.reactivex.subjects.PublishSubject
|
||||
import io.reactivex.subjects.Subject
|
||||
import kotlinx.android.synthetic.main.changelog_dialog.view.*
|
||||
|
||||
class ChangelogDialog(activity: MainActivity) {
|
||||
|
||||
@@ -36,11 +36,11 @@ class ChangelogDialog(activity: MainActivity) {
|
||||
private val adapter = ChangelogAdapter(activity)
|
||||
|
||||
init {
|
||||
val layout = LayoutInflater.from(activity).inflate(R.layout.changelog_dialog, null)
|
||||
val layout = ChangelogDialogBinding.inflate(LayoutInflater.from(activity))
|
||||
|
||||
dialog = AlertDialog.Builder(activity)
|
||||
.setCancelable(true)
|
||||
.setView(layout)
|
||||
.setView(layout.root)
|
||||
.create()
|
||||
|
||||
layout.version.text = activity.getString(R.string.changelog_version, BuildConfig.VERSION_NAME)
|
||||
|
||||
+3
-3
@@ -23,14 +23,14 @@ import android.content.DialogInterface
|
||||
import android.view.LayoutInflater
|
||||
import androidx.appcompat.app.AlertDialog
|
||||
import dev.octoshrimpy.quik.R
|
||||
import kotlinx.android.synthetic.main.settings_auto_delete_dialog.view.*
|
||||
import dev.octoshrimpy.quik.databinding.SettingsAutoDeleteDialogBinding
|
||||
|
||||
class AutoDeleteDialog(context: Activity, listener: (Int) -> Unit) : AlertDialog(context) {
|
||||
|
||||
private val layout = LayoutInflater.from(context).inflate(R.layout.settings_auto_delete_dialog, null)
|
||||
private val layout = SettingsAutoDeleteDialogBinding.inflate(LayoutInflater.from(context))
|
||||
|
||||
init {
|
||||
setView(layout)
|
||||
setView(layout.root)
|
||||
setTitle(R.string.settings_auto_delete)
|
||||
setMessage(context.getString(R.string.settings_auto_delete_dialog_message))
|
||||
setButton(DialogInterface.BUTTON_NEUTRAL, context.getString(R.string.button_cancel)) { _, _ -> }
|
||||
|
||||
Reference in New Issue
Block a user