Changes the following marker to be a follow from all lists and follow sets
This commit is contained in:
@@ -81,11 +81,6 @@ fun AmethystIcon(iconSize: Dp) {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun FollowingIcon(iconSize: Dp) {
|
|
||||||
FollowingIcon(Modifier.size(iconSize))
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun FollowingIcon(modifier: Modifier) {
|
fun FollowingIcon(modifier: Modifier) {
|
||||||
Icon(
|
Icon(
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ import com.vitorpamplona.amethyst.ui.stringRes
|
|||||||
import com.vitorpamplona.amethyst.ui.theme.HalfTopPadding
|
import com.vitorpamplona.amethyst.ui.theme.HalfTopPadding
|
||||||
import com.vitorpamplona.amethyst.ui.theme.NotificationIconModifier
|
import com.vitorpamplona.amethyst.ui.theme.NotificationIconModifier
|
||||||
import com.vitorpamplona.amethyst.ui.theme.NotificationIconModifierSmaller
|
import com.vitorpamplona.amethyst.ui.theme.NotificationIconModifierSmaller
|
||||||
import com.vitorpamplona.amethyst.ui.theme.Size10dp
|
import com.vitorpamplona.amethyst.ui.theme.Size10Modifier
|
||||||
import com.vitorpamplona.amethyst.ui.theme.Size19dp
|
import com.vitorpamplona.amethyst.ui.theme.Size19dp
|
||||||
import com.vitorpamplona.amethyst.ui.theme.Size20dp
|
import com.vitorpamplona.amethyst.ui.theme.Size20dp
|
||||||
import com.vitorpamplona.amethyst.ui.theme.Size25dp
|
import com.vitorpamplona.amethyst.ui.theme.Size25dp
|
||||||
@@ -622,7 +622,7 @@ fun WatchUserMetadataAndFollowsAndRenderUserProfilePicture(
|
|||||||
WatchUserFollows(author.pubkeyHex, accountViewModel) { isFollowing ->
|
WatchUserFollows(author.pubkeyHex, accountViewModel) { isFollowing ->
|
||||||
if (isFollowing) {
|
if (isFollowing) {
|
||||||
Box(modifier = Size35Modifier, contentAlignment = Alignment.TopEnd) {
|
Box(modifier = Size35Modifier, contentAlignment = Alignment.TopEnd) {
|
||||||
FollowingIcon(Size10dp)
|
FollowingIcon(Size10Modifier)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -372,7 +372,7 @@ fun WatchUserFollows(
|
|||||||
if (accountViewModel.isLoggedUser(userHex)) {
|
if (accountViewModel.isLoggedUser(userHex)) {
|
||||||
onFollowChanges(true)
|
onFollowChanges(true)
|
||||||
} else {
|
} else {
|
||||||
val state by accountViewModel.account.kind3FollowList.flow
|
val state by accountViewModel.account.allFollows.flow
|
||||||
.collectAsStateWithLifecycle()
|
.collectAsStateWithLifecycle()
|
||||||
|
|
||||||
onFollowChanges(state.authors.contains(userHex))
|
onFollowChanges(state.authors.contains(userHex))
|
||||||
|
|||||||
Reference in New Issue
Block a user