diff --git a/core/filters/src/main/java/ru/tech/imageresizershrinker/core/filters/domain/model/Filter.kt b/core/filters/src/main/java/ru/tech/imageresizershrinker/core/filters/domain/model/Filter.kt index 78e58cdb5..0db1bbe67 100644 --- a/core/filters/src/main/java/ru/tech/imageresizershrinker/core/filters/domain/model/Filter.kt +++ b/core/filters/src/main/java/ru/tech/imageresizershrinker/core/filters/domain/model/Filter.kt @@ -207,8 +207,8 @@ interface Filter : VisibilityOwner { interface EqualizeHistogramAdaptiveHSV : TripleFilter interface EqualizeHistogramAdaptiveHSL : TripleFilter interface LinearBoxBlur : PairFilter - interface LinearTentBlur : PairFilter - interface LinearGaussianBoxBlur : PairFilter + interface LinearTentBlur : PairFilter + interface LinearGaussianBoxBlur : PairFilter interface LinearStackBlur : PairFilter interface GaussianBoxBlur : Filter interface LinearFastGaussianBlurNext : TripleFilter diff --git a/core/filters/src/main/java/ru/tech/imageresizershrinker/core/filters/presentation/model/UiGaussianBoxBlurFilter.kt b/core/filters/src/main/java/ru/tech/imageresizershrinker/core/filters/presentation/model/UiGaussianBoxBlurFilter.kt index 538274432..1de6eceb4 100644 --- a/core/filters/src/main/java/ru/tech/imageresizershrinker/core/filters/presentation/model/UiGaussianBoxBlurFilter.kt +++ b/core/filters/src/main/java/ru/tech/imageresizershrinker/core/filters/presentation/model/UiGaussianBoxBlurFilter.kt @@ -28,7 +28,7 @@ class UiGaussianBoxBlurFilter( value = value, paramsInfo = listOf( FilterParam( - title = R.string.radius, + title = R.string.sigma, valueRange = 1f..300f, roundTo = 0 ) diff --git a/core/filters/src/main/java/ru/tech/imageresizershrinker/core/filters/presentation/model/UiLinearGaussianBoxBlurFilter.kt b/core/filters/src/main/java/ru/tech/imageresizershrinker/core/filters/presentation/model/UiLinearGaussianBoxBlurFilter.kt index 33804f994..d94966134 100644 --- a/core/filters/src/main/java/ru/tech/imageresizershrinker/core/filters/presentation/model/UiLinearGaussianBoxBlurFilter.kt +++ b/core/filters/src/main/java/ru/tech/imageresizershrinker/core/filters/presentation/model/UiLinearGaussianBoxBlurFilter.kt @@ -23,13 +23,13 @@ import ru.tech.imageresizershrinker.core.filters.domain.model.TransferFunc import ru.tech.imageresizershrinker.core.resources.R class UiLinearGaussianBoxBlurFilter( - override val value: Pair = 10 to TransferFunc.SRGB -) : UiFilter>( + override val value: Pair = 10f to TransferFunc.SRGB +) : UiFilter>( title = R.string.linear_gaussian_box_blur, value = value, paramsInfo = listOf( FilterParam( - title = R.string.radius, + title = R.string.sigma, valueRange = 1f..300f, roundTo = 0 ), diff --git a/core/filters/src/main/java/ru/tech/imageresizershrinker/core/filters/presentation/model/UiLinearTentBlurFilter.kt b/core/filters/src/main/java/ru/tech/imageresizershrinker/core/filters/presentation/model/UiLinearTentBlurFilter.kt index dbba94be3..114de00d6 100644 --- a/core/filters/src/main/java/ru/tech/imageresizershrinker/core/filters/presentation/model/UiLinearTentBlurFilter.kt +++ b/core/filters/src/main/java/ru/tech/imageresizershrinker/core/filters/presentation/model/UiLinearTentBlurFilter.kt @@ -24,13 +24,13 @@ import ru.tech.imageresizershrinker.core.filters.domain.model.TransferFunc import ru.tech.imageresizershrinker.core.resources.R class UiLinearTentBlurFilter( - override val value: Pair = 11 to TransferFunc.SRGB -) : UiFilter>( + override val value: Pair = 11f to TransferFunc.SRGB +) : UiFilter>( title = R.string.linear_tent_blur, value = value, paramsInfo = listOf( FilterParam( - title = R.string.radius, + title = R.string.sigma, valueRange = 1f..300f, roundTo = NEAREST_ODD_ROUNDING ), diff --git a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/data/model/GaussianBoxBlurFilter.kt b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/data/model/GaussianBoxBlurFilter.kt index 583ab44c1..fdafd9160 100644 --- a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/data/model/GaussianBoxBlurFilter.kt +++ b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/data/model/GaussianBoxBlurFilter.kt @@ -22,7 +22,6 @@ import com.awxkee.aire.Aire import ru.tech.imageresizershrinker.core.domain.model.IntegerSize import ru.tech.imageresizershrinker.core.domain.transformation.Transformation import ru.tech.imageresizershrinker.core.filters.domain.model.Filter -import kotlin.math.roundToInt internal class GaussianBoxBlurFilter( override val value: Float = 10f @@ -36,7 +35,7 @@ internal class GaussianBoxBlurFilter( size: IntegerSize ): Bitmap = Aire.gaussianBoxBlur( bitmap = input, - radius = value.roundToInt() + sigma = value ) } \ No newline at end of file diff --git a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/data/model/LinearGaussianBoxBlurFilter.kt b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/data/model/LinearGaussianBoxBlurFilter.kt index e651ec3bc..ce6d2bbb1 100644 --- a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/data/model/LinearGaussianBoxBlurFilter.kt +++ b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/data/model/LinearGaussianBoxBlurFilter.kt @@ -26,7 +26,7 @@ import ru.tech.imageresizershrinker.core.filters.domain.model.TransferFunc import ru.tech.imageresizershrinker.feature.filters.data.utils.toFunc internal class LinearGaussianBoxBlurFilter( - override val value: Pair = 10 to TransferFunc.SRGB + override val value: Pair = 10f to TransferFunc.SRGB ) : Transformation, Filter.LinearGaussianBoxBlur { override val cacheKey: String @@ -37,7 +37,7 @@ internal class LinearGaussianBoxBlurFilter( size: IntegerSize ): Bitmap = Aire.linearGaussianBoxBlur( bitmap = input, - radius = value.first, + sigma = value.first, transferFunction = value.second.toFunc() ) diff --git a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/data/model/LinearTentBlurFilter.kt b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/data/model/LinearTentBlurFilter.kt index b973d9692..f5ffdb237 100644 --- a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/data/model/LinearTentBlurFilter.kt +++ b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/data/model/LinearTentBlurFilter.kt @@ -28,7 +28,7 @@ import ru.tech.imageresizershrinker.core.filters.domain.model.TransferFunc import ru.tech.imageresizershrinker.feature.filters.data.utils.toFunc internal class LinearTentBlurFilter( - override val value: Pair = 11 to TransferFunc.SRGB, + override val value: Pair = 11f to TransferFunc.SRGB, ) : Transformation, Filter.LinearTentBlur { override val cacheKey: String @@ -39,7 +39,7 @@ internal class LinearTentBlurFilter( size: IntegerSize, ): Bitmap = Aire.linearTentBlur( bitmap = input, - radius = value.first.toFloat().roundTo(NEAREST_ODD_ROUNDING).toInt(), + sigma = value.first.roundTo(NEAREST_ODD_ROUNDING), transferFunction = value.second.toFunc() ) diff --git a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/data/model/TentBlurFilter.kt b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/data/model/TentBlurFilter.kt index b1198215c..4bb4bdcd3 100644 --- a/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/data/model/TentBlurFilter.kt +++ b/feature/filters/src/main/java/ru/tech/imageresizershrinker/feature/filters/data/model/TentBlurFilter.kt @@ -37,7 +37,7 @@ internal class TentBlurFilter( size: IntegerSize, ): Bitmap = Aire.tentBlur( bitmap = input, - radius = value.roundTo(NEAREST_ODD_ROUNDING).toInt() + sigma = value.roundTo(NEAREST_ODD_ROUNDING) ) } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e37de680b..833ab9dfd 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,8 +3,8 @@ androidMinSdk = "21" androidTargetSdk = "36" androidCompileSdk = "36" -versionName = "3.2.1-alpha02" -versionCode = "173" +versionName = "3.2.1-alpha03" +versionCode = "174" jvmTarget = "17" @@ -18,7 +18,7 @@ logger = "1.0.2" avifCoder = "2.1.0" avifCoderCoil = "2.1.0" -aire = "0.15.6" +aire = "0.16.0" jxlCoder = "2.4.0.7" jxlCoderCoil = "2.4.0.7" jpegliCoder = "1.0.1" @@ -42,7 +42,7 @@ detektCompose = "0.4.22" decompose = "3.3.0" kotlin = "2.1.20" -agp = "8.9.1" +agp = "8.9.2" hilt = "2.56.2" gms = "4.4.2" @@ -67,7 +67,7 @@ documentfile = "1.0.1" uiautomator = "2.3.0" androidxMacroBenchmark = "1.4.0-alpha11" -material = "1.13.0-alpha12" +material = "1.13.0-alpha13" jsoup = "1.19.1" mlkitDocumentScanner = "16.0.0-beta1"