wbrawner/Simple-Draw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #292 from esensar/fix/291-startup-crash

Browse source 
Keep android material classes to prevent crash on lower SDKs
This commit is contained in:
Tibor Kaputa 2023-09-11 08:49:39 +02:00 committed by GitHub
commit e4cddc2900
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/proguard-rules.pro vendored
View file

@ -1,3 +1,5 @@
-keepclassmembers class * implements android.os.Parcelable {
static ** CREATOR;
}
-keep class com.google.android.material.** { *; }

18
app/src/main/kotlin/com/simplemobiletools/draw/pro/helpers/VectorFloodFiller.kt
View file

@ -12,9 +12,9 @@ import java.util.Queue
class VectorFloodFiller(image: Bitmap) {
val path = MyPath()
private var width = 0
private var height = 0
private var pixels: IntArray? = null
private val width: Int
private val height: Int
private val pixels: IntArray
private lateinit var pixelsChecked: BooleanArray
private lateinit var ranges: Queue<FloodFillRange>
@ -29,12 +29,12 @@ class VectorFloodFiller(image: Bitmap) {
width = image.width
height = image.height
pixels = IntArray(width * height)
image.getPixels(pixels!!, 0, width, 0, 0, width, height)
image.getPixels(pixels, 0, width, 0, 0, width, height)
}
private fun prepare() {
// Called before starting flood-fill
pixelsChecked = BooleanArray(pixels!!.size)
pixelsChecked = BooleanArray(pixels.size)
ranges = LinkedList()
}
@ -45,7 +45,7 @@ class VectorFloodFiller(image: Bitmap) {
prepare()
// Get starting color.
val startPixel = pixels!!.getOrNull(width * y + x) ?: return
val startPixel = pixels.getOrNull(width * y + x) ?: return
if (startPixel == fillColor) {
// No-op.
return
@ -137,9 +137,9 @@ class VectorFloodFiller(image: Bitmap) {
// Sees if a pixel is within the color tolerance range.
private fun isPixelColorWithinTolerance(px: Int): Boolean {
val red = pixels!![px] ushr 16 and 0xff
val green = pixels!![px] ushr 8 and 0xff
val blue = pixels!![px] and 0xff
val red = pixels[px] ushr 16 and 0xff
val green = pixels[px] ushr 8 and 0xff
val blue = pixels[px] and 0xff
return red >= startColorRed - tolerance && red <= startColorRed + tolerance && green >= startColorGreen - tolerance && green <= startColorGreen + tolerance && blue >= startColorBlue - tolerance && blue <= startColorBlue + tolerance
}