Skip to content

Commit c1cef5d

Browse files
committed
Resolved daily issues
1 parent af72048 commit c1cef5d

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

app/detekt-baseline.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
<ID>LongParameterList:NostrResources.kt$( eventId: String, eventIdToNostrEvent: Map&lt;String, NostrEvent&gt;, postIdToPostDataMap: Map&lt;String, PostData&gt;, articleIdToArticle: Map&lt;String, ArticleData&gt;, profileIdToProfileDataMap: Map&lt;String, ProfileData&gt;, cdnResources: Map&lt;String, CdnResource&gt;, linkPreviews: Map&lt;String, LinkPreviewData&gt;, videoThumbnails: Map&lt;String, String&gt;, )</ID>
9696
<ID>LongParameterList:NostrResources.kt$( eventIdToNostrEvent: Map&lt;String, NostrEvent&gt;, postIdToPostDataMap: Map&lt;String, PostData&gt;, articleIdToArticle: Map&lt;String, ArticleData&gt;, profileIdToProfileDataMap: Map&lt;String, ProfileData&gt;, cdnResources: Map&lt;String, CdnResource&gt;, linkPreviews: Map&lt;String, LinkPreviewData&gt;, videoThumbnails: Map&lt;String, String&gt;, )</ID>
9797
<ID>LongParameterList:NostrResources.kt$( refNote: PostData?, refPostAuthor: ProfileData?, cdnResources: Map&lt;String, CdnResource&gt;, linkPreviews: Map&lt;String, LinkPreviewData&gt;, videoThumbnails: Map&lt;String, String&gt;, eventIdToNostrEvent: Map&lt;String, NostrEvent&gt;, postIdToPostDataMap: Map&lt;String, PostData&gt;, articleIdToArticle: Map&lt;String, ArticleData&gt;, profileIdToProfileDataMap: Map&lt;String, ProfileData&gt;, )</ID>
98-
<ID>LongParameterList:NoteContent.kt$( onProfileClick: ((String) -&gt; Unit)?, onUrlClick: ((String) -&gt; Unit)?, onPostClick: ((String) -&gt; Unit)?, onHashtagClick: ((String) -&gt; Unit)?, onArticleClick: ((naddr: String) -&gt; Unit)?, onPrimalLegendsLeaderboardClick: (() -&gt; Unit)?, )</ID>
9998
<ID>LongParameterList:NoteEditorViewModel.kt$NoteEditorViewModel$( @Assisted private val args: NoteEditorArgs, private val dispatcherProvider: CoroutineDispatcherProvider, private val fileAnalyser: FileAnalyser, private val activeAccountStore: ActiveAccountStore, private val feedRepository: FeedRepository, private val notePublishHandler: NotePublishHandler, private val attachmentRepository: AttachmentsRepository, private val highlightRepository: HighlightRepository, private val exploreRepository: ExploreRepository, private val profileRepository: ProfileRepository, private val articleRepository: ArticleRepository, )</ID>
10099
<ID>LongParameterList:ProfileDetailsViewModel.kt$ProfileDetailsViewModel$( savedStateHandle: SavedStateHandle, private val dispatcherProvider: CoroutineDispatcherProvider, private val activeAccountStore: ActiveAccountStore, private val feedsRepository: FeedsRepository, private val profileRepository: ProfileRepository, private val mutedUserRepository: MutedUserRepository, private val zapHandler: ZapHandler, )</ID>
101100
<ID>LongParameterList:SubscriptionsManager.kt$SubscriptionsManager$( dispatcherProvider: CoroutineDispatcherProvider, private val activeAccountStore: ActiveAccountStore, private val userRepository: UserRepository, private val nostrNotary: NostrNotary, private val appConfigProvider: AppConfigProvider, @PrimalCacheApiClient private val cacheApiClient: PrimalApiClient, @PrimalWalletApiClient private val walletApiClient: PrimalApiClient, )</ID>

app/src/main/kotlin/net/primal/android/notes/feed/note/ui/NoteContent.kt

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -215,11 +215,16 @@ fun NoteContent(
215215

216216
annotation?.handleAnnotationClick(
217217
onProfileClick = noteCallbacks.onProfileClick,
218-
onUrlClick = onUrlClick,
218+
onUrlClick = {
219+
if (it.isPrimalLegendsUrl()) {
220+
noteCallbacks.onPrimalLegendsLeaderboardClick
221+
} else {
222+
onUrlClick?.invoke(it)
223+
}
224+
},
219225
onPostClick = noteCallbacks.onNoteClick,
220226
onHashtagClick = noteCallbacks.onHashtagClick,
221227
onArticleClick = noteCallbacks.onArticleClick,
222-
onPrimalLegendsLeaderboardClick = noteCallbacks.onPrimalLegendsLeaderboardClick,
223228
) ?: onClick?.invoke(offset)
224229
},
225230
)
@@ -261,8 +266,7 @@ fun NoteContent(
261266
expanded = expanded,
262267
onUrlClick = { url ->
263268
when {
264-
url.isPrimalLegendsUrl() ->
265-
noteCallbacks.onPrimalLegendsLeaderboardClick?.invoke()
269+
url.isPrimalLegendsUrl() -> noteCallbacks.onPrimalLegendsLeaderboardClick?.invoke()
266270
else -> onUrlClick?.invoke(url)
267271
}
268272
},
@@ -376,16 +380,9 @@ private fun AnnotatedString.Range<String>.handleAnnotationClick(
376380
onPostClick: ((String) -> Unit)?,
377381
onHashtagClick: ((String) -> Unit)?,
378382
onArticleClick: ((naddr: String) -> Unit)?,
379-
onPrimalLegendsLeaderboardClick: (() -> Unit)?,
380383
) = when (this.tag) {
381384
PROFILE_ID_ANNOTATION_TAG -> onProfileClick?.invoke(this.item)
382-
URL_ANNOTATION_TAG -> {
383-
if (this.item.isPrimalLegendsUrl()) {
384-
onPrimalLegendsLeaderboardClick?.invoke()
385-
} else {
386-
onUrlClick?.invoke(this.item)
387-
}
388-
}
385+
URL_ANNOTATION_TAG -> onUrlClick?.invoke(this.item)
389386
NOTE_ANNOTATION_TAG -> onPostClick?.invoke(this.item)
390387
HASHTAG_ANNOTATION_TAG -> onHashtagClick?.invoke(this.item)
391388
NOSTR_ADDRESS_ANNOTATION_TAG -> {

0 commit comments

Comments
 (0)