Merge pull request #512 from Inhishonor/androidx

Migrate remaining components to androidx
This commit is contained in:
octoshrimpy
2025-08-29 11:15:10 -04:00
committed by GitHub
5 changed files with 10 additions and 9 deletions
@@ -19,8 +19,8 @@
package dev.octoshrimpy.quik.feature.blocking package dev.octoshrimpy.quik.feature.blocking
import android.app.Activity import android.app.Activity
import android.app.AlertDialog
import android.content.Context import android.content.Context
import androidx.appcompat.app.AlertDialog
import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.R
import dev.octoshrimpy.quik.blocking.BlockingClient import dev.octoshrimpy.quik.blocking.BlockingClient
import dev.octoshrimpy.quik.interactor.MarkBlocked import dev.octoshrimpy.quik.interactor.MarkBlocked
@@ -18,12 +18,12 @@
*/ */
package dev.octoshrimpy.quik.feature.blocking.messages package dev.octoshrimpy.quik.feature.blocking.messages
import android.app.AlertDialog
import android.content.Context import android.content.Context
import android.view.Menu import android.view.Menu
import android.view.MenuInflater import android.view.MenuInflater
import android.view.MenuItem import android.view.MenuItem
import android.view.View import android.view.View
import androidx.appcompat.app.AlertDialog
import dev.octoshrimpy.quik.R import dev.octoshrimpy.quik.R
import dev.octoshrimpy.quik.common.base.QkController import dev.octoshrimpy.quik.common.base.QkController
import dev.octoshrimpy.quik.common.util.Colors import dev.octoshrimpy.quik.common.util.Colors
@@ -107,7 +107,7 @@ class BlockedMessagesController : QkController<BlockedMessagesView, BlockedMessa
override fun showDeleteDialog(conversations: List<Long>) { override fun showDeleteDialog(conversations: List<Long>) {
val count = conversations.size val count = conversations.size
AlertDialog.Builder(activity) AlertDialog.Builder(activity!!)
.setTitle(R.string.dialog_delete_title) .setTitle(R.string.dialog_delete_title)
.setMessage(resources?.getQuantityString(R.plurals.dialog_delete_message, count, count)) .setMessage(resources?.getQuantityString(R.plurals.dialog_delete_message, count, count))
.setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteIntent.onNext(conversations) } .setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteIntent.onNext(conversations) }
@@ -733,7 +733,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
override fun showDeleteDialog(messages: List<Long>) { override fun showDeleteDialog(messages: List<Long>) {
val count = messages.size val count = messages.size
android.app.AlertDialog.Builder(this) AlertDialog.Builder(this)
.setTitle(R.string.dialog_delete_title) .setTitle(R.string.dialog_delete_title)
.setMessage(resources.getQuantityString(R.plurals.dialog_delete_chat, count, count)) .setMessage(resources.getQuantityString(R.plurals.dialog_delete_chat, count, count))
.setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteIntent.onNext(messages) } .setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteIntent.onNext(messages) }
@@ -742,7 +742,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
} }
override fun showClearCurrentMessageDialog() { override fun showClearCurrentMessageDialog() {
android.app.AlertDialog.Builder(this) AlertDialog.Builder(this)
.setTitle(R.string.dialog_clear_compose_title) .setTitle(R.string.dialog_clear_compose_title)
.setMessage(R.string.dialog_clear_compose) .setMessage(R.string.dialog_clear_compose)
.setPositiveButton(R.string.button_clear) { _, _ -> .setPositiveButton(R.string.button_clear) { _, _ ->
@@ -20,7 +20,6 @@ package dev.octoshrimpy.quik.feature.main
import android.Manifest import android.Manifest
import android.animation.ObjectAnimator import android.animation.ObjectAnimator
import android.app.AlertDialog
import android.content.Intent import android.content.Intent
import android.content.res.ColorStateList import android.content.res.ColorStateList
import android.os.Build import android.os.Build
@@ -31,6 +30,7 @@ import android.view.MenuItem
import android.view.View import android.view.View
import android.view.ViewStub import android.view.ViewStub
import androidx.appcompat.app.ActionBarDrawerToggle import androidx.appcompat.app.ActionBarDrawerToggle
import androidx.appcompat.app.AlertDialog
import androidx.core.app.ActivityCompat import androidx.core.app.ActivityCompat
import androidx.core.view.GravityCompat import androidx.core.view.GravityCompat
import androidx.core.view.isVisible import androidx.core.view.isVisible
@@ -21,6 +21,7 @@ package dev.octoshrimpy.quik.feature.scheduled
import android.os.Bundle import android.os.Bundle
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import androidx.appcompat.app.AlertDialog
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.ViewModelProviders import androidx.lifecycle.ViewModelProviders
@@ -111,7 +112,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
override fun showDeleteDialog(messages: List<Long>) { override fun showDeleteDialog(messages: List<Long>) {
val count = messages.size val count = messages.size
android.app.AlertDialog.Builder(this) AlertDialog.Builder(this)
.setTitle(R.string.dialog_delete_title) .setTitle(R.string.dialog_delete_title)
.setMessage(resources.getQuantityString(R.plurals.dialog_delete_chat, count, count)) .setMessage(resources.getQuantityString(R.plurals.dialog_delete_chat, count, count))
.setPositiveButton(R.string.button_delete) { _, _ -> deleteScheduledMessages.onNext(messages) } .setPositiveButton(R.string.button_delete) { _, _ -> deleteScheduledMessages.onNext(messages) }
@@ -121,7 +122,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
override fun showSendNowDialog(messages: List<Long>) { override fun showSendNowDialog(messages: List<Long>) {
val count = messages.size val count = messages.size
android.app.AlertDialog.Builder(this) AlertDialog.Builder(this)
.setTitle(R.string.main_menu_send_now) .setTitle(R.string.main_menu_send_now)
.setMessage(resources.getQuantityString(R.plurals.dialog_send_now, count, count)) .setMessage(resources.getQuantityString(R.plurals.dialog_send_now, count, count))
.setPositiveButton(R.string.main_menu_send_now) { _, _ -> sendScheduledMessages.onNext(messages) } .setPositiveButton(R.string.main_menu_send_now) { _, _ -> sendScheduledMessages.onNext(messages) }
@@ -130,7 +131,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
} }
override fun showEditMessageDialog(message: Long) { override fun showEditMessageDialog(message: Long) {
android.app.AlertDialog.Builder(this) AlertDialog.Builder(this)
.setTitle(R.string.dialog_edit_scheduled_message_title) .setTitle(R.string.dialog_edit_scheduled_message_title)
.setMessage(R.string.dialog_edit_scheduled_message) .setMessage(R.string.dialog_edit_scheduled_message)
.setPositiveButton(R.string.dialog_edit_scheduled_message_positive_button) { _, _ -> .setPositiveButton(R.string.dialog_edit_scheduled_message_positive_button) { _, _ ->