From 3f053b8547f1a327ea11556ae3f326f9ce148f9c Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Fri, 14 Aug 2020 03:17:10 -0700 Subject: [PATCH] Minor code changes --- .../magisk/core/utils/MarkwonImagePlugin.kt | 44 +++++++------------ .../java/com/topjohnwu/magisk/ktx/XAndroid.kt | 2 +- .../topjohnwu/magisk/view/MarkDownWindow.kt | 2 +- 3 files changed, 17 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/core/utils/MarkwonImagePlugin.kt b/app/src/main/java/com/topjohnwu/magisk/core/utils/MarkwonImagePlugin.kt index d8a83183d..c3bb0ed3f 100644 --- a/app/src/main/java/com/topjohnwu/magisk/core/utils/MarkwonImagePlugin.kt +++ b/app/src/main/java/com/topjohnwu/magisk/core/utils/MarkwonImagePlugin.kt @@ -11,11 +11,8 @@ import android.graphics.drawable.ShapeDrawable import android.net.Uri import android.text.Spanned import android.text.style.DynamicDrawableSpan -import android.view.View import android.widget.TextView import androidx.annotation.WorkerThread -import androidx.core.view.marginLeft -import androidx.core.view.marginRight import com.caverock.androidsvg.SVG import com.caverock.androidsvg.SVGParseException import com.topjohnwu.magisk.core.ResMgr @@ -25,8 +22,7 @@ import io.noties.markwon.image.* import io.noties.markwon.image.data.DataUriSchemeHandler import io.noties.markwon.image.network.OkHttpNetworkSchemeHandler import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.async -import kotlinx.coroutines.awaitAll +import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import okhttp3.OkHttpClient import org.commonmark.node.Image @@ -59,24 +55,17 @@ class MarkwonImagePlugin(okHttp: OkHttpClient) : AbstractMarkwonPlugin() { if (spans == null || spans.isEmpty()) return - // Download and create all drawables in parallel + // Get TextView sizes before setText() to resize all images + val wr = WaitRunnable { + val width = tv.width - tv.paddingLeft - tv.paddingRight + spans.forEach { it.canvasWidth = width } + } + tv.post(wr) + runBlocking(Dispatchers.IO) { // Download and decode all drawables in parallel - val defers = spans.map { async { it.load() } } - - // Get TextView sizes beforehand to resize all images - // We get its parent here as the TextView itself might be hidden - val parent = tv.parent as View - parent.post(WaitRunnable{ - // Make sure it is rendered - val width = parent.width - - tv.paddingLeft - tv.paddingRight - - tv.marginLeft - tv.marginRight - spans.forEach { it.canvasWidth = width } - }) - - // Make sure all is done before returning - defers.awaitAll() + spans.forEach { launch { it.load() } } + wr.waitUntilDone() } } @@ -157,8 +146,8 @@ class MarkwonImagePlugin(okHttp: OkHttpClient) : AbstractMarkwonPlugin() { ) : DynamicDrawableSpan(ALIGN_BOTTOM) { var canvasWidth = 0 - var measured = false - lateinit var draw: Drawable + private var measured = false + private lateinit var draw: Drawable fun load() { draw = loadDrawable(dest) ?: ShapeDrawable() @@ -179,9 +168,7 @@ class MarkwonImagePlugin(okHttp: OkHttpClient) : AbstractMarkwonPlugin() { } private fun measure(paint: Paint) { - if (measured) - return - if (canvasWidth == 0) + if (measured || canvasWidth == 0) return measured = true val bound = SizeResolver.resolveImageSize(size, defaultBounds(), canvasWidth, paint.textSize) @@ -212,8 +199,7 @@ class MarkwonImagePlugin(okHttp: OkHttpClient) : AbstractMarkwonPlugin() { override fun supportedTypes() = listOf("image/svg+xml") override fun decode(contentType: String?, inputStream: InputStream): Drawable { - val svg: SVG - svg = try { + val svg = try { SVG.getFromInputStream(inputStream) } catch (e: SVGParseException) { throw IllegalStateException("Exception decoding SVG", e) @@ -222,7 +208,7 @@ class MarkwonImagePlugin(okHttp: OkHttpClient) : AbstractMarkwonPlugin() { val w = svg.documentWidth val h = svg.documentHeight - if (w == 0f || h == 0f) { + if (w <= 0 || h <= 0) { val picture = svg.renderToPicture() return PictureDrawable(picture) } diff --git a/app/src/main/java/com/topjohnwu/magisk/ktx/XAndroid.kt b/app/src/main/java/com/topjohnwu/magisk/ktx/XAndroid.kt index 1f397e0e9..09f3815d0 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ktx/XAndroid.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ktx/XAndroid.kt @@ -388,7 +388,7 @@ var TextView.precomputedText: CharSequence coroutineScope.launch(Dispatchers.IO) { if (SDK_INT >= 29) { - // Internally PrecomputedTextCompat will platform API on API 29+ + // Internally PrecomputedTextCompat will use platform API on API 29+ // Due to some stupid crap OEM (Samsung) implementation, this can actually // crash our app. Directly use platform APIs with some workarounds val pre = PrecomputedText.create(value, textMetricsParams) diff --git a/app/src/main/java/com/topjohnwu/magisk/view/MarkDownWindow.kt b/app/src/main/java/com/topjohnwu/magisk/view/MarkDownWindow.kt index 788447f76..0ac51f161 100644 --- a/app/src/main/java/com/topjohnwu/magisk/view/MarkDownWindow.kt +++ b/app/src/main/java/com/topjohnwu/magisk/view/MarkDownWindow.kt @@ -47,7 +47,7 @@ object MarkDownWindow : KoinComponent { if (e is CancellationException) throw e Timber.e(e) - tv.setText(R.string.download_file_error) + tv.post { tv.setText(R.string.download_file_error) } } } }