mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

chore: upgrade target SDK and refactor function signatures to resolve build issues

Browse source
This commit is contained in:
Rohit Verma 2025-08-03 12:18:51 +05:30
parent 8de57304bf
commit e193360ba3
No known key found for this signature in database
GPG key ID: D64E53E770687D0E
3 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle.kts
View file

@ -18,12 +18,12 @@ if (isRunningOnTravisAndIsNotPRBuild) {
android { android {
namespace = "fr.free.nrw.commons" namespace = "fr.free.nrw.commons"
compileSdk = 34 compileSdk = 35
defaultConfig { defaultConfig {
applicationId = "fr.free.nrw.commons" applicationId = "fr.free.nrw.commons"
minSdk = 21 minSdk = 21
targetSdk = 34 targetSdk = 35
versionCode = 1055 versionCode = 1055
versionName = "5.6.1" versionName = "5.6.1"

2
app/src/main/java/fr/free/nrw/commons/utils/ConfigUtils.kt
View file

@ -12,7 +12,7 @@ object ConfigUtils {
val isBetaFlavour: Boolean = BuildConfig.FLAVOR == "beta" val isBetaFlavour: Boolean = BuildConfig.FLAVOR == "beta"
@JvmStatic @JvmStatic
private fun Context.getVersionName(): String = private fun Context.getVersionName(): String? =
try { try {
packageManager.getPackageInfo(packageName, 0).versionName packageManager.getPackageInfo(packageName, 0).versionName
} catch (e: PackageManager.NameNotFoundException) { } catch (e: PackageManager.NameNotFoundException) {

24
app/src/main/java/fr/free/nrw/commons/utils/ImageUtils.kt
View file

@ -24,6 +24,7 @@ import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.CompositeDisposable
import io.reactivex.schedulers.Schedulers import io.reactivex.schedulers.Schedulers
import timber.log.Timber import timber.log.Timber
import androidx.core.graphics.createBitmap
/** /**
* Created by blueSir9 on 3/10/17. * Created by blueSir9 on 3/10/17.
@ -307,16 +308,19 @@ object ImageUtils {
* * @return * * @return
*/ */
@JvmStatic @JvmStatic
fun addRedBorder(bitmap: Bitmap, borderSize: Int, context: Context): Bitmap { fun addRedBorder(bitmap: Bitmap, borderSize: Int, context: Context): Bitmap? {
val bmpWithBorder = Bitmap.createBitmap( return bitmap.config?.let { config ->
bitmap.width + borderSize * 2, val bmpWithBorder =
bitmap.height + borderSize * 2, createBitmap(
bitmap.config width = bitmap.width + borderSize * 2,
) height = bitmap.height + borderSize * 2,
val canvas = Canvas(bmpWithBorder) config = config
canvas.drawColor(ContextCompat.getColor(context, R.color.deleteRed)) )
canvas.drawBitmap(bitmap, borderSize.toFloat(), borderSize.toFloat(), null) val canvas = Canvas(bmpWithBorder)
return bmpWithBorder canvas.drawColor(ContextCompat.getColor(context, R.color.deleteRed))
canvas.drawBitmap(bitmap, borderSize.toFloat(), borderSize.toFloat(), null)
return bmpWithBorder
}
} }
/** /**