android/ImageToolbox
1
0
Fork 0
mirror of https://github.com/T8RIN/ImageToolbox.git synced 2025-05-17 13:35:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Code refactor

Browse Source
This commit is contained in:
T8RIN
2025-04-28 08:44:26 +03:00
parent 2e6d1b3df3
commit 16d6503761
15 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/filters/src/main/java/ru/tech/imageresizershrinker/core/filters/presentation/widget/FilterTemplateInfoSheet.kt
View File

@ -364,7 +364,7 @@ internal fun FilterTemplateInfoSheet(
shape = ContainerShapeDefaults.bottomShape,
startIcon = Icons.Rounded.Save,
onClick = {
saveLauncher.create(onRequestTemplateFilename())
saveLauncher.make(onRequestTemplateFilename())
},
titleFontStyle = PreferenceItemDefaults.TitleFontStyleCentered
)

26
core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/content_pickers/FileCreator.kt → core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/utils/content_pickers/FileMaker.kt
View File

@ -1,7 +1,6 @@
package ru.tech.imageresizershrinker.core.ui.utils.content_pickers
import android.content.ActivityNotFoundException
import android.content.Context
import android.net.Uri
import androidx.activity.compose.ManagedActivityResultLauncher
import androidx.activity.compose.rememberLauncherForActivityResult
@ -11,26 +10,24 @@ import androidx.compose.runtime.Immutable
import androidx.compose.runtime.Stable
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext
import com.t8rin.logger.makeLog
import ru.tech.imageresizershrinker.core.ui.utils.provider.rememberLocalEssentials
private data class FileCreatorImpl(
val context: Context,
private data class FileMakerImpl(
val createDocument: ManagedActivityResultLauncher<String, Uri?>,
val onFailure: (Throwable) -> Unit
) : FileCreator {
) : FileMaker {
override fun create(name: String) {
"File Creator Start".makeLog()
override fun make(name: String) {
"File Make Start".makeLog()
runCatching {
createDocument.launch(name)
}.onFailure {
it.makeLog("File Creator Failure")
it.makeLog("File Make Failure")
onFailure(it)
}.onSuccess {
"File Creator Success".makeLog()
"File Make Success".makeLog()
}
}
@ -39,8 +36,8 @@ private data class FileCreatorImpl(
@Stable
@Immutable
interface FileCreator {
fun create(name: String)
interface FileMaker {
fun make(name: String)
}
@Composable
@ -48,9 +45,7 @@ fun rememberFileCreator(
mimeType: String = DefaultMimeType,
onFailure: () -> Unit = {},
onSuccess: (Uri) -> Unit,
): FileCreator {
val context = LocalContext.current
): FileMaker {
val createDocument = rememberLauncherForActivityResult(
contract = ActivityResultContracts.CreateDocument(mimeType),
onResult = { uri ->
@ -65,8 +60,7 @@ fun rememberFileCreator(
return remember(createDocument) {
derivedStateOf {
FileCreatorImpl(
context = context,
FileMakerImpl(
createDocument = createDocument,
onFailure = {
onFailure()

2
core/ui/src/main/kotlin/ru/tech/imageresizershrinker/core/ui/widget/dialogs/OneTimeSaveLocationSelectionDialog.kt
View File

@ -338,7 +338,7 @@ fun OneTimeSaveLocationSelectionDialog(
shape = ContainerShapeDefaults.defaultShape,
titleFontStyle = PreferenceItemDefaults.TitleFontStyleSmall,
onClick = {
createLauncher.create("$imageString.${formatForFilenameSelection.extension}")
createLauncher.make("$imageString.${formatForFilenameSelection.extension}")
},
modifier = Modifier
.fillMaxWidth()