From be62248b718c46b75ba6960c0d2dbb0e8f3aa38d Mon Sep 17 00:00:00 2001 From: T8RIN Date: Thu, 25 May 2023 11:21:42 +0300 Subject: [PATCH] #236 added --- .../batch_resize_screen/BatchResizeScreen.kt | 2 +- .../bytes_resize_screen/BytesResizeScreen.kt | 2 +- .../crop_screen/CropScreen.kt | 16 ++++++++++++++-- .../delete_exif_screen/DeleteExifScreen.kt | 2 +- .../sheets}/PickImageFromUrisSheet.kt | 3 +-- build.gradle.kts | 2 +- 6 files changed, 19 insertions(+), 8 deletions(-) rename app/src/main/java/ru/tech/imageresizershrinker/{batch_resize_screen/components => widget/sheets}/PickImageFromUrisSheet.kt (98%) diff --git a/app/src/main/java/ru/tech/imageresizershrinker/batch_resize_screen/BatchResizeScreen.kt b/app/src/main/java/ru/tech/imageresizershrinker/batch_resize_screen/BatchResizeScreen.kt index 471da2af1..ff2585721 100644 --- a/app/src/main/java/ru/tech/imageresizershrinker/batch_resize_screen/BatchResizeScreen.kt +++ b/app/src/main/java/ru/tech/imageresizershrinker/batch_resize_screen/BatchResizeScreen.kt @@ -92,7 +92,7 @@ import com.t8rin.dynamic.theme.LocalDynamicThemeState import kotlinx.coroutines.delay import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.R -import ru.tech.imageresizershrinker.batch_resize_screen.components.PickImageFromUrisSheet +import ru.tech.imageresizershrinker.widget.sheets.PickImageFromUrisSheet import ru.tech.imageresizershrinker.batch_resize_screen.components.SaveExifWidget import ru.tech.imageresizershrinker.batch_resize_screen.viewModel.BatchResizeViewModel import ru.tech.imageresizershrinker.theme.outlineVariant diff --git a/app/src/main/java/ru/tech/imageresizershrinker/bytes_resize_screen/BytesResizeScreen.kt b/app/src/main/java/ru/tech/imageresizershrinker/bytes_resize_screen/BytesResizeScreen.kt index e981ae244..1abaa33a5 100644 --- a/app/src/main/java/ru/tech/imageresizershrinker/bytes_resize_screen/BytesResizeScreen.kt +++ b/app/src/main/java/ru/tech/imageresizershrinker/bytes_resize_screen/BytesResizeScreen.kt @@ -95,7 +95,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel import com.t8rin.dynamic.theme.LocalDynamicThemeState import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.R -import ru.tech.imageresizershrinker.batch_resize_screen.components.PickImageFromUrisSheet +import ru.tech.imageresizershrinker.widget.sheets.PickImageFromUrisSheet import ru.tech.imageresizershrinker.batch_resize_screen.components.SaveExifWidget import ru.tech.imageresizershrinker.bytes_resize_screen.viewModel.BytesResizeViewModel import ru.tech.imageresizershrinker.theme.outlineVariant diff --git a/app/src/main/java/ru/tech/imageresizershrinker/crop_screen/CropScreen.kt b/app/src/main/java/ru/tech/imageresizershrinker/crop_screen/CropScreen.kt index f45aaa253..7bf356ef9 100644 --- a/app/src/main/java/ru/tech/imageresizershrinker/crop_screen/CropScreen.kt +++ b/app/src/main/java/ru/tech/imageresizershrinker/crop_screen/CropScreen.kt @@ -102,6 +102,7 @@ import ru.tech.imageresizershrinker.utils.helper.compressFormat import ru.tech.imageresizershrinker.utils.helper.extension import ru.tech.imageresizershrinker.utils.modifier.drawHorizontalStroke import ru.tech.imageresizershrinker.utils.modifier.fabBorder +import ru.tech.imageresizershrinker.utils.modifier.navBarsPaddingOnlyIfTheyAtTheBottom import ru.tech.imageresizershrinker.utils.modifier.navBarsPaddingOnlyIfTheyAtTheEnd import ru.tech.imageresizershrinker.utils.storage.LocalFileController import ru.tech.imageresizershrinker.utils.storage.Picker @@ -253,11 +254,11 @@ fun CropScreen( var crop by remember { mutableStateOf(false) } var share by remember { mutableStateOf(false) } var save by remember { mutableStateOf(false) } - val content: @Composable (PaddingValues) -> Unit = { + val content: @Composable (PaddingValues) -> Unit = { paddingValues -> Box( Modifier .fillMaxSize() - .padding(it) + .padding(paddingValues) .nestedScroll(scrollBehavior.nestedScrollConnection) ) { Column(horizontalAlignment = Alignment.CenterHorizontally) { @@ -470,6 +471,17 @@ fun CropScreen( ) { aspect -> viewModel.setCropAspectRatio(aspect.aspectRatio) } + ExtensionGroup( + modifier = Modifier + .padding(16.dp) + .navBarsPaddingOnlyIfTheyAtTheBottom(), + orientation = Orientation.Horizontal, + enabled = viewModel.bitmap != null, + mime = viewModel.mimeType, + onMimeChange = { + viewModel.updateMimeType(it) + } + ) Box( Modifier .fillMaxHeight() diff --git a/app/src/main/java/ru/tech/imageresizershrinker/delete_exif_screen/DeleteExifScreen.kt b/app/src/main/java/ru/tech/imageresizershrinker/delete_exif_screen/DeleteExifScreen.kt index 2bef8b0c4..c4a8fc82f 100644 --- a/app/src/main/java/ru/tech/imageresizershrinker/delete_exif_screen/DeleteExifScreen.kt +++ b/app/src/main/java/ru/tech/imageresizershrinker/delete_exif_screen/DeleteExifScreen.kt @@ -80,7 +80,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel import com.t8rin.dynamic.theme.LocalDynamicThemeState import kotlinx.coroutines.launch import ru.tech.imageresizershrinker.R -import ru.tech.imageresizershrinker.batch_resize_screen.components.PickImageFromUrisSheet +import ru.tech.imageresizershrinker.widget.sheets.PickImageFromUrisSheet import ru.tech.imageresizershrinker.delete_exif_screen.viewModel.DeleteExifViewModel import ru.tech.imageresizershrinker.theme.outlineVariant import ru.tech.imageresizershrinker.utils.LocalConfettiController diff --git a/app/src/main/java/ru/tech/imageresizershrinker/batch_resize_screen/components/PickImageFromUrisSheet.kt b/app/src/main/java/ru/tech/imageresizershrinker/widget/sheets/PickImageFromUrisSheet.kt similarity index 98% rename from app/src/main/java/ru/tech/imageresizershrinker/batch_resize_screen/components/PickImageFromUrisSheet.kt rename to app/src/main/java/ru/tech/imageresizershrinker/widget/sheets/PickImageFromUrisSheet.kt index 5b9d8b3cf..414aca5e9 100644 --- a/app/src/main/java/ru/tech/imageresizershrinker/batch_resize_screen/components/PickImageFromUrisSheet.kt +++ b/app/src/main/java/ru/tech/imageresizershrinker/widget/sheets/PickImageFromUrisSheet.kt @@ -1,4 +1,4 @@ -package ru.tech.imageresizershrinker.batch_resize_screen.components +package ru.tech.imageresizershrinker.widget.sheets import android.net.Uri import androidx.compose.foundation.BorderStroke @@ -38,7 +38,6 @@ import ru.tech.imageresizershrinker.utils.helper.BitmapInfo import ru.tech.imageresizershrinker.utils.modifier.block import ru.tech.imageresizershrinker.widget.TitleItem import ru.tech.imageresizershrinker.widget.image.Picture -import ru.tech.imageresizershrinker.widget.sheets.SimpleSheet import ru.tech.imageresizershrinker.widget.utils.LocalSettingsState @Composable diff --git a/build.gradle.kts b/build.gradle.kts index ae9636e56..ba3ac9056 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:8.0.1") + classpath("com.android.tools.build:gradle:8.0.2") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21") classpath("com.google.dagger:hilt-android-gradle-plugin:2.46.1") }