diff --git a/app/src/main/java/eu/kanade/presentation/track/components/TrackLogoIcon.kt b/app/src/main/java/eu/kanade/presentation/track/components/TrackLogoIcon.kt index 7488d0da9..dc66d27de 100644 --- a/app/src/main/java/eu/kanade/presentation/track/components/TrackLogoIcon.kt +++ b/app/src/main/java/eu/kanade/presentation/track/components/TrackLogoIcon.kt @@ -1,15 +1,11 @@ package eu.kanade.presentation.track.components import androidx.compose.foundation.Image -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color +import androidx.compose.ui.draw.clip import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.tooling.preview.PreviewParameter @@ -30,18 +26,13 @@ fun TrackLogoIcon( Modifier } - Box( + Image( + painter = painterResource(tracker.getLogo()), + contentDescription = tracker.name, modifier = modifier .size(48.dp) - .background(color = Color(tracker.getLogoColor()), shape = MaterialTheme.shapes.medium) - .padding(4.dp), - contentAlignment = Alignment.Center, - ) { - Image( - painter = painterResource(tracker.getLogo()), - contentDescription = tracker.name, - ) - } + .clip(MaterialTheme.shapes.medium), + ) } @PreviewLightDark diff --git a/app/src/main/java/eu/kanade/presentation/track/components/TrackLogoIconPreviewProvider.kt b/app/src/main/java/eu/kanade/presentation/track/components/TrackLogoIconPreviewProvider.kt index 3f5e4b840..8799a062a 100644 --- a/app/src/main/java/eu/kanade/presentation/track/components/TrackLogoIconPreviewProvider.kt +++ b/app/src/main/java/eu/kanade/presentation/track/components/TrackLogoIconPreviewProvider.kt @@ -1,8 +1,6 @@ package eu.kanade.presentation.track.components -import android.graphics.Color import androidx.compose.ui.tooling.preview.PreviewParameterProvider -import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.track.Tracker import eu.kanade.test.DummyTracker @@ -13,8 +11,6 @@ internal class TrackLogoIconPreviewProvider : PreviewParameterProvider DummyTracker( id = 1L, name = "Dummy Tracker", - valLogoColor = Color.rgb(18, 25, 35), - valLogo = R.drawable.ic_tracker_anilist, ), ) } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/Tracker.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/Tracker.kt index c935eebe2..541b402df 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/Tracker.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/Tracker.kt @@ -1,7 +1,6 @@ package eu.kanade.tachiyomi.data.track import androidx.annotation.CallSuper -import androidx.annotation.ColorInt import androidx.annotation.DrawableRes import dev.icerock.moko.resources.StringResource import eu.kanade.tachiyomi.data.database.models.Track @@ -25,9 +24,6 @@ interface Tracker { val supportsPrivateTracking: Boolean - @ColorInt - fun getLogoColor(): Int - @DrawableRes fun getLogo(): Int diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt index 363f2fdb7..918f317db 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.data.track.anilist -import android.graphics.Color import dev.icerock.moko.resources.StringResource import eu.kanade.domain.track.model.toDbTrack import eu.kanade.tachiyomi.R @@ -57,9 +56,7 @@ class Anilist(id: Long) : BaseTracker(id, "AniList"), DeletableTracker { } } - override fun getLogo() = R.drawable.ic_tracker_anilist - - override fun getLogoColor() = Color.rgb(18, 25, 35) + override fun getLogo() = R.drawable.brand_anilist override fun getStatusList(): List { return listOf(READING, COMPLETED, ON_HOLD, DROPPED, PLAN_TO_READ, REREADING) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt index 3ba7e75f9..f935f1531 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.data.track.bangumi -import android.graphics.Color import dev.icerock.moko.resources.StringResource import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.Track @@ -84,9 +83,7 @@ class Bangumi(id: Long) : BaseTracker(id, "Bangumi") { return track } - override fun getLogo() = R.drawable.ic_tracker_bangumi - - override fun getLogoColor() = Color.rgb(240, 145, 153) + override fun getLogo() = R.drawable.brand_bangumi override fun getStatusList(): List { return listOf(READING, COMPLETED, ON_HOLD, DROPPED, PLAN_TO_READ) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/kavita/Kavita.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/kavita/Kavita.kt index a9aed629b..51492e262 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/kavita/Kavita.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/kavita/Kavita.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.data.track.kavita -import android.graphics.Color import dev.icerock.moko.resources.StringResource import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.Track @@ -34,9 +33,7 @@ class Kavita(id: Long) : BaseTracker(id, "Kavita"), EnhancedTracker { private val sourceManager: SourceManager by injectLazy() - override fun getLogo(): Int = R.drawable.ic_tracker_kavita - - override fun getLogoColor() = Color.rgb(74, 198, 148) + override fun getLogo(): Int = R.drawable.brand_kavita override fun getStatusList(): List = listOf(UNREAD, READING, COMPLETED) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt index 58f8ae38f..f8c19b5e9 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.data.track.kitsu -import android.graphics.Color import dev.icerock.moko.resources.StringResource import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.Track @@ -37,9 +36,7 @@ class Kitsu(id: Long) : BaseTracker(id, "Kitsu"), DeletableTracker { private val api by lazy { KitsuApi(client, interceptor) } - override fun getLogo() = R.drawable.ic_tracker_kitsu - - override fun getLogoColor() = Color.rgb(51, 37, 50) + override fun getLogo() = R.drawable.brand_kitsu override fun getStatusList(): List { return listOf(READING, COMPLETED, ON_HOLD, DROPPED, PLAN_TO_READ) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/komga/Komga.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/komga/Komga.kt index eee8941a3..768df7dc3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/komga/Komga.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/komga/Komga.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.data.track.komga -import android.graphics.Color import dev.icerock.moko.resources.StringResource import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.Track @@ -31,9 +30,7 @@ class Komga(id: Long) : BaseTracker(id, "Komga"), EnhancedTracker { val api by lazy { KomgaApi(id, client) } - override fun getLogo() = R.drawable.ic_tracker_komga - - override fun getLogoColor() = Color.rgb(51, 37, 50) + override fun getLogo() = R.drawable.brand_komga override fun getStatusList(): List = listOf(UNREAD, READING, COMPLETED) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdates.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdates.kt index c86e521fc..a66f2391c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdates.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/mangaupdates/MangaUpdates.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.data.track.mangaupdates -import android.graphics.Color import dev.icerock.moko.resources.StringResource import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.Track @@ -44,9 +43,7 @@ class MangaUpdates(id: Long) : BaseTracker(id, "MangaUpdates"), DeletableTracker private val api by lazy { MangaUpdatesApi(interceptor, client) } - override fun getLogo(): Int = R.drawable.ic_manga_updates - - override fun getLogoColor(): Int = Color.rgb(146, 160, 173) + override fun getLogo(): Int = R.drawable.brand_mangaupdates override fun getStatusList(): List { return listOf(READING_LIST, COMPLETE_LIST, ON_HOLD_LIST, UNFINISHED_LIST, WISH_LIST) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt index a40eba7b1..99cf1fd30 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.data.track.mdlist -import android.graphics.Color import dev.icerock.moko.resources.StringResource import eu.kanade.domain.track.model.toDbTrack import eu.kanade.tachiyomi.R @@ -33,11 +32,7 @@ class MdList(id: Long) : BaseTracker(id, "MDList") { val interceptor = MangaDexAuthInterceptor(trackPreferences, this) override fun getLogo(): Int { - return R.drawable.ic_tracker_mangadex_logo - } - - override fun getLogoColor(): Int { - return Color.rgb(43, 48, 53) + return R.drawable.brand_mangadex } override fun getStatusList(): List { diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt index 8d8c9d2b6..0feec9b6c 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.data.track.myanimelist -import android.graphics.Color import dev.icerock.moko.resources.StringResource import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.Track @@ -41,9 +40,7 @@ class MyAnimeList(id: Long) : BaseTracker(id, "MyAnimeList"), DeletableTracker { override val supportsReadingDates: Boolean = true - override fun getLogo() = R.drawable.ic_tracker_mal - - override fun getLogoColor() = Color.rgb(46, 81, 162) + override fun getLogo() = R.drawable.brand_myanimelist override fun getStatusList(): List { return listOf(READING, COMPLETED, ON_HOLD, DROPPED, PLAN_TO_READ, REREADING) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt index 9c007ff61..d8afad84a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.data.track.shikimori -import android.graphics.Color import dev.icerock.moko.resources.StringResource import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.Track @@ -102,9 +101,7 @@ class Shikimori(id: Long) : BaseTracker(id, "Shikimori"), DeletableTracker { return api.getMangaMetadata(track) } - override fun getLogo() = R.drawable.ic_tracker_shikimori - - override fun getLogoColor() = Color.rgb(40, 40, 40) + override fun getLogo() = R.drawable.brand_shikimori override fun getStatusList(): List { return listOf(READING, COMPLETED, ON_HOLD, DROPPED, PLAN_TO_READ, REREADING) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/suwayomi/Suwayomi.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/suwayomi/Suwayomi.kt index a0db6490b..01cb78c28 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/suwayomi/Suwayomi.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/suwayomi/Suwayomi.kt @@ -1,6 +1,5 @@ package eu.kanade.tachiyomi.data.track.suwayomi -import android.graphics.Color import dev.icerock.moko.resources.StringResource import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.Track @@ -18,9 +17,7 @@ class Suwayomi(id: Long) : BaseTracker(id, "Suwayomi"), EnhancedTracker { val api by lazy { SuwayomiApi(id) } - override fun getLogo() = R.drawable.ic_tracker_suwayomi - - override fun getLogoColor() = Color.rgb(255, 35, 35) // TODO + override fun getLogo() = R.drawable.brand_suwayomi companion object { const val UNREAD = 1L diff --git a/app/src/main/java/eu/kanade/test/DummyTracker.kt b/app/src/main/java/eu/kanade/test/DummyTracker.kt index d64b647a6..67de598b9 100644 --- a/app/src/main/java/eu/kanade/test/DummyTracker.kt +++ b/app/src/main/java/eu/kanade/test/DummyTracker.kt @@ -1,6 +1,5 @@ package eu.kanade.test -import android.graphics.Color import dev.icerock.moko.resources.StringResource import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.track.Tracker @@ -20,8 +19,7 @@ data class DummyTracker( override val supportsPrivateTracking: Boolean = false, override val isLoggedIn: Boolean = false, override val isLoggedInFlow: Flow = flowOf(false), - val valLogoColor: Int = Color.rgb(18, 25, 35), - val valLogo: Int = R.drawable.ic_tracker_anilist, + val valLogo: Int = R.drawable.brand_anilist, val valStatuses: List = (1L..6L).toList(), val valReadingStatus: Long = 1L, val valRereadingStatus: Long = 1L, @@ -34,8 +32,6 @@ data class DummyTracker( override val client: OkHttpClient get() = TODO("Not yet implemented") - override fun getLogoColor(): Int = valLogoColor - override fun getLogo(): Int = valLogo override fun getStatusList(): List = valStatuses diff --git a/app/src/main/res/drawable-nodpi/ic_manga_updates.webp b/app/src/main/res/drawable-nodpi/ic_manga_updates.webp deleted file mode 100644 index eece5d7d6..000000000 Binary files a/app/src/main/res/drawable-nodpi/ic_manga_updates.webp and /dev/null differ diff --git a/app/src/main/res/drawable-nodpi/ic_tracker_anilist.webp b/app/src/main/res/drawable-nodpi/ic_tracker_anilist.webp deleted file mode 100644 index b553d6c49..000000000 Binary files a/app/src/main/res/drawable-nodpi/ic_tracker_anilist.webp and /dev/null differ diff --git a/app/src/main/res/drawable-nodpi/ic_tracker_bangumi.webp b/app/src/main/res/drawable-nodpi/ic_tracker_bangumi.webp deleted file mode 100644 index 26b1d4e96..000000000 Binary files a/app/src/main/res/drawable-nodpi/ic_tracker_bangumi.webp and /dev/null differ diff --git a/app/src/main/res/drawable-nodpi/ic_tracker_kavita.webp b/app/src/main/res/drawable-nodpi/ic_tracker_kavita.webp deleted file mode 100644 index 7ab37be31..000000000 Binary files a/app/src/main/res/drawable-nodpi/ic_tracker_kavita.webp and /dev/null differ diff --git a/app/src/main/res/drawable-nodpi/ic_tracker_kitsu.webp b/app/src/main/res/drawable-nodpi/ic_tracker_kitsu.webp deleted file mode 100644 index f34cef52e..000000000 Binary files a/app/src/main/res/drawable-nodpi/ic_tracker_kitsu.webp and /dev/null differ diff --git a/app/src/main/res/drawable-nodpi/ic_tracker_komga.webp b/app/src/main/res/drawable-nodpi/ic_tracker_komga.webp deleted file mode 100644 index ecfaa4ec4..000000000 Binary files a/app/src/main/res/drawable-nodpi/ic_tracker_komga.webp and /dev/null differ diff --git a/app/src/main/res/drawable-nodpi/ic_tracker_mal.webp b/app/src/main/res/drawable-nodpi/ic_tracker_mal.webp deleted file mode 100644 index a9c6f2e92..000000000 Binary files a/app/src/main/res/drawable-nodpi/ic_tracker_mal.webp and /dev/null differ diff --git a/app/src/main/res/drawable-nodpi/ic_tracker_shikimori.webp b/app/src/main/res/drawable-nodpi/ic_tracker_shikimori.webp deleted file mode 100644 index f08ce3839..000000000 Binary files a/app/src/main/res/drawable-nodpi/ic_tracker_shikimori.webp and /dev/null differ diff --git a/app/src/main/res/drawable-nodpi/ic_tracker_suwayomi.webp b/app/src/main/res/drawable-nodpi/ic_tracker_suwayomi.webp deleted file mode 100644 index 246a62a7c..000000000 Binary files a/app/src/main/res/drawable-nodpi/ic_tracker_suwayomi.webp and /dev/null differ diff --git a/app/src/main/res/drawable/brand_anilist.xml b/app/src/main/res/drawable/brand_anilist.xml new file mode 100644 index 000000000..8d603ceb4 --- /dev/null +++ b/app/src/main/res/drawable/brand_anilist.xml @@ -0,0 +1,21 @@ + + + + + diff --git a/app/src/main/res/drawable/brand_bangumi.xml b/app/src/main/res/drawable/brand_bangumi.xml new file mode 100644 index 000000000..8b6b7711e --- /dev/null +++ b/app/src/main/res/drawable/brand_bangumi.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/brand_kavita.xml b/app/src/main/res/drawable/brand_kavita.xml new file mode 100644 index 000000000..359281011 --- /dev/null +++ b/app/src/main/res/drawable/brand_kavita.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + diff --git a/app/src/main/res/drawable/brand_kitsu.xml b/app/src/main/res/drawable/brand_kitsu.xml new file mode 100644 index 000000000..141506601 --- /dev/null +++ b/app/src/main/res/drawable/brand_kitsu.xml @@ -0,0 +1,21 @@ + + + + + diff --git a/app/src/main/res/drawable/brand_komga.xml b/app/src/main/res/drawable/brand_komga.xml new file mode 100644 index 000000000..6573ea5cd --- /dev/null +++ b/app/src/main/res/drawable/brand_komga.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/brand_mangadex.xml b/app/src/main/res/drawable/brand_mangadex.xml new file mode 100644 index 000000000..ccc58b83a --- /dev/null +++ b/app/src/main/res/drawable/brand_mangadex.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/brand_mangaupdates.xml b/app/src/main/res/drawable/brand_mangaupdates.xml new file mode 100644 index 000000000..f8fc63949 --- /dev/null +++ b/app/src/main/res/drawable/brand_mangaupdates.xml @@ -0,0 +1,21 @@ + + + + + diff --git a/app/src/main/res/drawable/brand_myanimelist.xml b/app/src/main/res/drawable/brand_myanimelist.xml new file mode 100644 index 000000000..92fadecff --- /dev/null +++ b/app/src/main/res/drawable/brand_myanimelist.xml @@ -0,0 +1,16 @@ + + + + diff --git a/app/src/main/res/drawable/brand_shikimori.xml b/app/src/main/res/drawable/brand_shikimori.xml new file mode 100644 index 000000000..381e82765 --- /dev/null +++ b/app/src/main/res/drawable/brand_shikimori.xml @@ -0,0 +1,21 @@ + + + + + diff --git a/app/src/main/res/drawable/brand_suwayomi.xml b/app/src/main/res/drawable/brand_suwayomi.xml new file mode 100644 index 000000000..45d7b196a --- /dev/null +++ b/app/src/main/res/drawable/brand_suwayomi.xml @@ -0,0 +1,26 @@ + + + + + +