Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show legends first in the followed by section #345

Merged
merged 5 commits into from
Feb 28, 2025
Merged

Show legends first in the followed by section #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
46059d6
Show legends first in the followed by section
mehmedalijaK Feb 28, 2025
9a0bdf9
Merge branch 'main' into feature/show-legends-first-in-followed-by-se…
mehmedalijaK Feb 28, 2025
170c1eb
resolve pr comments
mehmedalijaK Feb 28, 2025
5014abc
move filter to logic to viewModel
mehmedalijaK Feb 28, 2025
da8f48d
Merge branch 'main' into feature/show-legends-first-in-followed-by-se…
mehmedalijaK Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion app/src/main/kotlin/net/primal/android/profile/details/ProfileDetailsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import net.primal.android.networking.relays.errors.MissingRelaysException
import net.primal.android.networking.relays.errors.NostrPublishException
import net.primal.android.networking.sockets.errors.WssException
import net.primal.android.nostr.ext.extractProfileId
import net.primal.android.premium.utils.isPrimalLegendTier
import net.primal.android.profile.details.ProfileDetailsContract.UiEvent
import net.primal.android.profile.details.ProfileDetailsContract.UiState
import net.primal.android.profile.details.ProfileDetailsContract.UiState.ProfileError
Expand Down Expand Up @@ -177,7 +178,15 @@ class ProfileDetailsViewModel @Inject constructor(
userId = activeAccountStore.activeUserId(),
limit = 10,
)
setState { copy(userFollowedByProfiles = profiles.map { it.asProfileDetailsUi() }) }
setState {
copy(
userFollowedByProfiles = profiles.map {
it.asProfileDetailsUi()
}.filterNot {
it == state.value.profileDetails
}.sortedByDescending { it.premiumDetails?.tier?.isPrimalLegendTier() == true },
)
}
} catch (error: WssException) {
Timber.e(error)
}
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/kotlin/net/primal/android/profile/details/ui/ProfileDetailsHeader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ import net.primal.android.core.utils.asEllipsizedNpub
import net.primal.android.core.utils.formatNip05Identifier
import net.primal.android.premium.legend.domain.LegendaryCustomization
import net.primal.android.premium.legend.domain.LegendaryStyle
import net.primal.android.premium.utils.isPrimalLegendTier
import net.primal.android.profile.details.ProfileDetailsContract
import net.primal.android.profile.details.ui.model.PremiumProfileDataUi
import net.primal.android.profile.details.ui.model.shouldShowPremiumBadge
Expand Down Expand Up @@ -197,7 +198,7 @@ private fun ProfileHeaderDetails(
if (state.userFollowedByProfiles.isNotEmpty()) {
UserFollowedByIndicator(
modifier = Modifier.padding(horizontal = 14.dp, vertical = 8.dp),
profiles = state.userFollowedByProfiles.filterNot { it == state.profileDetails },
profiles = state.userFollowedByProfiles,
onProfileClick = onProfileClick,
)
}
Expand Down