kopia lustrzana https://github.com/vitorpamplona/amethyst
Only shows OTS to the respective Edit
rodzic
410d6bd690
commit
25f28d38d5
|
@ -687,6 +687,7 @@ fun NoteBody(
|
|||
if (showSecondRow) {
|
||||
SecondUserInfoRow(
|
||||
baseNote,
|
||||
editState,
|
||||
accountViewModel,
|
||||
nav,
|
||||
)
|
||||
|
@ -1035,6 +1036,7 @@ private fun ReplyNoteComposition(
|
|||
@Composable
|
||||
fun SecondUserInfoRow(
|
||||
note: Note,
|
||||
editState: State<GenericLoadable<EditState>>,
|
||||
accountViewModel: AccountViewModel,
|
||||
nav: (String) -> Unit,
|
||||
) {
|
||||
|
@ -1069,7 +1071,22 @@ fun SecondUserInfoRow(
|
|||
DisplayPoW(pow)
|
||||
}
|
||||
|
||||
DisplayOts(note, accountViewModel)
|
||||
DisplayOtsIfInOriginal(note, editState, accountViewModel)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun DisplayOtsIfInOriginal(
|
||||
note: Note,
|
||||
editState: State<GenericLoadable<EditState>>,
|
||||
accountViewModel: AccountViewModel,
|
||||
) {
|
||||
val editState = (editState.value as? GenericLoadable.Loaded<EditState>)?.loaded?.modificationToShow?.value
|
||||
|
||||
if (editState == null) {
|
||||
DisplayOts(note = note, accountViewModel = accountViewModel)
|
||||
} else {
|
||||
DisplayOts(note = editState, accountViewModel = accountViewModel)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -92,6 +92,7 @@ import com.vitorpamplona.amethyst.ui.components.ObserveDisplayNip05Status
|
|||
import com.vitorpamplona.amethyst.ui.components.mockAccountViewModel
|
||||
import com.vitorpamplona.amethyst.ui.navigation.routeToMessage
|
||||
import com.vitorpamplona.amethyst.ui.note.BlankNote
|
||||
import com.vitorpamplona.amethyst.ui.note.DisplayOtsIfInOriginal
|
||||
import com.vitorpamplona.amethyst.ui.note.HiddenNote
|
||||
import com.vitorpamplona.amethyst.ui.note.LoadAddressableNote
|
||||
import com.vitorpamplona.amethyst.ui.note.NoteAuthorPicture
|
||||
|
@ -105,7 +106,6 @@ import com.vitorpamplona.amethyst.ui.note.elements.DisplayEditStatus
|
|||
import com.vitorpamplona.amethyst.ui.note.elements.DisplayFollowingCommunityInPost
|
||||
import com.vitorpamplona.amethyst.ui.note.elements.DisplayFollowingHashtagsInPost
|
||||
import com.vitorpamplona.amethyst.ui.note.elements.DisplayLocation
|
||||
import com.vitorpamplona.amethyst.ui.note.elements.DisplayOts
|
||||
import com.vitorpamplona.amethyst.ui.note.elements.DisplayPoW
|
||||
import com.vitorpamplona.amethyst.ui.note.elements.DisplayReward
|
||||
import com.vitorpamplona.amethyst.ui.note.elements.DisplayZapSplits
|
||||
|
@ -468,7 +468,7 @@ fun NoteMaster(
|
|||
DisplayPoW(pow)
|
||||
}
|
||||
|
||||
DisplayOts(note, accountViewModel)
|
||||
DisplayOtsIfInOriginal(note, editState, accountViewModel)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Ładowanie…
Reference in New Issue