diff --git a/domain/src/main/java/com/moez/QKSMS/manager/ShortcutManager.kt b/domain/src/main/java/com/moez/QKSMS/manager/ShortcutManager.kt index fd7d496d..9b7814ff 100644 --- a/domain/src/main/java/com/moez/QKSMS/manager/ShortcutManager.kt +++ b/domain/src/main/java/com/moez/QKSMS/manager/ShortcutManager.kt @@ -18,10 +18,17 @@ */ package dev.octoshrimpy.quik.manager +import android.content.pm.ShortcutInfo +import androidx.core.content.pm.ShortcutInfoCompat + interface ShortcutManager { fun updateBadge() fun updateShortcuts() + fun getShortcut(threadId: Long): ShortcutInfoCompat? + + fun reportShortcutUsed(threadId: Long) + } \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt index cde93ea1..44872678 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt @@ -21,24 +21,26 @@ package dev.octoshrimpy.quik.common.util import android.annotation.TargetApi import android.content.Context import android.content.Intent -import android.content.pm.ShortcutInfo -import android.content.pm.ShortcutManager -import android.graphics.drawable.Icon import android.os.Build -import dev.octoshrimpy.quik.R +import android.content.pm.ShortcutManager +import androidx.core.app.Person +import androidx.core.content.pm.ShortcutInfoCompat +import androidx.core.content.pm.ShortcutManagerCompat +import dev.octoshrimpy.quik.common.util.extensions.getThemedIcon +import dev.octoshrimpy.quik.common.util.extensions.toPerson import dev.octoshrimpy.quik.feature.compose.ComposeActivity import dev.octoshrimpy.quik.model.Conversation import dev.octoshrimpy.quik.repository.ConversationRepository import dev.octoshrimpy.quik.repository.MessageRepository -import dev.octoshrimpy.quik.util.GlideApp -import dev.octoshrimpy.quik.util.tryOrNull import me.leolin.shortcutbadger.ShortcutBadger +import timber.log.Timber import javax.inject.Inject class ShortcutManagerImpl @Inject constructor( private val context: Context, private val conversationRepo: ConversationRepository, - private val messageRepo: MessageRepository + private val messageRepo: MessageRepository, + private val colors: Colors ) : dev.octoshrimpy.quik.manager.ShortcutManager { override fun updateBadge() { @@ -51,41 +53,109 @@ class ShortcutManagerImpl @Inject constructor( val shortcutManager = context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager if (shortcutManager.isRateLimitingActive) return - shortcutManager.dynamicShortcuts = conversationRepo.getTopConversations() + val shortcuts: List = conversationRepo.getTopConversations() .take(shortcutManager.maxShortcutCountPerActivity - shortcutManager.manifestShortcuts.size) - .map { conversation -> createShortcutForConversation(conversation, shortcutManager) } + .map { conversation -> createShortcutForConversation(conversation) } + + ShortcutManagerCompat.setDynamicShortcuts(context, shortcuts) } } - @TargetApi(25) - private fun createShortcutForConversation(conversation: Conversation, shortcutManager: ShortcutManager): ShortcutInfo { + /** + * Get the shortcut for a threadId. Will create it if it doesn't exist. + */ + override fun getShortcut(threadId: Long): ShortcutInfoCompat? { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) { + var sc = getShortcuts().find { it.id == threadId.toString() } + if(sc != null) + sc = updateShortcut(sc) + if (sc == null) { + val conv = conversationRepo.getConversation(threadId) + if (conv == null) + return null + else + sc = createShortcutForConversation(conv) + } + return sc + } else { + return null + } + } + + /** + * Report thread usage. Will create the shortcut if it doesn't exist. + */ + override fun reportShortcutUsed(threadId: Long) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) { + val shortcutManager = context.getSystemService(Context.SHORTCUT_SERVICE) as ShortcutManager + if(getShortcut(threadId ) == null) { + val conversation = conversationRepo.getOrCreateConversation(threadId) + if (conversation == null) + return + val shortcut = createShortcutForConversation(conversation) + ShortcutManagerCompat.setDynamicShortcuts(context, listOf(shortcut)) + } + shortcutManager.reportShortcutUsed(threadId.toString()) + } + } + + @TargetApi(29) + private fun createShortcutForConversation(conversation: Conversation): ShortcutInfoCompat { + Timber.v("creating shortcut for conversation ${conversation.id} : ${conversation.getTitle()}") val icon = when { conversation.recipients.size == 1 -> { - val address = conversation.recipients.first()!!.address - val request = GlideApp.with(context) - .asBitmap() - .circleCrop() - .load("tel:$address") - .submit(shortcutManager.iconMaxWidth, shortcutManager.iconMaxHeight) - val bitmap = tryOrNull(false) { request.get() } - - if (bitmap != null) Icon.createWithBitmap(bitmap) - else Icon.createWithResource(context, R.mipmap.ic_shortcut_person) + val recipient = conversation.recipients.first()!! + recipient.getThemedIcon(context, + colors.theme(recipient), + ShortcutManagerCompat.getIconMaxWidth(context), + ShortcutManagerCompat.getIconMaxHeight(context) + ) } - else -> Icon.createWithResource(context, R.mipmap.ic_shortcut_people) + else -> { + conversation.getThemedIcon(context, + ShortcutManagerCompat.getIconMaxWidth(context), + ShortcutManagerCompat.getIconMaxHeight(context) + ) + } } + val persons: Array = conversation.recipients.map { it -> it.toPerson(context, colors) }.toTypedArray(); + val intent = Intent(context, ComposeActivity::class.java) .setAction(Intent.ACTION_VIEW) .putExtra("threadId", conversation.id) + .putExtra("fromShortcut", true) - return ShortcutInfo.Builder(context, "${conversation.id}") + val sc = ShortcutInfoCompat.Builder(context, "${conversation.id}") .setShortLabel(conversation.getTitle()) .setLongLabel(conversation.getTitle()) .setIcon(icon) .setIntent(intent) + .setPersons(persons) + .setLongLived(true) .build() + + ShortcutManagerCompat.pushDynamicShortcut(context, sc) + return sc } + private fun updateShortcut(shortcut: ShortcutInfoCompat): ShortcutInfoCompat { + val conversation = conversationRepo.getConversation(shortcut.id.toLong()) + if (conversation == null) + return shortcut + else { + val sc = createShortcutForConversation(conversation) + ShortcutManagerCompat.pushDynamicShortcut(context, sc) + return sc + } + } + + private fun getShortcuts() : List { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) { + return ShortcutManagerCompat.getDynamicShortcuts(context) + } else { + return emptyList() + } + } } \ No newline at end of file