Trakt: use new logo

UweTrottmann · Oct 18, 2024 · 6bc923f · 6bc923f
1 parent 6b90ee6
commit 6bc923f
Show file tree

Hide file tree

Showing 16 changed files with 116 additions and 64 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,10 @@ Releases marked with 🧪 (or previously with the "beta" suffix) were released o
 
 ## Version 2024.4
 
+### Unreleased
+
+* 🔧 Trakt: use new logo.
+
 ### 2024.4.4 - 2024-10-16 🧪
 
 * 🔧 Episodes: in list view, can again set watched with one tap.

diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/history/ShowsHistoryAdapter.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/history/ShowsHistoryAdapter.kt
@@ -56,7 +56,7 @@ open class ShowsHistoryAdapter(
             if (showTraktLogo) {
                 ViewTools.setVectorDrawableLeft(
                     textViewGridHeader,
-                    R.drawable.ic_trakt_icon_primary_20dp
+                    R.drawable.ic_trakt_primary_20dp
                 )
             } else {
                 textViewGridHeader.setCompoundDrawables(null, null, null, null)

diff --git a/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/ShowsDiscoverAdapter.kt b/app/src/main/java/com/battlelancer/seriesguide/shows/search/discover/ShowsDiscoverAdapter.kt
@@ -180,7 +180,7 @@ class ShowsDiscoverAdapter(
             if (link != DiscoverShowsLink.POPULAR) {
                 ViewTools.setVectorDrawableLeft(
                     binding.textViewDiscoverLink,
-                    R.drawable.ic_trakt_icon_primary_24dp
+                    R.drawable.ic_trakt_primary_24dp
                 )
             } else {
                 binding.textViewDiscoverLink.setCompoundDrawables(null, null, null, null)

diff --git a/app/src/main/java/com/battlelancer/seriesguide/util/RatingsTools.kt b/app/src/main/java/com/battlelancer/seriesguide/util/RatingsTools.kt
@@ -34,7 +34,7 @@ object RatingsTools {
             }
             ratingViewTrakt.apply {
                 setRange(it)
-                setIcon(R.drawable.ic_trakt_icon_control, R.string.trakt)
+                setIcon(R.drawable.ic_trakt_control_24dp, R.string.trakt)
             }
         }
 

diff --git a/app/src/main/res/drawable/ic_trakt_control_24dp.xml b/app/src/main/res/drawable/ic_trakt_control_24dp.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+
+    <path
+        android:fillColor="#000000"
+        android:pathData="M30.17,30.22l-1.46,-1.46 19.16,-19.17c-0.05,-0.39 -0.13,-0.77 -0.23,-1.15l-20.31,20.33 2.16,2.16 -1.46,1.46 -3.62,-3.62L46.85,6.29c-0.15,-0.3 -0.31,-0.6 -0.5,-0.88l-23.33,23.35 4.31,4.31 -1.46,1.46 -14.39,-14.4 1.46,-1.46 8.62,8.62L45.1,3.72c-2.07,-2.29 -5.05,-3.72 -8.37,-3.72H11.27C5.05,0 0,5.05 0,11.27v25.48c0,6.22 5.05,11.26 11.27,11.26h25.47c6.22,0 11.27,-5.04 11.27,-11.26V12.38l-17.83,17.84ZM21.54,25.91l-7.91,-7.93 1.46,-1.46 7.91,7.92 -1.46,1.47ZM23.69,23.74l-7.91,-7.92 1.46,-1.46 7.92,7.92 -1.47,1.46ZM43.4,35.12c0,4.57 -3.71,8.28 -8.28,8.28H12.88c-4.56,0 -8.28,-3.71 -8.28,-8.28V12.88c0,-4.57 3.71,-8.28 8.28,-8.28h20.78v2.08H12.88c-3.42,0 -6.2,2.78 -6.2,6.2v22.23c0,3.42 2.78,6.21 6.2,6.21h22.24c3.42,0 6.2,-2.79 6.2,-6.21v-3.51h2.08v3.51Z" />
+
+</vector>
diff --git a/app/src/main/res/drawable/ic_trakt_gradient_48dp.xml b/app/src/main/res/drawable/ic_trakt_gradient_48dp.xml
@@ -0,0 +1,68 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+
+    <path android:pathData="M48,11.26v25.47c0,6.22 -5.05,11.27 -11.27,11.27H11.26c-6.22,0 -11.26,-5.05 -11.26,-11.27V11.26C0,5.04 5.04,0 11.26,0h25.47c3.32,0 6.3,1.43 8.37,3.72 0.47,0.52 0.89,1.08 1.25,1.68 0.18,0.29 0.34,0.59 0.5,0.89 0.33,0.68 0.6,1.39 0.79,2.14 0.1,0.37 0.18,0.76 0.23,1.15 0.09,0.54 0.13,1.11 0.13,1.68Z">
+
+        <aapt:attr name="android:fillColor">
+
+            <gradient
+                android:centerX="48.46"
+                android:centerY="-0.95"
+                android:gradientRadius="64.84"
+                android:type="radial">
+
+                <item
+                    android:color="#FF9F42C6"
+                    android:offset="0" />
+
+                <item
+                    android:color="#FFA041C3"
+                    android:offset="0.27" />
+
+                <item
+                    android:color="#FFA43EBB"
+                    android:offset="0.42" />
+
+                <item
+                    android:color="#FFAA39AD"
+                    android:offset="0.53" />
+
+                <item
+                    android:color="#FFB4339A"
+                    android:offset="0.64" />
+
+                <item
+                    android:color="#FFC02B81"
+                    android:offset="0.73" />
+
+                <item
+                    android:color="#FFCF2061"
+                    android:offset="0.82" />
+
+                <item
+                    android:color="#FFE1143C"
+                    android:offset="0.9" />
+
+                <item
+                    android:color="#FFF50613"
+                    android:offset="0.97" />
+
+                <item
+                    android:color="#FFFF0000"
+                    android:offset="1" />
+
+            </gradient>
+
+        </aapt:attr>
+
+    </path>
+
+    <path
+        android:fillColor="#fff"
+        android:pathData="M13.62,17.97l7.92,7.92 1.47,-1.47 -7.92,-7.92 -1.47,1.47ZM28.01,32.37l1.47,-1.46 -2.16,-2.16 20.32,-20.32c-0.19,-0.75 -0.46,-1.46 -0.79,-2.14l-22.46,22.46 3.62,3.62ZM12.92,18.67l-1.46,1.46 14.4,14.4 1.46,-1.47 -4.32,-4.31L46.35,5.4c-0.36,-0.6 -0.78,-1.16 -1.25,-1.68l-23.56,23.56 -8.62,-8.61ZM47.87,9.58l-19.17,19.17 1.47,1.46 17.83,-17.83v-1.12c0,-0.57 -0.04,-1.14 -0.13,-1.68ZM25.16,22.27l-7.92,-7.92 -1.47,1.47 7.92,7.92 1.47,-1.47ZM41.32,35.12c0,3.42 -2.78,6.2 -6.2,6.2H12.88c-3.42,0 -6.2,-2.78 -6.2,-6.2V12.88c0,-3.42 2.78,-6.21 6.2,-6.21h20.78v-2.07H12.88c-4.56,0 -8.28,3.71 -8.28,8.28v22.24c0,4.56 3.71,8.28 8.28,8.28h22.24c4.56,0 8.28,-3.71 8.28,-8.28v-3.51h-2.07v3.51Z" />
+
+</vector>
diff --git a/app/src/main/res/drawable/ic_trakt_icon_control.xml b/app/src/main/res/drawable/ic_trakt_icon_control.xml
diff --git a/app/src/main/res/drawable/ic_trakt_icon_primary_24dp.xml b/app/src/main/res/drawable/ic_trakt_icon_primary_24dp.xml
diff --git a/app/src/main/res/drawable/ic_trakt_icon_red.xml b/app/src/main/res/drawable/ic_trakt_icon_red.xml
diff --git a/app/src/main/res/drawable/ic_trakt_primary_20dp.xml b/app/src/main/res/drawable/ic_trakt_primary_20dp.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:tint="?android:attr/textColorPrimary"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+
+    <path
+        android:fillColor="#000000"
+        android:pathData="M30.17,30.22l-1.46,-1.46 19.16,-19.17c-0.05,-0.39 -0.13,-0.77 -0.23,-1.15l-20.31,20.33 2.16,2.16 -1.46,1.46 -3.62,-3.62L46.85,6.29c-0.15,-0.3 -0.31,-0.6 -0.5,-0.88l-23.33,23.35 4.31,4.31 -1.46,1.46 -14.39,-14.4 1.46,-1.46 8.62,8.62L45.1,3.72c-2.07,-2.29 -5.05,-3.72 -8.37,-3.72H11.27C5.05,0 0,5.05 0,11.27v25.48c0,6.22 5.05,11.26 11.27,11.26h25.47c6.22,0 11.27,-5.04 11.27,-11.26V12.38l-17.83,17.84ZM21.54,25.91l-7.91,-7.93 1.46,-1.46 7.91,7.92 -1.46,1.47ZM23.69,23.74l-7.91,-7.92 1.46,-1.46 7.92,7.92 -1.47,1.46ZM43.4,35.12c0,4.57 -3.71,8.28 -8.28,8.28H12.88c-4.56,0 -8.28,-3.71 -8.28,-8.28V12.88c0,-4.57 3.71,-8.28 8.28,-8.28h20.78v2.08H12.88c-3.42,0 -6.2,2.78 -6.2,6.2v22.23c0,3.42 2.78,6.21 6.2,6.21h22.24c3.42,0 6.2,-2.79 6.2,-6.21v-3.51h2.08v3.51Z" />
+
+</vector>
diff --git a/app/src/main/res/drawable/ic_trakt_primary_24dp.xml b/app/src/main/res/drawable/ic_trakt_primary_24dp.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?android:attr/textColorPrimary"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+
+    <path
+        android:fillColor="#000000"
+        android:pathData="M30.17,30.22l-1.46,-1.46 19.16,-19.17c-0.05,-0.39 -0.13,-0.77 -0.23,-1.15l-20.31,20.33 2.16,2.16 -1.46,1.46 -3.62,-3.62L46.85,6.29c-0.15,-0.3 -0.31,-0.6 -0.5,-0.88l-23.33,23.35 4.31,4.31 -1.46,1.46 -14.39,-14.4 1.46,-1.46 8.62,8.62L45.1,3.72c-2.07,-2.29 -5.05,-3.72 -8.37,-3.72H11.27C5.05,0 0,5.05 0,11.27v25.48c0,6.22 5.05,11.26 11.27,11.26h25.47c6.22,0 11.27,-5.04 11.27,-11.26V12.38l-17.83,17.84ZM21.54,25.91l-7.91,-7.93 1.46,-1.46 7.91,7.92 -1.46,1.47ZM23.69,23.74l-7.91,-7.92 1.46,-1.46 7.92,7.92 -1.47,1.46ZM43.4,35.12c0,4.57 -3.71,8.28 -8.28,8.28H12.88c-4.56,0 -8.28,-3.71 -8.28,-8.28V12.88c0,-4.57 3.71,-8.28 8.28,-8.28h20.78v2.08H12.88c-3.42,0 -6.2,2.78 -6.2,6.2v22.23c0,3.42 2.78,6.21 6.2,6.21h22.24c3.42,0 6.2,-2.79 6.2,-6.21v-3.51h2.08v3.51Z" />
+
+</vector>
diff --git a/app/src/main/res/layout/dialog_checkin.xml b/app/src/main/res/layout/dialog_checkin.xml
@@ -84,7 +84,7 @@
             android:layout_marginLeft="@dimen/default_padding"
             android:layout_marginRight="@dimen/default_padding"
             android:contentDescription="@null"
-            android:src="@drawable/ic_trakt_icon_red" />
+            android:src="@drawable/ic_trakt_control_24dp" />
 
         <Button
             android:id="@+id/buttonCheckIn"

diff --git a/app/src/main/res/layout/fragment_connect_trakt_credentials.xml b/app/src/main/res/layout/fragment_connect_trakt_credentials.xml
@@ -18,7 +18,7 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_marginTop="8dp"
-            android:src="@drawable/ic_trakt_icon_red"
+            android:src="@drawable/ic_trakt_gradient_48dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"

diff --git a/app/src/main/res/layout/item_discover_link.xml b/app/src/main/res/layout/item_discover_link.xml
@@ -24,7 +24,7 @@
         android:paddingLeft="@dimen/large_padding"
         android:paddingRight="@dimen/large_padding"
         android:paddingTop="@dimen/inline_padding"
-        tools:drawableStart="@drawable/ic_trakt_icon_primary_24dp"
+        tools:drawableStart="@drawable/ic_trakt_primary_24dp"
         android:drawablePadding="2dp"
         android:textAppearance="@style/TextAppearance.SeriesGuide.TitleMedium.Bold"
         tools:text="Digital releases" />

diff --git a/app/src/main/res/layout/item_grid_header.xml b/app/src/main/res/layout/item_grid_header.xml
@@ -11,5 +11,5 @@
     android:paddingRight="@dimen/default_padding"
     android:paddingBottom="0dp"
     android:textAppearance="@style/TextAppearance.SeriesGuide.Subtitle1.Bold"
-    tools:drawableStart="@drawable/ic_trakt_icon_primary_20dp"
+    tools:drawableStart="@drawable/ic_trakt_primary_20dp"
     tools:text="Recently Watched" />
diff --git a/app/src/main/res/layout/layout_ratings.xml b/app/src/main/res/layout/layout_ratings.xml
@@ -53,7 +53,7 @@
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
         android:contentDescription="@string/trakt"
-        android:src="@drawable/ic_trakt_icon_control"
+        android:src="@drawable/ic_trakt_control_24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/ratingViewTrakt" />