-
-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #522 from hemang-mishra/Fix-MoveLogicToVMInArtistS…
…creen-hemang_mishra Moved card Link logic to viewModel
- Loading branch information
Showing
6 changed files
with
93 additions
and
86 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
77 changes: 77 additions & 0 deletions
77
app/src/main/java/org/listenbrainz/android/util/LinksUtil.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| package org.listenbrainz.android.util | ||
|
|
||
|
|
||
| import ArtistLinksEnum | ||
| import org.listenbrainz.android.R | ||
| import org.listenbrainz.android.model.artist.Rels | ||
| import org.listenbrainz.android.ui.screens.artist.LinkCardData | ||
| import org.listenbrainz.android.util.Constants.MB_BASE_URL | ||
|
|
||
| object LinkUtils { | ||
| fun parseLinks(artistMbid: String?, links: Rels?): Map<ArtistLinksEnum, List<LinkCardData>> { | ||
| val allLinkCards: MutableList<LinkCardData> = mutableListOf() | ||
| val mainLinkCards: MutableList<LinkCardData> = mutableListOf() | ||
| val streamingLinkCards: MutableList<LinkCardData> = mutableListOf() | ||
| val socialMediaLinkCards: MutableList<LinkCardData> = mutableListOf() | ||
| val lyricsLinkCards: MutableList<LinkCardData> = mutableListOf() | ||
|
|
||
| if (links?.wikidata != null) { | ||
| val wikidata = LinkCardData( | ||
| R.drawable.wiki_data, | ||
| "Wikidata", | ||
| links.wikidata | ||
| ) | ||
| allLinkCards.add(wikidata) | ||
| mainLinkCards.add(wikidata) | ||
| } | ||
| if (links?.lyrics != null) { | ||
| val lyrics = LinkCardData(R.drawable.settings_voice, "Lyrics", links.lyrics) | ||
| allLinkCards.add(lyrics) | ||
| lyricsLinkCards.add(lyrics) | ||
| } | ||
| if (links?.officialHomePage != null) { | ||
| val homePage = LinkCardData( | ||
| R.drawable.home_icon, | ||
| "Homepage", | ||
| links.officialHomePage | ||
| ) | ||
| allLinkCards.add(homePage) | ||
| mainLinkCards.add(homePage) | ||
| } | ||
| if (links?.purchaseForDownload != null) { | ||
| val purchase = LinkCardData( | ||
| R.drawable.mail_order, | ||
| "Purchase for Download", | ||
| links.purchaseForDownload | ||
| ) | ||
| allLinkCards.add(purchase) | ||
| streamingLinkCards.add(purchase) | ||
| } | ||
| if (links?.purchaseForMailOrder != null) { | ||
| val mailOrder = LinkCardData( | ||
| R.drawable.mail_order, | ||
| "Purchase for mail order", | ||
| links.purchaseForMailOrder | ||
| ) | ||
| allLinkCards.add(mailOrder) | ||
| streamingLinkCards.add(mailOrder) | ||
| } | ||
| if (artistMbid != null) { | ||
| mainLinkCards.add( | ||
| LinkCardData( | ||
| R.drawable.musicbrainz_logo, | ||
| "Edit", | ||
| MB_BASE_URL + "artist/${artistMbid}" | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| return mapOf( | ||
| ArtistLinksEnum.ALL to allLinkCards, | ||
| ArtistLinksEnum.MAIN to mainLinkCards, | ||
| ArtistLinksEnum.LYRICS to lyricsLinkCards, | ||
| ArtistLinksEnum.STREAMING to streamingLinkCards, | ||
| ArtistLinksEnum.SOCIAL_MEDIA to socialMediaLinkCards | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.84" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> | ||
|
|
||
| <path android:fillColor="@android:color/white" android:pathData="M7,24h2v-2L7,22v2zM12,13c1.66,0 2.99,-1.34 2.99,-3L15,4c0,-1.66 -1.34,-3 -3,-3S9,2.34 9,4v6c0,1.66 1.34,3 3,3zM11,24h2v-2h-2v2zM15,24h2v-2h-2v2zM19,10h-1.7c0,3 -2.54,5.1 -5.3,5.1S6.7,13 6.7,10L5,10c0,3.41 2.72,6.23 6,6.72L11,20h2v-3.28c3.28,-0.49 6,-3.31 6,-6.72z"/> | ||
|
|
||
| </vector> |