Lemmy/Raccoon
1
0
Fork 0
mirror of https://github.com/LiveFastEatTrashRaccoon/RaccoonForLemmy.git synced 2025-02-02 00:36:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: use different error message if autofill title empty (#158)

Browse Source 
* update l10n

* use different error message in autofill when metadata title empty
This commit is contained in:
Dieguitux 2024-12-11 09:47:31 +01:00 committed by GitHub
parent ed7aa91a03
commit 8ba43210a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 49 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/l10n/src/commonMain/kotlin/com/livefast/eattrash/raccoonforlemmy/core/l10n/messages/DefaultStrings.kt
View File

@ -447,4 +447,5 @@ internal open class DefaultStrings : Strings {
}
override val settingsAboutMatrix = "Join Matrix room"
override val messageNoResult = "Oops… no result found!"
}

1
core/l10n/src/commonMain/kotlin/com/livefast/eattrash/raccoonforlemmy/core/l10n/messages/ItStrings.kt
View File

@ -462,4 +462,5 @@ internal val ItStrings =
}
override val settingsAboutMatrix = "Entra nella room Matrix"
override val messageNoResult = "Ops… nessun risultato trovato!"
}

1
core/l10n/src/commonMain/kotlin/com/livefast/eattrash/raccoonforlemmy/core/l10n/messages/Strings.kt
View File

@ -441,6 +441,7 @@ interface Strings {
fun inboxNotificationContent(count: Int): String
val settingsAboutMatrix: String
val messageNoResult: String
}
object Locales {

52
unit/createpost/src/commonMain/kotlin/com/livefast/eattrash/raccoonforlemmy/unit/createpost/CreatePostMviModel.kt
View File

@ -17,15 +17,25 @@ interface CreatePostMviModel :
MviModel<CreatePostMviModel.Intent, CreatePostMviModel.UiState, CreatePostMviModel.Effect>,
ScreenModel {
sealed interface Intent {
data class SetCommunity(val value: CommunityModel) : Intent
data class SetCommunity(
val value: CommunityModel,
) : Intent
data class SetTitle(val value: String) : Intent
data class SetTitle(
val value: String,
) : Intent
data class SetUrl(val value: String) : Intent
data class SetUrl(
val value: String,
) : Intent
data class ChangeNsfw(val value: Boolean) : Intent
data class ChangeNsfw(
val value: Boolean,
) : Intent
data class ImageSelected(val value: ByteArray) : Intent {
data class ImageSelected(
val value: ByteArray,
) : Intent {
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other == null || this::class != other::class) return false
@ -35,12 +45,12 @@ interface CreatePostMviModel :
return value.contentEquals(other.value)
}
override fun hashCode(): Int {
return value.contentHashCode()
}
override fun hashCode(): Int = value.contentHashCode()
}
data class InsertImageInBody(val value: ByteArray) : Intent {
data class InsertImageInBody(
val value: ByteArray,
) : Intent {
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (other == null || this::class != other::class) return false
@ -50,16 +60,20 @@ interface CreatePostMviModel :
return value.contentEquals(other.value)
}
override fun hashCode(): Int {
return value.contentHashCode()
}
override fun hashCode(): Int = value.contentHashCode()
}
data class ChangeSection(val value: CreatePostSection) : Intent
data class ChangeSection(
val value: CreatePostSection,
) : Intent
data class ChangeLanguage(val value: Long?) : Intent
data class ChangeLanguage(
val value: Long?,
) : Intent
data class ChangeBodyValue(val value: TextFieldValue) : Intent
data class ChangeBodyValue(
val value: TextFieldValue,
) : Intent
data object Send : Intent
@ -100,10 +114,14 @@ interface CreatePostMviModel :
sealed interface Effect {
data object Success : Effect
data class Failure(val message: String?) : Effect
data class Failure(
val message: String?,
) : Effect
data object DraftSaved : Effect
data object AutoFillFailed : Effect
data object AutoFillError : Effect
data object AutoFillEmpty : Effect
}
}

10
unit/createpost/src/commonMain/kotlin/com/livefast/eattrash/raccoonforlemmy/unit/createpost/CreatePostScreen.kt
View File

@ -110,6 +110,7 @@ class CreatePostScreen(
val uiState by model.uiState.collectAsState()
val snackbarHostState = remember { SnackbarHostState() }
val genericError = LocalStrings.current.messageGenericError
val autofillEmpty = LocalStrings.current.messageNoResult
val notificationCenter = remember { getNotificationCenter() }
val galleryHelper = remember { getGalleryHelper() }
val crossPostText = LocalStrings.current.createPostCrossPostText
@ -204,9 +205,8 @@ class CreatePostScreen(
model.effects
.onEach { effect ->
when (effect) {
is CreatePostMviModel.Effect.Failure -> {
is CreatePostMviModel.Effect.Failure ->
snackbarHostState.showSnackbar(effect.message ?: genericError)
}
CreatePostMviModel.Effect.Success -> {
notificationCenter.send(
@ -217,9 +217,11 @@ class CreatePostScreen(
CreatePostMviModel.Effect.DraftSaved -> navigationCoordinator.popScreen()
CreatePostMviModel.Effect.AutoFillFailed -> {
CreatePostMviModel.Effect.AutoFillError ->
snackbarHostState.showSnackbar(genericError)
}
CreatePostMviModel.Effect.AutoFillEmpty ->
snackbarHostState.showSnackbar(autofillEmpty)
}
}.launchIn(this)
}

10
unit/createpost/src/commonMain/kotlin/com/livefast/eattrash/raccoonforlemmy/unit/createpost/CreatePostViewModel.kt
View File

@ -399,12 +399,12 @@ class CreatePostViewModel(
screenModelScope.launch {
updateState { it.copy(loading = true) }
val metadata = siteRepository.getMetadata(url)
val suggestedTitle = metadata?.title.takeUnless { it.isNullOrBlank() }
updateState { it.copy(loading = false) }
if (suggestedTitle == null) {
emitEffect(CreatePostMviModel.Effect.AutoFillFailed)
} else {
updateState { it.copy(title = suggestedTitle) }
when {
metadata == null -> emitEffect(CreatePostMviModel.Effect.AutoFillError)
metadata.title.isEmpty() -> emitEffect(CreatePostMviModel.Effect.AutoFillEmpty)
else -> updateState { it.copy(title = metadata.title) }
}
}
}