Remove obsolete min SDK checks

This commit is contained in:
MM20 2021-09-23 16:56:18 +02:00
parent b83c70e3b4
commit d19b16f7b3
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
3 changed files with 13 additions and 24 deletions

View File

@ -360,9 +360,7 @@ open class File(
metaData.add(R.string.file_meta_app_name to pkgInfo.applicationInfo.loadLabel(context.packageManager).toString()) metaData.add(R.string.file_meta_app_name to pkgInfo.applicationInfo.loadLabel(context.packageManager).toString())
metaData.add(R.string.file_meta_app_pkgname to pkgInfo.packageName) metaData.add(R.string.file_meta_app_pkgname to pkgInfo.packageName)
metaData.add(R.string.file_meta_app_version to pkgInfo.versionName) metaData.add(R.string.file_meta_app_version to pkgInfo.versionName)
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { metaData.add(R.string.file_meta_app_min_sdk to pkgInfo.applicationInfo.minSdkVersion.toString())
metaData.add(R.string.file_meta_app_min_sdk to pkgInfo.applicationInfo.minSdkVersion.toString())
}
} }
} }
return metaData return metaData

View File

@ -61,16 +61,14 @@ object WallpaperBlur {
val out = FileOutputStream(File(context.cacheDir, "wallpaper")) val out = FileOutputStream(File(context.cacheDir, "wallpaper"))
resource.compress(Bitmap.CompressFormat.PNG, 100, out) resource.compress(Bitmap.CompressFormat.PNG, 100, out)
out.close() out.close()
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { context.getSharedPreferences("wallpaper", Context.MODE_PRIVATE)
context.getSharedPreferences("wallpaper", Context.MODE_PRIVATE) .edit()
.edit() .putInt(
.putInt( "last_wallpaper_id", wm.getWallpaperId(
"last_wallpaper_id", wm.getWallpaperId( WallpaperManager.FLAG_SYSTEM
WallpaperManager.FLAG_SYSTEM
)
) )
.apply() )
} .apply()
if (LauncherPreferences.instance.blurCards && LauncherPreferences.instance.cardOpacity < 0xFF) { if (LauncherPreferences.instance.blurCards && LauncherPreferences.instance.cardOpacity < 0xFF) {
blurredWallpaper = resource blurredWallpaper = resource

View File

@ -29,19 +29,12 @@ class CurrencyConverter(context: Context) : Converter() {
private fun formatName(symbol: String, value: Double): String { private fun formatName(symbol: String, value: Double): String {
val text = StringBuilder() val text = StringBuilder()
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { val currency = Currency.getInstance(symbol) ?: return formatNameFallback(symbol)
val currency = Currency.getInstance(symbol) ?: return formatNameFallback(symbol) val pluralCount = PluralRules.forLocale(Locale.getDefault()).select(value)
val pluralCount = PluralRules.forLocale(Locale.getDefault()).select(value) text.append(currency.getName(Locale.getDefault(), Currency.PLURAL_LONG_NAME, pluralCount, booleanArrayOf(false)))
text.append(currency.getName(Locale.getDefault(), Currency.PLURAL_LONG_NAME, pluralCount, booleanArrayOf(false))) .append(" ")
.append(" ") .append(repository.getFlag(symbol))
.append(repository.getFlag(symbol))
} else {
val currency = JCurrency.getInstance(symbol) ?: return formatNameFallback(symbol)
text.append(currency.displayName)
.append(" ")
.append(repository.getFlag(symbol))
}
return text.toString() return text.toString()
} }