fix collages and improve histograms

T8RIN · Sep 18, 2024 · 10b71e9 · 10b71e9
1 parent 094f275
commit 10b71e9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/ImagePager.kt b/core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/image/ImagePager.kt
@@ -88,7 +88,7 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
-import com.t8rin.histogram.HistogramRGB
+import com.t8rin.histogram.ImageHistogram
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import net.engawapg.lib.zoomable.rememberZoomState
@@ -188,7 +188,7 @@ fun ImagePager(
             val moreThanOneUri = (uris?.size ?: 0) > 1
 
             val histogram: @Composable () -> Unit = {
-                HistogramRGB(
+                ImageHistogram(
                     imageUri = uris?.getOrNull(pagerState.currentPage) ?: Uri.EMPTY,
                     modifier = Modifier
                         .height(50.dp)

diff --git a/...src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/FiltersContent.kt b/...src/main/java/ru/tech/imageresizershrinker/feature/filters/presentation/FiltersContent.kt
@@ -96,7 +96,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.t8rin.dynamic.theme.LocalDynamicThemeState
 import com.t8rin.dynamic.theme.rememberAppColorTuple
-import com.t8rin.histogram.HistogramRGB
+import com.t8rin.histogram.ImageHistogram
 import dev.olshevski.navigation.reimagined.hilt.hiltViewModel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -474,7 +474,7 @@ fun FiltersContent(
                 title = stringResource(R.string.histogram),
                 subtitle = stringResource(R.string.histogram_sub),
                 endIcon = {
-                    HistogramRGB(
+                    ImageHistogram(
                         image = viewModel.previewBitmap,
                         modifier = Modifier
                             .width(100.dp)

diff --git a/.../ru/tech/imageresizershrinker/feature/filters/presentation/components/AddEditMaskSheet.kt b/.../ru/tech/imageresizershrinker/feature/filters/presentation/components/AddEditMaskSheet.kt
@@ -76,7 +76,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
 import androidx.exifinterface.media.ExifInterface
 import androidx.lifecycle.viewModelScope
-import com.t8rin.histogram.HistogramRGB
+import com.t8rin.histogram.ImageHistogram
 import dagger.hilt.android.lifecycle.HiltViewModel
 import net.engawapg.lib.zoomable.rememberZoomState
 import ru.tech.imageresizershrinker.core.domain.dispatchers.DispatchersHolder
@@ -397,7 +397,7 @@ fun AddEditMaskSheet(
                                         title = stringResource(R.string.histogram),
                                         subtitle = stringResource(R.string.histogram_sub),
                                         endIcon = {
-                                            HistogramRGB(
+                                            ImageHistogram(
                                                 image = viewModel.previewBitmap,
                                                 modifier = Modifier
                                                     .width(100.dp)

diff --git a/...tech/imageresizershrinker/feature/media_picker/presentation/components/MediaPickerGrid.kt b/...tech/imageresizershrinker/feature/media_picker/presentation/components/MediaPickerGrid.kt
@@ -105,7 +105,7 @@ import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.core.net.toUri
-import com.t8rin.histogram.HistogramRGB
+import com.t8rin.histogram.ImageHistogram
 import com.t8rin.modalsheet.FullscreenPopup
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -385,7 +385,7 @@ fun MediaPickerGrid(
                 val moreThanOneUri = state.media.size > 1
                 val currentMedia = state.media.getOrNull(pagerState.currentPage)
                 val histogram: @Composable () -> Unit = {
-                    HistogramRGB(
+                    ImageHistogram(
                         imageUri = currentMedia?.uri?.toUri() ?: Uri.EMPTY,
                         modifier = Modifier
                             .height(50.dp)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -9,7 +9,7 @@ versionCode = "153"
 jvmTarget = "17"
 compose-compiler = "1.5.15"
 
-imageToolboxLibs = "2.6.8"
+imageToolboxLibs = "2.7.0"
 trickle = "1.1.2"
 
 avifCoder = "1.8.0"