Skip to content

Commit c776287

Browse files
kylecorry31kylecorry31
committed
Address some linting issues
Signed-off-by: Kyle Corry <kylecorry31@gmail.com>
1 parent 2964aec commit c776287

File tree

15 files changed

+57
-63
lines changed

15 files changed

+57
-63
lines changed

‎bitmaps/src/main/java/com/kylecorry/andromeda/bitmaps/BitmapUtils.kt

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ import android.util.Size
1414
import androidx.annotation.ColorInt
1515
import androidx.core.graphics.alpha
1616
import androidx.core.graphics.blue
17+
import androidx.core.graphics.createBitmap
1718
import androidx.core.graphics.get
1819
import androidx.core.graphics.green
1920
import androidx.core.graphics.red
21+
import androidx.core.graphics.scale
2022
import com.kylecorry.andromeda.core.math.MathUtils
2123
import com.kylecorry.andromeda.core.units.PixelCoordinate
2224
import com.kylecorry.sol.math.Range
@@ -157,10 +159,7 @@ object BitmapUtils {
157159
val pixelStride = planes[0].pixelStride
158160
val rowStride = planes[0].rowStride
159161
val rowPadding = rowStride - pixelStride * width
160-
val bitmap = Bitmap.createBitmap(
161-
width + rowPadding / pixelStride,
162-
height, Bitmap.Config.ARGB_8888
163-
)
162+
val bitmap = createBitmap(width + rowPadding / pixelStride, height)
164163
bitmap.copyPixelsFromBuffer(buffer)
165164
bitmap
166165
}
@@ -242,7 +241,7 @@ object BitmapUtils {
242241
fun Bitmap.resizeToFit(maxWidth: Int, maxHeight: Int): Bitmap {
243242
return if (maxHeight > 0 && maxWidth > 0) {
244243
val scaledSize = MathUtils.scaleToBounds(Size(width, height), Size(maxWidth, maxHeight))
245-
Bitmap.createScaledBitmap(this, scaledSize.width, scaledSize.height, true)
244+
this.scale(scaledSize.width, scaledSize.height)
246245
} else {
247246
this
248247
}
@@ -284,11 +283,8 @@ object BitmapUtils {
284283
)
285284

286285
// Create an empty mutable bitmap
287-
val blank = Bitmap.createBitmap(
288-
newWidth.toInt(),
289-
newHeight.toInt(),
290-
config ?: Bitmap.Config.ARGB_8888
291-
)
286+
val blank =
287+
createBitmap(newWidth.toInt(), newHeight.toInt(), config ?: Bitmap.Config.ARGB_8888)
292288
// Create a canvas to draw on
293289
val canvas = Canvas(blank)
294290

@@ -316,7 +312,7 @@ object BitmapUtils {
316312
@ColorInt backgroundColor: Int? = null
317313
): Bitmap {
318314
// Create an empty mutable bitmap
319-
val blank = Bitmap.createBitmap(width.toInt(), height.toInt(), Bitmap.Config.ARGB_8888)
315+
val blank = createBitmap(width.toInt(), height.toInt())
320316
// Create a canvas to draw on
321317
val canvas = Canvas(blank)
322318

‎bitmaps/src/main/java/com/kylecorry/andromeda/bitmaps/ImagePixelReader.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ class ImagePixelReader(
2222
private val config: Bitmap.Config = Bitmap.Config.ARGB_8888
2323
) {
2424

25-
@Suppress("BlockingMethodInNonBlockingContext")
2625
suspend fun getPixel(
2726
image: InputStream,
2827
x: Float,

‎bitmaps/src/main/java/com/kylecorry/andromeda/bitmaps/Toolkit.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import androidx.core.graphics.alpha
2222
import androidx.core.graphics.blue
2323
import androidx.core.graphics.green
2424
import androidx.core.graphics.red
25+
import androidx.core.graphics.createBitmap
2526

2627
// This string is used for error messages.
2728
private const val externalName = "RenderScript Toolkit"
@@ -1043,7 +1044,7 @@ internal object Toolkit {
10431044
validateBitmap("resize", inputBitmap)
10441045
validateRestriction("resize", outputSizeX, outputSizeY, restriction)
10451046

1046-
val outputBitmap = Bitmap.createBitmap(outputSizeX, outputSizeY, Bitmap.Config.ARGB_8888)
1047+
val outputBitmap = createBitmap(outputSizeX, outputSizeY)
10471048
nativeResizeBitmap(nativeHandle, inputBitmap, outputBitmap, restriction)
10481049
return outputBitmap
10491050
}
@@ -1095,7 +1096,7 @@ internal object Toolkit {
10951096
"$sizeX and $sizeY were provided."
10961097
}
10971098

1098-
val outputBitmap = Bitmap.createBitmap(sizeX, sizeY, Bitmap.Config.ARGB_8888)
1099+
val outputBitmap = createBitmap(sizeX, sizeY)
10991100
nativeYuvToRgbBitmap(nativeHandle, inputArray, sizeX, sizeY, outputBitmap, format.value)
11001101
return outputBitmap
11011102
}
@@ -2253,8 +2254,7 @@ internal fun validateBitmap(
22532254
internal fun createCompatibleBitmap(inputBitmap: Bitmap, inPlace: Boolean = false) = if (inPlace) {
22542255
inputBitmap
22552256
} else {
2256-
Bitmap.createBitmap(
2257-
inputBitmap.width,
2257+
createBitmap(inputBitmap.width,
22582258
inputBitmap.height,
22592259
inputBitmap.config ?: Bitmap.Config.ARGB_8888
22602260
)

‎canvas/src/main/java/com/kylecorry/andromeda/canvas/CanvasExtensions.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package com.kylecorry.andromeda.canvas
22

33
import android.graphics.*
4+
import androidx.core.graphics.createBitmap
45

56
inline fun Canvas.getMaskedBitmap(
67
mask: Bitmap,
7-
tempBitmap: Bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888),
8+
tempBitmap: Bitmap = createBitmap(width, height),
89
block: (canvas: Canvas) -> Unit
910
): Bitmap {
1011
val maskPaint = Paint(Paint.ANTI_ALIAS_FLAG)

‎canvas/src/main/java/com/kylecorry/andromeda/canvas/ICanvasDrawer.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import android.graphics.PathEffect
77
import android.graphics.Shader
88
import androidx.annotation.ColorInt
99
import androidx.annotation.DrawableRes
10+
import androidx.core.graphics.createBitmap
1011

1112
interface ICanvasDrawer {
1213
var canvas: Canvas
@@ -129,11 +130,7 @@ interface ICanvasDrawer {
129130
fun clipInverse(path: Path)
130131
fun mask(
131132
mask: Bitmap,
132-
tempBitmap: Bitmap = Bitmap.createBitmap(
133-
mask.width,
134-
mask.height,
135-
Bitmap.Config.ARGB_8888
136-
),
133+
tempBitmap: Bitmap = createBitmap(mask.width, mask.height),
137134
block: () -> Unit
138135
): Bitmap
139136

‎core/src/main/java/com/kylecorry/andromeda/core/system/GeoUri.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import com.kylecorry.sol.units.Coordinate
88
import kotlinx.parcelize.IgnoredOnParcel
99
import kotlinx.parcelize.Parcelize
1010
import kotlinx.parcelize.TypeParceler
11+
import androidx.core.net.toUri
1112

1213
@Parcelize
1314
@TypeParceler<Coordinate, CoordinateParceler>()
@@ -18,7 +19,7 @@ data class GeoUri(
1819
) : Parcelable {
1920

2021
@IgnoredOnParcel
21-
val uri: Uri = Uri.parse(toString())
22+
val uri: Uri = toString().toUri()
2223

2324
override fun toString(): String {
2425
val base = "geo:${coordinate.latitude.roundPlaces(6)},${coordinate.longitude.roundPlaces(6)}"

‎core/src/main/java/com/kylecorry/andromeda/core/system/Intents.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import android.provider.Settings
1010
import androidx.annotation.RequiresApi
1111
import androidx.core.content.ContextCompat
1212
import com.kylecorry.sol.units.Coordinate
13+
import androidx.core.net.toUri
1314

1415
object Intents {
1516

@@ -55,7 +56,7 @@ object Intents {
5556

5657
fun email(to: String, subject: String, body: String = ""): Intent {
5758
return Intent(Intent.ACTION_SENDTO).apply {
58-
data = Uri.parse("mailto:")
59+
data = "mailto:".toUri()
5960
putExtra(Intent.EXTRA_EMAIL, arrayOf(to))
6061
putExtra(Intent.EXTRA_SUBJECT, subject)
6162
putExtra(Intent.EXTRA_TEXT, body)
@@ -64,7 +65,7 @@ object Intents {
6465

6566
fun url(url: String): Intent {
6667
return Intent(Intent.ACTION_VIEW).apply {
67-
data = Uri.parse(url)
68+
data = url.toUri()
6869
}
6970
}
7071

‎core/src/main/java/com/kylecorry/andromeda/core/system/Resources.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.kylecorry.andromeda.core.system
22

3-
import android.R
43
import android.content.Context
54
import android.content.res.Configuration
65
import android.graphics.drawable.Drawable
@@ -19,6 +18,7 @@ import androidx.core.content.res.ResourcesCompat
1918
import androidx.core.os.ConfigurationCompat
2019
import androidx.core.view.get
2120
import java.util.Locale
21+
import androidx.core.view.size
2222

2323
object Resources {
2424
fun dp(context: Context, size: Float): Float {
@@ -46,22 +46,22 @@ object Resources {
4646

4747
@ColorInt
4848
fun androidTextColorPrimary(context: Context): Int {
49-
return getAndroidColorAttr(context, R.attr.textColorPrimary)
49+
return getAndroidColorAttr(context, android.R.attr.textColorPrimary)
5050
}
5151

5252
@ColorInt
5353
fun androidBackgroundColorPrimary(context: Context): Int {
54-
return getAndroidColorAttr(context, R.attr.colorBackground)
54+
return getAndroidColorAttr(context, android.R.attr.colorBackground)
5555
}
5656

5757
@ColorInt
5858
fun androidBackgroundColorSecondary(context: Context): Int {
59-
return getAndroidColorAttr(context, R.attr.colorBackgroundFloating)
59+
return getAndroidColorAttr(context, android.R.attr.colorBackgroundFloating)
6060
}
6161

6262
@ColorInt
6363
fun androidTextColorSecondary(context: Context): Int {
64-
return getAndroidColorAttr(context, R.attr.textColorSecondary)
64+
return getAndroidColorAttr(context, android.R.attr.textColorSecondary)
6565
}
6666

6767
@ColorInt
@@ -78,7 +78,7 @@ object Resources {
7878
val p = PopupMenu(context, null)
7979
p.menuInflater.inflate(id, p.menu)
8080
val menu = p.menu
81-
for (i in 0 until menu.size()) {
81+
for (i in 0 until menu.size) {
8282
items.add(menu[i])
8383
}
8484
return items

‎files/src/main/java/com/kylecorry/andromeda/files/AssetFileSystem.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,12 @@ import java.lang.Exception
1010

1111
class AssetFileSystem(private val context: Context) {
1212

13-
@Suppress("BlockingMethodInNonBlockingContext")
1413
suspend fun read(path: String): String = withContext(Dispatchers.IO) {
1514
stream(path).use {
1615
it.bufferedReader().readText()
1716
}
1817
}
1918

20-
@Suppress("BlockingMethodInNonBlockingContext")
2119
suspend fun stream(path: String): InputStream = withContext(Dispatchers.IO) {
2220
context.assets.open(path)
2321
}

‎files/src/main/java/com/kylecorry/andromeda/files/ExternalFileSystem.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.kylecorry.andromeda.files
22

3+
import android.annotation.SuppressLint
34
import android.content.Context
45
import android.net.Uri
56
import android.provider.OpenableColumns
@@ -14,7 +15,6 @@ import java.lang.Exception
1415

1516
class ExternalFileSystem(private val context: Context) {
1617

17-
@Suppress("BlockingMethodInNonBlockingContext")
1818
suspend fun read(uri: Uri): String? {
1919
return withContext(Dispatchers.IO) {
2020
val inputStream = stream(uri)
@@ -29,14 +29,13 @@ class ExternalFileSystem(private val context: Context) {
2929
}
3030
}
3131

32-
@Suppress("BlockingMethodInNonBlockingContext")
32+
@SuppressLint("Recycle")
3333
suspend fun stream(uri: Uri): InputStream? {
3434
return withContext(Dispatchers.IO) {
3535
context.contentResolver.openInputStream(uri)
3636
}
3737
}
3838

39-
@Suppress("BlockingMethodInNonBlockingContext")
4039
suspend fun write(uri: Uri, text: String): Boolean {
4140
return withContext(Dispatchers.IO) {
4241
val stream = outputStream(uri) ?: return@withContext false
@@ -52,7 +51,7 @@ class ExternalFileSystem(private val context: Context) {
5251
}
5352
}
5453

55-
@Suppress("BlockingMethodInNonBlockingContext")
54+
@SuppressLint("Recycle")
5655
suspend fun outputStream(uri: Uri): OutputStream? {
5756
return withContext(Dispatchers.IO) {
5857
try {

0 commit comments

Comments
 (0)