Merge remote-tracking branch 'upstream/master' into emoji-reacts

This commit is contained in:
Ben Iofel
2025-09-02 18:01:14 -04:00
17 changed files with 227 additions and 176 deletions
@@ -45,7 +45,7 @@ class FileLoggingTree @Inject constructor(
private var logFileUri: Uri? = null
override fun log(priority: Int, tag: String, message: String, t: Throwable?) {
override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
if (!prefs.logging.get()) return
Schedulers.io().scheduleDirect {
@@ -101,7 +101,7 @@ class ShortcutManagerImpl @Inject constructor(
@TargetApi(29)
private fun createShortcutForConversation(conversation: Conversation): ShortcutInfoCompat {
Timber.v("creating shortcut for conversation ${conversation.id} : ${conversation.getTitle()}")
Timber.v("creating shortcut for conversation ${conversation.id}")
val icon = when {
conversation.recipients.size == 1 -> {
val recipient = conversation.recipients.first()!!
@@ -19,8 +19,8 @@
package dev.octoshrimpy.quik.feature.blocking
import android.app.Activity
import android.app.AlertDialog
import android.content.Context
import androidx.appcompat.app.AlertDialog
import dev.octoshrimpy.quik.R
import dev.octoshrimpy.quik.blocking.BlockingClient
import dev.octoshrimpy.quik.interactor.MarkBlocked
@@ -18,12 +18,12 @@
*/
package dev.octoshrimpy.quik.feature.blocking.messages
import android.app.AlertDialog
import android.content.Context
import android.view.Menu
import android.view.MenuInflater
import android.view.MenuItem
import android.view.View
import androidx.appcompat.app.AlertDialog
import dev.octoshrimpy.quik.R
import dev.octoshrimpy.quik.common.base.QkController
import dev.octoshrimpy.quik.common.util.Colors
@@ -107,7 +107,7 @@ class BlockedMessagesController : QkController<BlockedMessagesView, BlockedMessa
override fun showDeleteDialog(conversations: List<Long>) {
val count = conversations.size
AlertDialog.Builder(activity)
AlertDialog.Builder(activity!!)
.setTitle(R.string.dialog_delete_title)
.setMessage(resources?.getQuantityString(R.plurals.dialog_delete_message, count, count))
.setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteIntent.onNext(conversations) }
@@ -733,7 +733,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
override fun showDeleteDialog(messages: List<Long>) {
val count = messages.size
android.app.AlertDialog.Builder(this)
AlertDialog.Builder(this)
.setTitle(R.string.dialog_delete_title)
.setMessage(resources.getQuantityString(R.plurals.dialog_delete_chat, count, count))
.setPositiveButton(R.string.button_delete) { _, _ -> confirmDeleteIntent.onNext(messages) }
@@ -742,7 +742,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
}
override fun showClearCurrentMessageDialog() {
android.app.AlertDialog.Builder(this)
AlertDialog.Builder(this)
.setTitle(R.string.dialog_clear_compose_title)
.setMessage(R.string.dialog_clear_compose)
.setPositiveButton(R.string.button_clear) { _, _ ->
@@ -20,7 +20,6 @@ package dev.octoshrimpy.quik.feature.main
import android.Manifest
import android.animation.ObjectAnimator
import android.app.AlertDialog
import android.content.Intent
import android.content.res.ColorStateList
import android.os.Build
@@ -31,6 +30,7 @@ import android.view.MenuItem
import android.view.View
import android.view.ViewStub
import androidx.appcompat.app.ActionBarDrawerToggle
import androidx.appcompat.app.AlertDialog
import androidx.core.app.ActivityCompat
import androidx.core.view.GravityCompat
import androidx.core.view.isVisible
@@ -21,6 +21,7 @@ package dev.octoshrimpy.quik.feature.scheduled
import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
import androidx.appcompat.app.AlertDialog
import androidx.core.view.isVisible
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.ViewModelProviders
@@ -111,7 +112,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
override fun showDeleteDialog(messages: List<Long>) {
val count = messages.size
android.app.AlertDialog.Builder(this)
AlertDialog.Builder(this)
.setTitle(R.string.dialog_delete_title)
.setMessage(resources.getQuantityString(R.plurals.dialog_delete_chat, count, count))
.setPositiveButton(R.string.button_delete) { _, _ -> deleteScheduledMessages.onNext(messages) }
@@ -121,7 +122,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
override fun showSendNowDialog(messages: List<Long>) {
val count = messages.size
android.app.AlertDialog.Builder(this)
AlertDialog.Builder(this)
.setTitle(R.string.main_menu_send_now)
.setMessage(resources.getQuantityString(R.plurals.dialog_send_now, count, count))
.setPositiveButton(R.string.main_menu_send_now) { _, _ -> sendScheduledMessages.onNext(messages) }
@@ -130,7 +131,7 @@ class ScheduledActivity : QkThemedActivity(), ScheduledView {
}
override fun showEditMessageDialog(message: Long) {
android.app.AlertDialog.Builder(this)
AlertDialog.Builder(this)
.setTitle(R.string.dialog_edit_scheduled_message_title)
.setMessage(R.string.dialog_edit_scheduled_message)
.setPositiveButton(R.string.dialog_edit_scheduled_message_positive_button) { _, _ ->
@@ -94,7 +94,7 @@ class WidgetAdapter(intent: Intent) : RemoteViewsService.RemoteViewsFactory {
* we'll return the max count + 1, where the last row just shows "View more conversations"
*/
override fun getCount(): Int {
val count = Math.min(conversations.size, MAX_CONVERSATIONS_COUNT)
val count = conversations.size.coerceAtMost(MAX_CONVERSATIONS_COUNT)
val shouldShowViewMore = count < conversations.size
return count + if (shouldShowViewMore) 1 else 0
}
@@ -25,7 +25,7 @@ import android.appwidget.AppWidgetProvider
import android.content.ComponentName
import android.content.Context
import android.content.Intent
import android.net.Uri
import android.content.res.Configuration
import android.os.Bundle
import android.widget.RemoteViews
import dagger.android.AndroidInjection
@@ -39,6 +39,7 @@ import dev.octoshrimpy.quik.receiver.StartActivityFromWidgetReceiver
import dev.octoshrimpy.quik.util.Preferences
import timber.log.Timber
import javax.inject.Inject
import androidx.core.net.toUri
class WidgetProvider : AppWidgetProvider() {
@@ -109,8 +110,11 @@ class WidgetProvider : AppWidgetProvider() {
Timber.v("updateWidget appWidgetId: $appWidgetId")
val remoteViews = RemoteViews(context.packageName, R.layout.widget)
val nightModeFlags = context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
val isNightMode = nightModeFlags == Configuration.UI_MODE_NIGHT_YES
// Apply colors from theme
val night = prefs.night.get()
val night = prefs.night.get() || isNightMode
val black = prefs.black.get()
remoteViews.setInt(R.id.background, "setColorFilter", context.getColorCompat(when {
@@ -134,7 +138,7 @@ class WidgetProvider : AppWidgetProvider() {
val intent = Intent(context, WidgetService::class.java)
.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId)
.putExtra("small_widget", smallWidget)
intent.data = Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME))
intent.data = intent.toUri(Intent.URI_INTENT_SCHEME).toUri()
remoteViews.setRemoteAdapter(R.id.conversations, intent)
// compose new message image color and on click intent