mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2025-10-11 08:42:47 +02:00
Refactoring
This commit is contained in:
@@ -24,7 +24,6 @@ import androidx.compose.animation.core.tween
|
|||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
import androidx.compose.foundation.layout.Box
|
import androidx.compose.foundation.layout.Box
|
||||||
import androidx.compose.foundation.layout.Column
|
import androidx.compose.foundation.layout.Column
|
||||||
import androidx.compose.foundation.layout.PaddingValues
|
|
||||||
import androidx.compose.foundation.layout.Row
|
import androidx.compose.foundation.layout.Row
|
||||||
import androidx.compose.foundation.layout.Spacer
|
import androidx.compose.foundation.layout.Spacer
|
||||||
import androidx.compose.foundation.layout.consumeWindowInsets
|
import androidx.compose.foundation.layout.consumeWindowInsets
|
||||||
@@ -90,6 +89,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.video.datasource.VideoFilte
|
|||||||
import com.vitorpamplona.amethyst.ui.stringRes
|
import com.vitorpamplona.amethyst.ui.stringRes
|
||||||
import com.vitorpamplona.amethyst.ui.theme.AuthorInfoVideoFeed
|
import com.vitorpamplona.amethyst.ui.theme.AuthorInfoVideoFeed
|
||||||
import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
|
import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
|
||||||
|
import com.vitorpamplona.amethyst.ui.theme.HalfFeedPadding
|
||||||
import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
|
import com.vitorpamplona.amethyst.ui.theme.Size20Modifier
|
||||||
import com.vitorpamplona.amethyst.ui.theme.Size22Modifier
|
import com.vitorpamplona.amethyst.ui.theme.Size22Modifier
|
||||||
import com.vitorpamplona.amethyst.ui.theme.Size35Modifier
|
import com.vitorpamplona.amethyst.ui.theme.Size35Modifier
|
||||||
@@ -281,8 +281,7 @@ private fun RenderVideoOrPictureNote(
|
|||||||
val noteEvent = remember { note.event }
|
val noteEvent = remember { note.event }
|
||||||
if (noteEvent is PictureEvent) {
|
if (noteEvent is PictureEvent) {
|
||||||
val backgroundColor = remember { mutableStateOf(Color.Transparent) }
|
val backgroundColor = remember { mutableStateOf(Color.Transparent) }
|
||||||
|
PictureDisplay(note, false, ContentScale.Fit, HalfFeedPadding, backgroundColor, accountViewModel, nav)
|
||||||
PictureDisplay(note, false, ContentScale.Fit, PaddingValues(5.dp), backgroundColor, accountViewModel, nav)
|
|
||||||
} else if (noteEvent is FileHeaderEvent) {
|
} else if (noteEvent is FileHeaderEvent) {
|
||||||
FileHeaderDisplay(note, false, ContentScale.Fit, accountViewModel)
|
FileHeaderDisplay(note, false, ContentScale.Fit, accountViewModel)
|
||||||
} else if (noteEvent is FileStorageHeaderEvent) {
|
} else if (noteEvent is FileStorageHeaderEvent) {
|
||||||
|
@@ -219,6 +219,7 @@ val EditFieldModifier =
|
|||||||
val EditFieldTrailingIconModifier = Modifier.padding(start = 5.dp, end = 0.dp)
|
val EditFieldTrailingIconModifier = Modifier.padding(start = 5.dp, end = 0.dp)
|
||||||
|
|
||||||
val ZeroPadding = PaddingValues(0.dp)
|
val ZeroPadding = PaddingValues(0.dp)
|
||||||
|
val HalfFeedPadding = PaddingValues(5.dp)
|
||||||
val FeedPadding = PaddingValues(top = 10.dp, bottom = 10.dp)
|
val FeedPadding = PaddingValues(top = 10.dp, bottom = 10.dp)
|
||||||
val ButtonPadding = PaddingValues(vertical = 6.dp, horizontal = 16.dp)
|
val ButtonPadding = PaddingValues(vertical = 6.dp, horizontal = 16.dp)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user