mirror of
https://github.com/T8RIN/ImageToolbox.git
synced 2025-08-06 15:49:35 +08:00
#236 added
This commit is contained in:
@ -92,7 +92,7 @@ import com.t8rin.dynamic.theme.LocalDynamicThemeState
|
|||||||
import kotlinx.coroutines.delay
|
import kotlinx.coroutines.delay
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import ru.tech.imageresizershrinker.R
|
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.components.SaveExifWidget
|
||||||
import ru.tech.imageresizershrinker.batch_resize_screen.viewModel.BatchResizeViewModel
|
import ru.tech.imageresizershrinker.batch_resize_screen.viewModel.BatchResizeViewModel
|
||||||
import ru.tech.imageresizershrinker.theme.outlineVariant
|
import ru.tech.imageresizershrinker.theme.outlineVariant
|
||||||
|
@ -95,7 +95,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
|
|||||||
import com.t8rin.dynamic.theme.LocalDynamicThemeState
|
import com.t8rin.dynamic.theme.LocalDynamicThemeState
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import ru.tech.imageresizershrinker.R
|
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.components.SaveExifWidget
|
||||||
import ru.tech.imageresizershrinker.bytes_resize_screen.viewModel.BytesResizeViewModel
|
import ru.tech.imageresizershrinker.bytes_resize_screen.viewModel.BytesResizeViewModel
|
||||||
import ru.tech.imageresizershrinker.theme.outlineVariant
|
import ru.tech.imageresizershrinker.theme.outlineVariant
|
||||||
|
@ -102,6 +102,7 @@ import ru.tech.imageresizershrinker.utils.helper.compressFormat
|
|||||||
import ru.tech.imageresizershrinker.utils.helper.extension
|
import ru.tech.imageresizershrinker.utils.helper.extension
|
||||||
import ru.tech.imageresizershrinker.utils.modifier.drawHorizontalStroke
|
import ru.tech.imageresizershrinker.utils.modifier.drawHorizontalStroke
|
||||||
import ru.tech.imageresizershrinker.utils.modifier.fabBorder
|
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.modifier.navBarsPaddingOnlyIfTheyAtTheEnd
|
||||||
import ru.tech.imageresizershrinker.utils.storage.LocalFileController
|
import ru.tech.imageresizershrinker.utils.storage.LocalFileController
|
||||||
import ru.tech.imageresizershrinker.utils.storage.Picker
|
import ru.tech.imageresizershrinker.utils.storage.Picker
|
||||||
@ -253,11 +254,11 @@ fun CropScreen(
|
|||||||
var crop by remember { mutableStateOf(false) }
|
var crop by remember { mutableStateOf(false) }
|
||||||
var share by remember { mutableStateOf(false) }
|
var share by remember { mutableStateOf(false) }
|
||||||
var save by remember { mutableStateOf(false) }
|
var save by remember { mutableStateOf(false) }
|
||||||
val content: @Composable (PaddingValues) -> Unit = {
|
val content: @Composable (PaddingValues) -> Unit = { paddingValues ->
|
||||||
Box(
|
Box(
|
||||||
Modifier
|
Modifier
|
||||||
.fillMaxSize()
|
.fillMaxSize()
|
||||||
.padding(it)
|
.padding(paddingValues)
|
||||||
.nestedScroll(scrollBehavior.nestedScrollConnection)
|
.nestedScroll(scrollBehavior.nestedScrollConnection)
|
||||||
) {
|
) {
|
||||||
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
||||||
@ -470,6 +471,17 @@ fun CropScreen(
|
|||||||
) { aspect ->
|
) { aspect ->
|
||||||
viewModel.setCropAspectRatio(aspect.aspectRatio)
|
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(
|
Box(
|
||||||
Modifier
|
Modifier
|
||||||
.fillMaxHeight()
|
.fillMaxHeight()
|
||||||
|
@ -80,7 +80,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
|
|||||||
import com.t8rin.dynamic.theme.LocalDynamicThemeState
|
import com.t8rin.dynamic.theme.LocalDynamicThemeState
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import ru.tech.imageresizershrinker.R
|
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.delete_exif_screen.viewModel.DeleteExifViewModel
|
||||||
import ru.tech.imageresizershrinker.theme.outlineVariant
|
import ru.tech.imageresizershrinker.theme.outlineVariant
|
||||||
import ru.tech.imageresizershrinker.utils.LocalConfettiController
|
import ru.tech.imageresizershrinker.utils.LocalConfettiController
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
package ru.tech.imageresizershrinker.batch_resize_screen.components
|
package ru.tech.imageresizershrinker.widget.sheets
|
||||||
|
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import androidx.compose.foundation.BorderStroke
|
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.utils.modifier.block
|
||||||
import ru.tech.imageresizershrinker.widget.TitleItem
|
import ru.tech.imageresizershrinker.widget.TitleItem
|
||||||
import ru.tech.imageresizershrinker.widget.image.Picture
|
import ru.tech.imageresizershrinker.widget.image.Picture
|
||||||
import ru.tech.imageresizershrinker.widget.sheets.SimpleSheet
|
|
||||||
import ru.tech.imageresizershrinker.widget.utils.LocalSettingsState
|
import ru.tech.imageresizershrinker.widget.utils.LocalSettingsState
|
||||||
|
|
||||||
@Composable
|
@Composable
|
@ -5,7 +5,7 @@ buildscript {
|
|||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
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("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21")
|
||||||
classpath("com.google.dagger:hilt-android-gradle-plugin:2.46.1")
|
classpath("com.google.dagger:hilt-android-gradle-plugin:2.46.1")
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user