Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: Implement updateShortcut as a suspending function (#491) 

Previously a regular function that created and subscribed to an rxJava
callable, now it's a suspending function that enforces Dispatchers.IO as
the context, launched in its own coroutine.
This commit is contained in:
Nik Clayton 2024-03-03 17:21:04 +01:00 committed by GitHub
parent 900b1728bf
commit da6e026cc6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 53 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/app/pachli/MainActivity.kt
View File

@ -979,7 +979,9 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, MenuProvider {
} }
updateProfiles() updateProfiles()
updateShortcut(applicationContext, accountManager.activeAccount!!) externalScope.launch {
updateShortcut(applicationContext, accountManager.activeAccount!!)
}
} }
@SuppressLint("CheckResult") @SuppressLint("CheckResult")

105
app/src/main/java/app/pachli/util/ShareShortcutHelper.kt
View File

@ -29,64 +29,59 @@ import app.pachli.core.database.model.AccountEntity
import app.pachli.core.designsystem.R as DR import app.pachli.core.designsystem.R as DR
import app.pachli.core.navigation.MainActivityIntent import app.pachli.core.navigation.MainActivityIntent
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
import io.reactivex.rxjava3.core.Single import kotlinx.coroutines.Dispatchers
import io.reactivex.rxjava3.schedulers.Schedulers import kotlinx.coroutines.withContext
fun updateShortcut(context: Context, account: AccountEntity) { suspend fun updateShortcut(context: Context, account: AccountEntity) = withContext(Dispatchers.IO) {
Single.fromCallable { val innerSize = context.resources.getDimensionPixelSize(DR.dimen.adaptive_bitmap_inner_size)
val innerSize = context.resources.getDimensionPixelSize(DR.dimen.adaptive_bitmap_inner_size) val outerSize = context.resources.getDimensionPixelSize(DR.dimen.adaptive_bitmap_outer_size)
val outerSize = context.resources.getDimensionPixelSize(DR.dimen.adaptive_bitmap_outer_size)
val bmp = if (TextUtils.isEmpty(account.profilePictureUrl)) { val bmp = if (TextUtils.isEmpty(account.profilePictureUrl)) {
Glide.with(context) Glide.with(context)
.asBitmap() .asBitmap()
.load(DR.drawable.avatar_default) .load(DR.drawable.avatar_default)
.submit(innerSize, innerSize) .submit(innerSize, innerSize)
.get() .get()
} else { } else {
Glide.with(context) Glide.with(context)
.asBitmap() .asBitmap()
.load(account.profilePictureUrl) .load(account.profilePictureUrl)
.error(DR.drawable.avatar_default) .error(DR.drawable.avatar_default)
.submit(innerSize, innerSize) .submit(innerSize, innerSize)
.get() .get()
}
// inset the loaded bitmap inside a 108dp transparent canvas so it looks good as adaptive icon
val outBmp = Bitmap.createBitmap(outerSize, outerSize, Bitmap.Config.ARGB_8888)
val canvas = Canvas(outBmp)
canvas.drawBitmap(bmp, (outerSize - innerSize).toFloat() / 2f, (outerSize - innerSize).toFloat() / 2f, null)
val icon = IconCompat.createWithAdaptiveBitmap(outBmp)
val person = Person.Builder()
.setIcon(icon)
.setName(account.displayName)
.setKey(account.identifier)
.build()
// This intent will be sent when the user clicks on one of the launcher shortcuts. Intent from share sheet will be different
val intent = MainActivityIntent(context).apply {
action = Intent.ACTION_SEND
type = "text/plain"
putExtra(ShortcutManagerCompat.EXTRA_SHORTCUT_ID, account.id.toString())
}
val shortcutInfo = ShortcutInfoCompat.Builder(context, account.id.toString())
.setIntent(intent)
.setCategories(setOf("app.pachli.Share"))
.setShortLabel(account.displayName)
.setPerson(person)
.setLongLived(true)
.setIcon(icon)
.build()
ShortcutManagerCompat.addDynamicShortcuts(context, listOf(shortcutInfo))
} }
.subscribeOn(Schedulers.io())
.onErrorReturnItem(false) // inset the loaded bitmap inside a 108dp transparent canvas so it looks good as adaptive icon
.subscribe() val outBmp = Bitmap.createBitmap(outerSize, outerSize, Bitmap.Config.ARGB_8888)
val canvas = Canvas(outBmp)
canvas.drawBitmap(bmp, (outerSize - innerSize).toFloat() / 2f, (outerSize - innerSize).toFloat() / 2f, null)
val icon = IconCompat.createWithAdaptiveBitmap(outBmp)
val person = Person.Builder()
.setIcon(icon)
.setName(account.displayName)
.setKey(account.identifier)
.build()
// This intent will be sent when the user clicks on one of the launcher shortcuts. Intent from share sheet will be different
val intent = MainActivityIntent(context).apply {
action = Intent.ACTION_SEND
type = "text/plain"
putExtra(ShortcutManagerCompat.EXTRA_SHORTCUT_ID, account.id.toString())
}
val shortcutInfo = ShortcutInfoCompat.Builder(context, account.id.toString())
.setIntent(intent)
.setCategories(setOf("app.pachli.Share"))
.setShortLabel(account.displayName)
.setPerson(person)
.setLongLived(true)
.setIcon(icon)
.build()
ShortcutManagerCompat.addDynamicShortcuts(context, listOf(shortcutInfo))
} }
fun removeShortcut(context: Context, account: AccountEntity) { fun removeShortcut(context: Context, account: AccountEntity) {