Pixelfed
/
PixelDroid-App-Android
mirror of https://gitlab.shinice.net/pixeldroid/PixelDroid
1
0
Fork 0
Code Issues Releases Wiki Activity

Actually use story settings

This commit is contained in:
Matthieu 2023-12-27 11:46:46 +01:00
parent f3a870d83e
commit 54eb7f20ef
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/pixeldroid/app/postCreation/PostCreationViewModel.kt
View File

@ -532,12 +532,16 @@ class PostCreationViewModel(
} ?: apiHolder.api ?: apiHolder.setToCurrentUser() } ?: apiHolder.api ?: apiHolder.setToCurrentUser()
if(uiState.value.storyCreation){ if(uiState.value.storyCreation){
val canReact = if (uiState.value.storyReactions) "1" else "0"
val canReply = if (uiState.value.storyReplies) "1" else "0"
api.storyPublish( api.storyPublish(
media_id = getPhotoData().value!!.firstNotNullOf { it.uploadId }, media_id = getPhotoData().value!!.firstNotNullOf { it.uploadId },
can_react = "1", can_reply = "1", can_react = canReact,
can_reply = canReply,
duration = uiState.value.storyDuration duration = uiState.value.storyDuration
) )
} else{ } else {
api.postStatus( api.postStatus(
statusText = description, statusText = description,
media_ids = getPhotoData().value!!.mapNotNull { it.uploadId }.toList(), media_ids = getPhotoData().value!!.mapNotNull { it.uploadId }.toList(),
@ -593,6 +597,10 @@ class PostCreationViewModel(
maxEntries = newMaxEntries, maxEntries = newMaxEntries,
addPhotoButtonEnabled = (photoData.value?.size ?: 0) < (newMaxEntries ?: 0), addPhotoButtonEnabled = (photoData.value?.size ?: 0) < (newMaxEntries ?: 0),
) )
// Carousel off if in story mode
if (storyMode) newUiState = newUiState.copy(isCarousel = false)
// If switching to story, and there are too many pictures, keep the first and backup the rest // If switching to story, and there are too many pictures, keep the first and backup the rest
if (storyMode && (photoData.value?.size ?: 0) > 1){ if (storyMode && (photoData.value?.size ?: 0) > 1){
storyPhotoDataBackup = photoData.value storyPhotoDataBackup = photoData.value

8
app/src/main/java/org/pixeldroid/app/utils/api/objects/Attachment.kt
View File

@ -20,10 +20,10 @@ data class Attachment(
val text_url: String? = null, //URL val text_url: String? = null, //URL
//Pixelfed's Story upload response... TODO make the server return a regular Attachment? //Pixelfed's Story upload response... TODO make the server return a regular Attachment?
val msg: String?, val msg: String? = null,
val media_id: String?, val media_id: String? = null,
val media_url: String?, val media_url: String? = null,
val media_type: String?, val media_type: String? = null,
) : Serializable { ) : Serializable {
enum class AttachmentType: Serializable { enum class AttachmentType: Serializable {
unknown, image, gifv, video, audio unknown, image, gifv, video, audio