more migrations

This commit is contained in:
Ben Iofel
2025-09-05 01:44:06 -04:00
parent 90723d80a7
commit 3cdaf26317
11 changed files with 123 additions and 113 deletions
@@ -22,6 +22,7 @@ import android.annotation.SuppressLint
import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
import android.view.View
import android.view.WindowManager
import androidx.appcompat.app.AppCompatActivity
import dev.octoshrimpy.quik.util.Preferences
@@ -63,6 +64,12 @@ abstract class QkActivity : AppCompatActivity() {
title = title // The title may have been set before layout inflation
}
override fun setContentView(view: View?) {
super.setContentView(view)
setSupportActionBar(toolbar)
title = title // The title may have been set before layout inflation
}
override fun setTitle(titleId: Int) {
title = getString(titleId)
}
@@ -38,6 +38,8 @@ class PreferenceView @JvmOverloads constructor(
private var layout: PreferenceViewBinding
val titleTextView: TextView get() = layout.titleView
var title: String? = null
set(value) {
field = value
@@ -96,4 +98,4 @@ class PreferenceView @JvmOverloads constructor(
}
}
}
}
@@ -25,19 +25,21 @@ import com.bluelinelabs.conductor.RouterTransaction
import dagger.android.AndroidInjection
import dev.octoshrimpy.quik.R
import dev.octoshrimpy.quik.common.base.QkThemedActivity
import kotlinx.android.synthetic.main.container_activity.*
import dev.octoshrimpy.quik.databinding.ContainerActivityBinding
class BackupActivity : QkThemedActivity() {
private lateinit var router: Router
private lateinit var binding: ContainerActivityBinding
override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this)
super.onCreate(savedInstanceState)
setContentView(R.layout.container_activity)
binding = ContainerActivityBinding.inflate(layoutInflater)
setContentView(binding.root)
router = Conductor.attachRouter(this, container, savedInstanceState)
router = Conductor.attachRouter(this, binding.container, savedInstanceState)
if (!router.hasRootController()) {
router.setRoot(RouterTransaction.with(BackupController()))
}
@@ -49,4 +51,4 @@ class BackupActivity : QkThemedActivity() {
}
}
}
}
@@ -25,18 +25,20 @@ import com.bluelinelabs.conductor.RouterTransaction
import dagger.android.AndroidInjection
import dev.octoshrimpy.quik.R
import dev.octoshrimpy.quik.common.base.QkThemedActivity
import kotlinx.android.synthetic.main.container_activity.*
import dev.octoshrimpy.quik.databinding.ContainerActivityBinding
class BlockingActivity : QkThemedActivity() {
private lateinit var router: Router
private lateinit var binding: ContainerActivityBinding
override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this)
super.onCreate(savedInstanceState)
setContentView(R.layout.container_activity)
binding = ContainerActivityBinding.inflate(layoutInflater)
setContentView(binding.root)
router = Conductor.attachRouter(this, container, savedInstanceState)
router = Conductor.attachRouter(this, binding.container, savedInstanceState)
if (!router.hasRootController()) {
router.setRoot(RouterTransaction.with(BlockingController()))
}
@@ -48,4 +50,4 @@ class BlockingActivity : QkThemedActivity() {
}
}
}
}
@@ -23,33 +23,32 @@ import android.view.View
import android.view.ViewGroup
import dev.octoshrimpy.quik.R
import dev.octoshrimpy.quik.common.base.QkRealmAdapter
import dev.octoshrimpy.quik.common.base.QkViewHolder
import dev.octoshrimpy.quik.common.base.QkBindingViewHolder
import dev.octoshrimpy.quik.model.MessageContentFilter
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.message_content_filter_list_item.*
import kotlinx.android.synthetic.main.message_content_filter_list_item.view.*
import dev.octoshrimpy.quik.databinding.MessageContentFilterListItemBinding
class MessageContentFiltersAdapter : QkRealmAdapter<MessageContentFilter, QkViewHolder>() {
class MessageContentFiltersAdapter : QkRealmAdapter<MessageContentFilter, QkBindingViewHolder<MessageContentFilterListItemBinding>>() {
val removeMessageContentFilter: Subject<Long> = PublishSubject.create()
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
val view = LayoutInflater.from(parent.context).inflate(R.layout.message_content_filter_list_item, parent, false)
return QkViewHolder(view).apply {
containerView.removeFilter.setOnClickListener {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder<MessageContentFilterListItemBinding> {
val binding = MessageContentFilterListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
return QkBindingViewHolder(binding).apply {
binding.removeFilter.setOnClickListener {
val filter = getItem(adapterPosition) ?: return@setOnClickListener
removeMessageContentFilter.onNext(filter.id)
}
}
}
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
override fun onBindViewHolder(holder: QkBindingViewHolder<MessageContentFilterListItemBinding>, position: Int) {
val item = getItem(position)!!
holder.caseIcon.visibility = if (item.caseSensitive) View.VISIBLE else View.GONE
holder.regexIcon.visibility = if (item.isRegex) View.VISIBLE else View.GONE
holder.contactsIcon.visibility = if (item.includeContacts) View.VISIBLE else View.GONE
holder.filter.text = item.value
holder.binding.caseIcon.visibility = if (item.caseSensitive) View.VISIBLE else View.GONE
holder.binding.regexIcon.visibility = if (item.isRegex) View.VISIBLE else View.GONE
holder.binding.contactsIcon.visibility = if (item.includeContacts) View.VISIBLE else View.GONE
holder.binding.filter.text = item.value
}
}
@@ -22,6 +22,7 @@ package dev.octoshrimpy.quik.feature.blocking.manager
import android.content.Context
import android.graphics.drawable.Drawable
import android.util.AttributeSet
import android.view.LayoutInflater
import android.view.View
import android.widget.ImageView
import android.widget.TextView
@@ -29,12 +30,15 @@ import androidx.constraintlayout.widget.ConstraintLayout
import dev.octoshrimpy.quik.R
import dev.octoshrimpy.quik.common.util.extensions.resolveThemeAttribute
import dev.octoshrimpy.quik.common.util.extensions.setVisible
import kotlinx.android.synthetic.main.blocking_manager_preference_view.view.*
import dev.octoshrimpy.quik.databinding.BlockingManagerPreferenceViewBinding
class BlockingManagerPreferenceView @JvmOverloads constructor(
context: Context, attrs: AttributeSet? = null
) : ConstraintLayout(context, attrs) {
private val binding: BlockingManagerPreferenceViewBinding =
BlockingManagerPreferenceViewBinding.inflate(LayoutInflater.from(context), this)
var icon: Drawable? = null
set(value) {
field = value
@@ -42,7 +46,7 @@ class BlockingManagerPreferenceView @JvmOverloads constructor(
if (isInEditMode) {
findViewById<ImageView>(R.id.iconView).setImageDrawable(value)
} else {
iconView.setImageDrawable(value)
binding.iconView.setImageDrawable(value)
}
}
@@ -53,7 +57,7 @@ class BlockingManagerPreferenceView @JvmOverloads constructor(
if (isInEditMode) {
findViewById<TextView>(R.id.titleView).text = value
} else {
titleView.text = value
binding.titleView.text = value
}
}
@@ -67,13 +71,12 @@ class BlockingManagerPreferenceView @JvmOverloads constructor(
setVisible(value?.isNotEmpty() == true)
}
} else {
summaryView.text = value
summaryView.setVisible(value?.isNotEmpty() == true)
binding.summaryView.text = value
binding.summaryView.setVisible(value?.isNotEmpty() == true)
}
}
init {
View.inflate(context, R.layout.blocking_manager_preference_view, this)
setBackgroundResource(context.resolveThemeAttribute(R.attr.selectableItemBackground))
context.obtainStyledAttributes(attrs, R.styleable.BlockingManagerPreferenceView).run {
@@ -83,7 +86,7 @@ class BlockingManagerPreferenceView @JvmOverloads constructor(
// If there's a custom view used for the preference's widget, inflate it
getResourceId(R.styleable.BlockingManagerPreferenceView_widget, -1).takeIf { it != -1 }?.let { id ->
View.inflate(context, id, widgetFrame)
View.inflate(context, id, binding.widgetFrame)
}
recycle()
@@ -22,31 +22,30 @@ import android.view.LayoutInflater
import android.view.ViewGroup
import dev.octoshrimpy.quik.R
import dev.octoshrimpy.quik.common.base.QkRealmAdapter
import dev.octoshrimpy.quik.common.base.QkViewHolder
import dev.octoshrimpy.quik.common.base.QkBindingViewHolder
import dev.octoshrimpy.quik.model.BlockedNumber
import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.blocked_number_list_item.*
import kotlinx.android.synthetic.main.blocked_number_list_item.view.*
import dev.octoshrimpy.quik.databinding.BlockedNumberListItemBinding
class BlockedNumbersAdapter : QkRealmAdapter<BlockedNumber, QkViewHolder>() {
class BlockedNumbersAdapter : QkRealmAdapter<BlockedNumber, QkBindingViewHolder<BlockedNumberListItemBinding>>() {
val unblockAddress: Subject<Long> = PublishSubject.create()
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
val view = LayoutInflater.from(parent.context).inflate(R.layout.blocked_number_list_item, parent, false)
return QkViewHolder(view).apply {
containerView.unblock.setOnClickListener {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder<BlockedNumberListItemBinding> {
val binding = BlockedNumberListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
return QkBindingViewHolder(binding).apply {
binding.unblock.setOnClickListener {
val number = getItem(adapterPosition) ?: return@setOnClickListener
unblockAddress.onNext(number.id)
}
}
}
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
override fun onBindViewHolder(holder: QkBindingViewHolder<BlockedNumberListItemBinding>, position: Int) {
val item = getItem(position)!!
holder.number.text = item.address
holder.binding.number.text = item.address
}
}
@@ -27,14 +27,13 @@ import android.view.ViewGroup
import dev.octoshrimpy.quik.R
import dev.octoshrimpy.quik.common.Navigator
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.DateFormatter
import dev.octoshrimpy.quik.common.util.extensions.setVisible
import dev.octoshrimpy.quik.extensions.removeAccents
import dev.octoshrimpy.quik.model.SearchResult
import kotlinx.android.synthetic.main.search_list_item.*
import kotlinx.android.synthetic.main.search_list_item.view.*
import dev.octoshrimpy.quik.databinding.SearchListItemBinding
import javax.inject.Inject
class SearchAdapter @Inject constructor(
@@ -42,26 +41,25 @@ class SearchAdapter @Inject constructor(
private val context: Context,
private val dateFormatter: DateFormatter,
private val navigator: Navigator
) : QkAdapter<SearchResult, QkViewHolder>() {
) : QkAdapter<SearchResult, QkBindingViewHolder<SearchListItemBinding>>() {
private val highlightColor: Int by lazy { colors.theme().highlight }
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
val layoutInflater = LayoutInflater.from(parent.context)
val view = layoutInflater.inflate(R.layout.search_list_item, parent, false)
return QkViewHolder(view).apply {
view.setOnClickListener {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder<SearchListItemBinding> {
val binding = SearchListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
return QkBindingViewHolder(binding).apply {
itemView.setOnClickListener {
val result = getItem(adapterPosition)
navigator.showConversation(result.conversation.id, result.query.takeIf { result.messages > 0 })
}
}
}
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
override fun onBindViewHolder(holder: QkBindingViewHolder<SearchListItemBinding>, position: Int) {
val previous = data.getOrNull(position - 1)
val result = getItem(position)
holder.resultsHeader.setVisible(result.messages > 0 && previous?.messages == 0)
holder.binding.resultsHeader.setVisible(result.messages > 0 && previous?.messages == 0)
val query = result.query
val title = SpannableString(result.conversation.getTitle())
@@ -71,23 +69,23 @@ class SearchAdapter @Inject constructor(
title.setSpan(BackgroundColorSpan(highlightColor), index, index + query.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
index = title.indexOf(query, index + query.length, true)
}
holder.title.text = title
holder.binding.title.text = title
holder.avatars.recipients = result.conversation.recipients
holder.binding.avatars.recipients = result.conversation.recipients
when (result.messages == 0) {
true -> {
holder.date.setVisible(true)
holder.date.text = dateFormatter.getConversationTimestamp(result.conversation.date)
holder.snippet.text = when (result.conversation.me) {
holder.binding.date.setVisible(true)
holder.binding.date.text = dateFormatter.getConversationTimestamp(result.conversation.date)
holder.binding.snippet.text = when (result.conversation.me) {
true -> context.getString(R.string.main_sender_you, result.conversation.snippet)
false -> result.conversation.snippet
}
}
false -> {
holder.date.setVisible(false)
holder.snippet.text = context.getString(R.string.main_message_results, result.messages)
holder.binding.date.setVisible(false)
holder.binding.snippet.text = context.getString(R.string.main_message_results, result.messages)
}
}
}
@@ -101,4 +99,4 @@ class SearchAdapter @Inject constructor(
old.conversation.id == new.conversation.id // Conversation id is the same
&& old.messages == new.messages // Result count is the same
}
}
}
@@ -36,9 +36,7 @@ import dev.octoshrimpy.quik.common.util.extensions.setVisible
import dev.octoshrimpy.quik.common.widget.PreferenceView
import dev.octoshrimpy.quik.feature.plus.experiment.UpgradeButtonExperiment
import dev.octoshrimpy.quik.manager.BillingManager
import kotlinx.android.synthetic.main.collapsing_toolbar.*
import kotlinx.android.synthetic.main.preference_view.view.*
import kotlinx.android.synthetic.main.qksms_plus_activity.*
import dev.octoshrimpy.quik.databinding.QksmsPlusActivityBinding
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
@@ -52,66 +50,68 @@ class PlusActivity : QkThemedActivity(), PlusView {
@Inject lateinit var viewModelFactory: ViewModelProvider.Factory
private val viewModel by lazy { ViewModelProviders.of(this, viewModelFactory)[PlusViewModel::class.java] }
private lateinit var binding: QksmsPlusActivityBinding
override val upgradeIntent by lazy { upgrade.clicks() }
override val upgradeDonateIntent by lazy { upgradeDonate.clicks() }
override val donateIntent by lazy { donate.clicks() }
override val themeClicks by lazy { themes.clicks() }
override val scheduleClicks by lazy { schedule.clicks() }
override val backupClicks by lazy { backup.clicks() }
override val delayedClicks by lazy { delayed.clicks() }
override val nightClicks by lazy { night.clicks() }
override val upgradeIntent get() = binding.upgrade.clicks()
override val upgradeDonateIntent get() = binding.upgradeDonate.clicks()
override val donateIntent get() = binding.donate.clicks()
override val themeClicks get() = binding.themes.clicks()
override val scheduleClicks get() = binding.schedule.clicks()
override val backupClicks get() = binding.backup.clicks()
override val delayedClicks get() = binding.delayed.clicks()
override val nightClicks get() = binding.night.clicks()
override fun onCreate(savedInstanceState: Bundle?) {
AndroidInjection.inject(this)
super.onCreate(savedInstanceState)
setContentView(R.layout.qksms_plus_activity)
binding = QksmsPlusActivityBinding.inflate(layoutInflater)
setContentView(binding.root)
setTitle(R.string.title_qksms_plus)
showBackButton(true)
viewModel.bindView(this)
free.setVisible(false)
binding.free.setVisible(false)
if (!prefs.systemFont.get()) {
fontProvider.getLato { lato ->
val typeface = Typeface.create(lato, Typeface.BOLD)
collapsingToolbar.setCollapsedTitleTypeface(typeface)
collapsingToolbar.setExpandedTitleTypeface(typeface)
binding.toolbarLayout.collapsingToolbar.setCollapsedTitleTypeface(typeface)
binding.toolbarLayout.collapsingToolbar.setExpandedTitleTypeface(typeface)
}
}
// Make the list titles bold
linearLayout.children
.mapNotNull { it as? PreferenceView }
.map { it.titleView }
.forEach { it.setTypeface(it.typeface, Typeface.BOLD) }
binding.linearLayout.children
.mapNotNull { it as? PreferenceView }
.map { it.titleTextView }
.forEach { it.setTypeface(it.typeface, Typeface.BOLD) }
val textPrimary = resolveThemeColor(android.R.attr.textColorPrimary)
collapsingToolbar.setCollapsedTitleTextColor(textPrimary)
collapsingToolbar.setExpandedTitleColor(textPrimary)
binding.toolbarLayout.collapsingToolbar.setCollapsedTitleTextColor(textPrimary)
binding.toolbarLayout.collapsingToolbar.setExpandedTitleColor(textPrimary)
val theme = colors.theme().theme
donate.setBackgroundTint(theme)
upgrade.setBackgroundTint(theme)
thanksIcon.setTint(theme)
binding.donate.setBackgroundTint(theme)
binding.upgrade.setBackgroundTint(theme)
binding.thanksIcon.setTint(theme)
}
override fun render(state: PlusState) {
description.text = getString(R.string.qksms_plus_description_summary, state.upgradePrice)
upgrade.text = getString(upgradeButtonExperiment.variant, state.upgradePrice, state.currency)
upgradeDonate.text = getString(R.string.qksms_plus_upgrade_donate, state.upgradeDonatePrice, state.currency)
binding.description.text = getString(R.string.qksms_plus_description_summary, state.upgradePrice)
binding.upgrade.text = getString(upgradeButtonExperiment.variant, state.upgradePrice, state.currency)
binding.upgradeDonate.text = getString(R.string.qksms_plus_upgrade_donate, state.upgradeDonatePrice, state.currency)
val fdroid = true
free.setVisible(fdroid)
toUpgrade.setVisible(!fdroid && !state.upgraded)
upgraded.setVisible(!fdroid && state.upgraded)
binding.free.setVisible(fdroid)
binding.toUpgrade.setVisible(!fdroid && !state.upgraded)
binding.upgraded.setVisible(!fdroid && state.upgraded)
themes.isEnabled = state.upgraded
schedule.isEnabled = state.upgraded
backup.isEnabled = state.upgraded
delayed.isEnabled = state.upgraded
night.isEnabled = state.upgraded
binding.themes.isEnabled = state.upgraded
binding.schedule.isEnabled = state.upgraded
binding.backup.isEnabled = state.upgraded
binding.delayed.isEnabled = state.upgraded
binding.night.isEnabled = state.upgraded
}
override fun initiatePurchaseFlow(billingManager: BillingManager, sku: String) {
@@ -125,4 +125,4 @@ class PlusActivity : QkThemedActivity(), PlusView {
}
}
}
}
@@ -25,44 +25,40 @@ import android.view.View
import android.view.ViewGroup
import dev.octoshrimpy.quik.R
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.extensions.getName
import dev.octoshrimpy.quik.feature.extensions.LoadBestIconIntoImageView
import dev.octoshrimpy.quik.feature.extensions.loadBestIconIntoImageView
import kotlinx.android.synthetic.main.scheduled_message_image_list_item.fileName
import kotlinx.android.synthetic.main.scheduled_message_image_list_item.thumbnail
import dev.octoshrimpy.quik.databinding.ScheduledMessageImageListItemBinding
import javax.inject.Inject
class ScheduledMessageAttachmentAdapter @Inject constructor(
private val context: Context
) : QkAdapter<Uri, QkViewHolder>() {
) : QkAdapter<Uri, QkBindingViewHolder<ScheduledMessageImageListItemBinding>>() {
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkViewHolder {
return QkViewHolder(
LayoutInflater
.from(parent.context)
.inflate(R.layout.scheduled_message_image_list_item, parent, false)
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): QkBindingViewHolder<ScheduledMessageImageListItemBinding> =
QkBindingViewHolder(
ScheduledMessageImageListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false)
)
}
override fun onBindViewHolder(holder: QkViewHolder, position: Int) {
override fun onBindViewHolder(holder: QkBindingViewHolder<ScheduledMessageImageListItemBinding>, position: Int) {
val uri = getItem(position)
// set best image and text to use for icon
when (getItem(position).loadBestIconIntoImageView(context, holder.thumbnail)) {
when (getItem(position).loadBestIconIntoImageView(context, holder.binding.thumbnail)) {
LoadBestIconIntoImageView.Missing -> {
holder.fileName.text = context.getString(R.string.attachment_missing)
holder.fileName.visibility = View.VISIBLE
holder.binding.fileName.text = context.getString(R.string.attachment_missing)
holder.binding.fileName.visibility = View.VISIBLE
}
LoadBestIconIntoImageView.ActivityIcon,
LoadBestIconIntoImageView.DefaultAudioIcon,
LoadBestIconIntoImageView.GenericIcon -> {
// generic style icon used, also show name
holder.fileName.text = uri.getName(context)
holder.fileName.visibility = View.VISIBLE
holder.binding.fileName.text = uri.getName(context)
holder.binding.fileName.visibility = View.VISIBLE
}
else -> holder.fileName.visibility = View.GONE
else -> holder.binding.fileName.visibility = View.GONE
}
}
}
@@ -23,7 +23,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<include layout="@layout/collapsing_toolbar" />
<include
android:id="@+id/toolbarLayout"
layout="@layout/collapsing_toolbar" />
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
@@ -262,4 +264,4 @@
android:layout_gravity="bottom"
android:background="?android:attr/divider" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>