diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt index 3b8a3031..7022447f 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/PagerTitleView.kt @@ -31,12 +31,12 @@ import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.util.Colors import dev.octoshrimpy.quik.common.util.extensions.forEach import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor +import dev.octoshrimpy.quik.databinding.TabViewBinding import dev.octoshrimpy.quik.extensions.Optional import dev.octoshrimpy.quik.injection.appComponent import dev.octoshrimpy.quik.repository.ConversationRepository import io.reactivex.subjects.BehaviorSubject import io.reactivex.subjects.Subject -import kotlinx.android.synthetic.main.tab_view.view.* import javax.inject.Inject class PagerTitleView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : LinearLayout(context, attrs) { @@ -66,11 +66,11 @@ class PagerTitleView @JvmOverloads constructor(context: Context, attrs: Attribut removeAllViews() pager?.adapter?.count?.forEach { position -> - val view = LayoutInflater.from(context).inflate(R.layout.tab_view, this, false) + val view = TabViewBinding.inflate(LayoutInflater.from(context), this, false) view.label.text = pager?.adapter?.getPageTitle(position) - view.setOnClickListener { pager?.currentItem = position } + view.root.setOnClickListener { pager?.currentItem = position } - addView(view) + addView(view.root) } childCount.forEach { index -> diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt index f68de924..11293d72 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/PreferenceView.kt @@ -21,6 +21,7 @@ package dev.octoshrimpy.quik.common.widget import android.content.Context import android.util.AttributeSet import android.view.Gravity +import android.view.LayoutInflater import android.view.View import android.widget.TextView import androidx.appcompat.widget.LinearLayoutCompat @@ -28,13 +29,15 @@ import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.common.util.extensions.resolveThemeAttribute import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColorStateList import dev.octoshrimpy.quik.common.util.extensions.setVisible +import dev.octoshrimpy.quik.databinding.PreferenceViewBinding import dev.octoshrimpy.quik.injection.appComponent -import kotlinx.android.synthetic.main.preference_view.view.* class PreferenceView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null ) : LinearLayoutCompat(context, attrs) { + private lateinit var layout: PreferenceViewBinding + var title: String? = null set(value) { field = value @@ -42,7 +45,7 @@ class PreferenceView @JvmOverloads constructor( if (isInEditMode) { findViewById(R.id.titleView).text = value } else { - titleView.text = value + layout.titleView.text = value } } @@ -57,8 +60,8 @@ class PreferenceView @JvmOverloads constructor( setVisible(value?.isNotEmpty() == true) } } else { - summaryView.text = value - summaryView.setVisible(value?.isNotEmpty() == true) + layout.summaryView.text = value + layout.summaryView.setVisible(value?.isNotEmpty() == true) } } @@ -67,12 +70,12 @@ class PreferenceView @JvmOverloads constructor( appComponent.inject(this) } - View.inflate(context, R.layout.preference_view, this) + layout = PreferenceViewBinding.inflate(LayoutInflater.from(context), this) setBackgroundResource(context.resolveThemeAttribute(R.attr.selectableItemBackground)) orientation = HORIZONTAL gravity = Gravity.CENTER_VERTICAL - icon.imageTintList = context.resolveThemeColorStateList(android.R.attr.textColorSecondary) + layout.icon.imageTintList = context.resolveThemeColorStateList(android.R.attr.textColorSecondary) context.obtainStyledAttributes(attrs, R.styleable.PreferenceView).run { title = getString(R.styleable.PreferenceView_title) @@ -80,13 +83,13 @@ class PreferenceView @JvmOverloads constructor( // If there's a custom view used for the preference's widget, inflate it getResourceId(R.styleable.PreferenceView_widget, -1).takeIf { it != -1 }?.let { id -> - View.inflate(context, id, widgetFrame) + View.inflate(context, id, layout.widgetFrame) } // If an icon is being used, set up the icon view getResourceId(R.styleable.PreferenceView_icon, -1).takeIf { it != -1 }?.let { id -> - icon.setVisible(true) - icon.setImageResource(id) + layout.icon.setVisible(true) + layout.icon.setImageResource(id) } recycle() diff --git a/presentation/src/main/java/com/moez/QKSMS/common/widget/RadioPreferenceView.kt b/presentation/src/main/java/com/moez/QKSMS/common/widget/RadioPreferenceView.kt index 9a2c4e70..d40018de 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/widget/RadioPreferenceView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/widget/RadioPreferenceView.kt @@ -21,6 +21,7 @@ package dev.octoshrimpy.quik.common.widget import android.content.Context import android.content.res.ColorStateList import android.util.AttributeSet +import android.view.LayoutInflater import android.view.View import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout @@ -30,8 +31,8 @@ import dev.octoshrimpy.quik.common.util.extensions.forwardTouches import dev.octoshrimpy.quik.common.util.extensions.resolveThemeAttribute import dev.octoshrimpy.quik.common.util.extensions.resolveThemeColor import dev.octoshrimpy.quik.common.util.extensions.setVisible +import dev.octoshrimpy.quik.databinding.RadioPreferenceViewBinding import dev.octoshrimpy.quik.injection.appComponent -import kotlinx.android.synthetic.main.radio_preference_view.view.* import javax.inject.Inject class RadioPreferenceView @JvmOverloads constructor( @@ -39,6 +40,7 @@ class RadioPreferenceView @JvmOverloads constructor( ) : ConstraintLayout(context, attrs) { @Inject lateinit var colors: Colors + private lateinit var layout: RadioPreferenceViewBinding var title: String? = null set(value) { @@ -47,7 +49,7 @@ class RadioPreferenceView @JvmOverloads constructor( if (isInEditMode) { findViewById(R.id.titleView).text = value } else { - titleView.text = value + layout.titleView.text = value } } @@ -62,8 +64,8 @@ class RadioPreferenceView @JvmOverloads constructor( setVisible(value?.isNotEmpty() == true) } } else { - summaryView.text = value - summaryView.setVisible(value?.isNotEmpty() == true) + layout.summaryView.text = value + layout.summaryView.setVisible(value?.isNotEmpty() == true) } } @@ -72,7 +74,7 @@ class RadioPreferenceView @JvmOverloads constructor( appComponent.inject(this) } - View.inflate(context, R.layout.radio_preference_view, this) + layout = RadioPreferenceViewBinding.inflate(LayoutInflater.from(context), this) setBackgroundResource(context.resolveThemeAttribute(R.attr.selectableItemBackground)) val states = arrayOf( @@ -84,8 +86,8 @@ class RadioPreferenceView @JvmOverloads constructor( false -> colors.theme().theme } val textSecondary = context.resolveThemeColor(android.R.attr.textColorTertiary) - radioButton.buttonTintList = ColorStateList(states, intArrayOf(themeColor, textSecondary)) - radioButton.forwardTouches(this) + layout.radioButton.buttonTintList = ColorStateList(states, intArrayOf(themeColor, textSecondary)) + layout.radioButton.forwardTouches(this) context.obtainStyledAttributes(attrs, R.styleable.RadioPreferenceView)?.run { title = getString(R.styleable.RadioPreferenceView_title) @@ -93,7 +95,7 @@ class RadioPreferenceView @JvmOverloads constructor( // If there's a custom view used for the preference's widget, inflate it getResourceId(R.styleable.RadioPreferenceView_widget, -1).takeIf { it != -1 }?.let { id -> - View.inflate(context, id, widgetFrame) + View.inflate(context, id, layout.widgetFrame) } recycle()