Bladeren bron

Update tracker icons

arkon 5 jaren geleden
bovenliggende
commit
de8e530b37

+ 2 - 2
app/src/main/java/eu/kanade/tachiyomi/data/track/anilist/Anilist.kt

@@ -52,9 +52,9 @@ class Anilist(private val context: Context, id: Int) : TrackService(id) {
         }
     }
 
-    override fun getLogo() = R.drawable.tracker_anilist
+    override fun getLogo() = R.drawable.ic_tracker_anilist
 
-    override fun getLogoColor() = Color.rgb(0x12, 0x19, 0x23)
+    override fun getLogoColor() = Color.rgb(18, 25, 35)
 
     override fun getStatusList(): List<Int> {
         return listOf(READING, PLANNING, COMPLETED, REPEATING, PAUSED, DROPPED)

+ 2 - 2
app/src/main/java/eu/kanade/tachiyomi/data/track/bangumi/Bangumi.kt

@@ -77,9 +77,9 @@ class Bangumi(private val context: Context, id: Int) : TrackService(id) {
                 }
     }
 
-    override fun getLogo() = R.drawable.tracker_bangumi
+    override fun getLogo() = R.drawable.ic_tracker_bangumi
 
-    override fun getLogoColor() = Color.rgb(0xF0, 0x91, 0x99)
+    override fun getLogoColor() = Color.rgb(240, 145, 153)
 
     override fun getStatusList(): List<Int> {
         return listOf(READING, COMPLETED, ON_HOLD, DROPPED, PLANNING)

+ 2 - 6
app/src/main/java/eu/kanade/tachiyomi/data/track/kitsu/Kitsu.kt

@@ -33,13 +33,9 @@ class Kitsu(private val context: Context, id: Int) : TrackService(id) {
 
     private val api by lazy { KitsuApi(client, interceptor) }
 
-    override fun getLogo(): Int {
-        return R.drawable.tracker_kitsu
-    }
+    override fun getLogo() = R.drawable.ic_tracker_kitsu
 
-    override fun getLogoColor(): Int {
-        return Color.rgb(0x33, 0x25, 0x32)
-    }
+    override fun getLogoColor() = Color.rgb(51, 37, 50)
 
     override fun getStatusList(): List<Int> {
         return listOf(READING, PLAN_TO_READ, COMPLETED, ON_HOLD, DROPPED)

+ 2 - 2
app/src/main/java/eu/kanade/tachiyomi/data/track/myanimelist/MyAnimeList.kt

@@ -34,9 +34,9 @@ class MyAnimeList(private val context: Context, id: Int) : TrackService(id) {
     override val name: String
         get() = "MyAnimeList"
 
-    override fun getLogo() = R.drawable.tracker_mal
+    override fun getLogo() = R.drawable.ic_tracker_mal
 
-    override fun getLogoColor() = Color.rgb(0x2E, 0x51, 0xA2)
+    override fun getLogoColor() = Color.rgb(46, 81, 162)
 
     override fun getStatusList(): List<Int> {
         return listOf(READING, COMPLETED, ON_HOLD, DROPPED, PLAN_TO_READ)

+ 2 - 2
app/src/main/java/eu/kanade/tachiyomi/data/track/shikimori/Shikimori.kt

@@ -80,9 +80,9 @@ class Shikimori(private val context: Context, id: Int) : TrackService(id) {
                 }
     }
 
-    override fun getLogo() = R.drawable.tracker_shikimori
+    override fun getLogo() = R.drawable.ic_tracker_shikimori
 
-    override fun getLogoColor() = Color.rgb(0x28, 0x28, 0x28)
+    override fun getLogoColor() = Color.rgb(40, 40, 40)
 
     override fun getStatusList(): List<Int> {
         return listOf(READING, COMPLETED, ON_HOLD, DROPPED, PLANNING, REPEATING)

BIN
app/src/main/res/drawable-xxxhdpi/ic_tracker_anilist.webp


BIN
app/src/main/res/drawable-xxxhdpi/ic_tracker_bangumi.webp


BIN
app/src/main/res/drawable-xxxhdpi/ic_tracker_kitsu.webp


BIN
app/src/main/res/drawable-xxxhdpi/ic_tracker_mal.webp


BIN
app/src/main/res/drawable-xxxhdpi/ic_tracker_shikimori.webp


BIN
app/src/main/res/drawable-xxxhdpi/tracker_bangumi.webp


+ 0 - 5
app/src/main/res/drawable/tracker_anilist.xml

@@ -1,5 +0,0 @@
-<vector android:height="128dp" android:viewportHeight="512"
-    android:viewportWidth="512" android:width="128dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#fefefe" android:pathData="M160.35,102.08c26.43,-0.17 52.85,-0.09 79.28,-0.01 4.31,12.2 8.49,24.46 12.83,36.65 31.51,90.43 63.04,180.84 94.64,271.23 -27.82,0.07 -55.63,0.15 -83.45,-0.04 -5.93,-17.73 -11.89,-35.45 -17.8,-53.19 -30.41,-0.04 -60.82,0.04 -91.23,-0.04 -6.14,17.72 -12.19,35.48 -18.26,53.23 -27.98,0.25 -55.95,-0.05 -83.92,0.17 36.02,-102.65 71.92,-205.34 107.91,-308m13.21,186.42c18.32,-0.05 36.63,-0.06 54.94,0.01 -9.66,-28.34 -19.08,-56.76 -28.63,-85.13 -9.07,28.27 -17.35,56.81 -26.31,85.12z"/>
-    <path android:fillColor="#02a9ff" android:pathData="M259.21,105.26c3.99,-2.89 9.09,-3.3 13.85,-3.28 13.33,0.04 26.65,-0.04 39.97,0.1 4.97,-0.02 10.2,1.56 13.57,5.37 3.33,3.64 4.31,8.76 4.25,13.55 -0.02,70.12 0.01,140.23 -0.01,210.35H441.1c5.15,-0.02 10.66,1.45 14.14,5.48 3.48,3.79 4.35,9.17 4.28,14.15 -0.05,13.7 0.02,27.39 -0.04,41.09 0.02,5.76 -2.21,11.97 -7.33,15.08 -5.07,3.32 -11.37,2.76 -17.13,2.9 -29.31,-0.12 -58.61,0.01 -87.92,-0.1 -31.6,-90.39 -63.13,-180.8 -94.64,-271.23 0.11,-6.57 -0.12,-13.14 0.06,-19.71 0.17,-5.22 2.24,-10.72 6.69,-13.75z"/>
-</vector>

+ 0 - 5
app/src/main/res/drawable/tracker_kitsu.xml

@@ -1,5 +0,0 @@
-<vector android:height="128dp" android:viewportHeight="720"
-    android:viewportWidth="720" android:width="128dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#f75239" android:pathData="M275.71,62.7C281.92,58.49 291.05,59.24 296.26,64.73C300.02,68.85 302.38,73.98 305.3,78.68C323.69,110.75 337.69,146.58 337.99,184C337.97,219.01 338.05,254.02 337.95,289.04C338.08,296.37 333.13,303.66 325.93,305.59C321.27,306.96 316.36,305.69 311.99,303.92C278.65,290.86 245.16,278.15 211.87,264.93C175.41,248.76 146.48,219.65 123,188.04C116.69,179.86 120.95,166.07 130.92,163.14C159.26,155.14 190.58,159.47 216.16,173.87C227.02,164.39 238.99,156.2 251.69,149.39C247.63,121.78 254.08,92.72 269.68,69.55C271.39,67.04 273.07,64.35 275.71,62.7M272.01,140.24C283.16,136.19 294.63,132.94 306.34,131C300.84,115.1 293.25,100 284.64,85.58C274.94,101.92 270.54,121.3 272.01,140.24M144.93,181.7C155.1,195.08 166.7,207.32 179.18,218.54C185.24,208.24 192.58,198.78 200.13,189.54C183.09,181.41 163.57,178.55 144.93,181.7Z"/>
-    <path android:fillColor="#f75239" android:pathData="M358.45,193.12C389.33,176.67 424.95,168.74 459.89,171.86C495.69,174.38 530.42,188.37 558.51,210.61C584.46,231.09 604.63,258.77 616.24,289.71C636.14,342.1 630.48,403.46 601.4,451.35C586.21,476.06 565.58,497.12 542.43,514.46C516.06,534.27 486.52,549.42 456.17,562.11C430.76,573.13 404.85,586.17 387.28,608.3C381.59,614.74 379.46,624.51 371.15,628.4C363.11,632.64 352.45,627.94 349.23,619.68C334.45,582.89 331.34,541.09 342.62,502.92C350.75,474.79 365.85,449.02 384.72,426.76C405.6,402.08 430.98,381.49 458.39,364.47C486.43,347.12 517.09,333.78 549.23,326.22C555.16,325.24 558.19,318.12 556.13,312.8C554.6,308.38 549.65,305.77 545.11,306.52C427.51,329.35 320.24,399.28 250.48,496.49C246.98,501.72 242.67,507.57 235.91,508.36C225.12,510.58 214.33,499.18 217.37,488.54C229.6,449 247.15,411.15 269.13,376.09C271.05,372.95 273.54,369.91 273.94,366.12C275.47,355.53 264.55,344.52 253.88,347.88C216.21,362.09 180.53,381.48 147.79,404.89C142.56,408.66 135.05,408.93 129.59,405.47C121.5,400.73 119.21,388.54 125.33,381.36C153.05,347.83 183.83,316.84 217.14,288.87C247.11,300.58 277.12,312.21 307.14,323.79C316.91,327.5 328.3,327.56 337.7,322.73C349.95,316.78 358.12,303.51 358.16,289.91C358.47,257.65 357.87,225.38 358.45,193.12M365.07,604.38C367.89,600.17 370.87,596.06 374.18,592.23C394.29,568.89 422.31,554.39 450.26,542.58C417.19,537.99 386.21,518.59 368.62,490.06C352.97,525.9 352.34,567.57 365.07,604.38Z"/>
-</vector>

+ 0 - 4
app/src/main/res/drawable/tracker_mal.xml

@@ -1,4 +0,0 @@
-<vector android:height="53.333332dp" android:viewportHeight="100"
-    android:viewportWidth="240" android:width="128dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#fff" android:pathData="M23.01,10.05h18.02c5.14,7.09 10.25,14.2 15.4,21.29C61.97,24.25 67.45,17.11 72.97,10c6.01,0 12.02,-0.01 18.03,0 -0.01,23 0,45.99 -0.01,68.99H72.98c-0.01,-13.99 0.01,-27.97 0,-41.96 -5.49,6.45 -10.97,12.9 -16.45,19.36 -5.18,-6.44 -10.32,-12.91 -15.49,-19.35 -0.03,13.98 0,27.96 -0.01,41.95H23c0.01,-22.98 0,-45.96 0.01,-68.94zM111.01,21.09c7.77,-7.24 18.49,-10.69 28.96,-11.08 6.36,-0.06 12.73,0.01 19.09,-0.01 1.65,5 3.31,10.01 4.95,15.02 -9.38,0.15 -18.78,-0.3 -28.14,0.22 -7.91,1.23 -11.62,9.63 -12.94,16.66 6.02,0.06 12.04,0.02 18.06,0.03 0.01,-4.95 0,-9.89 0.01,-14.84 6.66,-0.03 13.32,-0.09 19.99,-0.11v52.11c-6.67,0.01 -13.33,0.01 -19.99,0 -0.01,-7.69 0,-15.39 0,-23.09h-21.94c1.39,8.11 3.92,16.08 8.2,23.15 -4.89,3.34 -9.76,6.7 -14.67,10.02 -6.26,-13.57 -11.76,-28.05 -11.63,-43.21 0.09,-9.13 3.2,-18.58 10.05,-24.87zM174.96,10c5.98,-0.01 11.97,-0.01 17.96,0 0.01,18 0,36 0.01,54 8.34,0.01 16.69,-0.01 25.04,0 -1.33,5 -2.64,9.99 -3.97,14.99h-39.04c-0.01,-23 -0.01,-45.99 0,-68.99z"/>
-</vector>

+ 0 - 4
app/src/main/res/drawable/tracker_shikimori.xml

@@ -1,4 +0,0 @@
-<vector android:height="128dp" android:viewportHeight="228"
-    android:viewportWidth="228" android:width="128dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#f5f5f5" android:pathData="M94.37,60.42c17.72,-10.96 38.77,-16.44 59.58,-15.6 6.34,0.43 12.82,1.01 18.8,3.33 2.32,0.91 3.66,3.45 3.35,5.89 -0.17,9.68 0.04,19.43 -1.4,29.02 -4.3,-2.3 -6.63,-6.81 -9.98,-10.17 -8.12,0.68 -16.17,1.89 -24.3,2.37 -14.39,1.97 -29.19,6.04 -40.55,15.51 -1.5,1.51 -3.58,3.01 -3.99,5.2 1.65,1.6 4.02,2.13 6.08,3.03 10.23,3.71 20.72,6.63 31.2,9.58 9.5,2.4 19.29,7.01 24.42,15.79 4.01,6.27 3.45,14.17 1.78,21.1 -3.27,11.69 -13.14,20.18 -23.83,25.11 -19.5,8.91 -41.39,11.03 -62.6,10.35 -5.87,-0.79 -12.46,-1.59 -16.74,-6.14 -6.59,-8.33 -11.52,-19.78 -7.58,-30.31 3.23,-6.2 9.29,-10.32 15.26,-13.63 3.21,-1.57 6.61,-3.72 10.35,-2.95 -2.04,6.04 -9.24,8.25 -11.43,14.12 -1.51,5.25 4.36,8.52 8.65,9.38 12.57,0.97 25.24,0.08 37.69,-1.78 8.64,-1.68 17.31,-4.02 24.93,-8.54 3.28,-1.96 6.48,-4.36 8.41,-7.74 -3.78,-3.67 -8.79,-5.53 -13.67,-7.22 -11,-3.67 -22.4,-5.92 -33.75,-8.2 -4.17,-0.61 -8.32,-1.67 -12.01,-3.76 -4.36,-2.49 -7.38,-7.26 -7.62,-12.29 -0.45,-8.42 1.38,-16.74 3.62,-24.8 2.16,-7.65 9,-12.53 15.33,-16.65z"/>
-</vector>

+ 1 - 1
app/src/main/res/layout/track_item.xml

@@ -26,7 +26,7 @@
                 android:id="@+id/track_logo"
                 android:layout_width="wrap_content"
                 android:layout_height="48dp"
-                tools:src="@drawable/tracker_mal" />
+                tools:src="@drawable/ic_tracker_mal" />
 
             <ImageButton
                 android:id="@+id/track_set"