CHANGELOG.md

@@ -72,3 +72,7 @@
 - Start using Voyager for navigation
 - Update dependency androidx.work:work-runtime-ktx to v2.9.1
 - Update dependency androidx.annotation:annotation to v1.8.2
+- Replace dependency br.com.simplepass:loading-button-android with
+  com.github.leandroBorgesFerreira:LoadingButtonAndroid
+- Replace dependency com.github.florent37:viewtooltip with
+  com.github.CarlosEsco:ViewTooltip

app/build.gradle.kts

@@ -235,7 +235,6 @@ dependencies {
     implementation(libs.aboutlibraries)
 
     // UI
-    implementation(libs.material.design.dimens)
     implementation(libs.loading.button)
     implementation(libs.fastadapter)
     implementation(libs.fastadapter.extensions.binding)

app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadButton.kt

@@ -34,7 +34,7 @@ class DownloadButton @JvmOverloads constructor(context: Context, attrs: Attribut
         ContextCompat.getColor(context, R.color.material_on_surface_disabled)
     }
     private val downloadedTextColor = context.getResourceColor(R.attr.background)
-    private val errorColor by lazy { ContextCompat.getColor(context, R.color.material_red_500) }
+    private val errorColor by lazy { ContextCompat.getColor(context, R.color.md_red_500) }
     private val filledCircle by lazy {
         ContextCompat.getDrawable(context, R.drawable.filled_circle)?.mutate()
     }

app/src/main/res/drawable/unread_angled_badge.xml

@@ -6,11 +6,11 @@
     android:viewportHeight="10"
     android:viewportWidth="100"
     android:autoMirrored="true"
-    tools:background="@color/material_red_500">
+    tools:background="@color/md_red_500">
 
     <path
         android:fillColor="?attr/colorSecondary"
         android:pathData="M0 20 L100 0 L100 20 Z"
         android:strokeColor="?attr/colorSecondary" />
 
-</vector>
+</vector>

app/src/main/res/layout-sw600dp-land/manga_header_item.xml

@@ -16,7 +16,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0"
-        tools:background="@color/material_red_400" />
+        tools:background="@color/md_red_400" />
 
     <ImageView
         android:id="@+id/backdrop"
@@ -78,7 +78,7 @@
             android:focusable="true"
             android:foreground="?android:attr/selectableItemBackground"
             android:maxHeight="300dp"
-            tools:background="@color/material_grey_700"
+            tools:background="@color/md_grey_700"
             tools:src="@mipmap/ic_launcher" />
     </com.google.android.material.card.MaterialCardView>
 
@@ -424,4 +424,4 @@
             app:layout_constraintTop_toTopOf="@id/filter_button"
             tools:text="Read, Unread, Bookmarked, Downloaded, All" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout-sw600dp-port/manga_header_item.xml

@@ -16,7 +16,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0"
-        tools:background="@color/material_red_400" />
+        tools:background="@color/md_red_400" />
 
     <ImageView
         android:id="@+id/backdrop"
@@ -82,7 +82,7 @@
             android:focusable="true"
             android:foreground="?android:attr/selectableItemBackground"
             android:maxHeight="500dp"
-            tools:background="@color/material_grey_700"
+            tools:background="@color/md_grey_700"
             tools:src="@mipmap/ic_launcher" />
     </com.google.android.material.card.MaterialCardView>
 
@@ -428,4 +428,4 @@
             app:layout_constraintTop_toTopOf="@id/filter_button"
             tools:text="Read, Unread, Bookmarked, Downloaded, All" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/chapters_item.xml

@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone"
-        android:background="@color/material_green_800"
+        android:background="@color/md_green_800"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -100,4 +100,4 @@
             app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</FrameLayout>
+</FrameLayout>

app/src/main/res/layout/download_item.xml

@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone"
-        android:background="@color/material_red_500">
+        android:background="@color/md_red_500">
 
         <ImageView
             android:id="@+id/close_right"
@@ -27,7 +27,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone"
-        android:background="@color/material_red_500">
+        android:background="@color/md_red_500">
 
         <ImageView
             android:id="@+id/close_left"

app/src/main/res/layout/download_swipe_tut_item.xml

@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone"
-        android:background="@color/material_red_500">
+        android:background="@color/md_red_500">
 
         <ImageView
             android:id="@+id/close_right"
@@ -27,7 +27,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone"
-        android:background="@color/material_red_500">
+        android:background="@color/md_red_500">
 
         <ImageView
             android:id="@+id/close_left"
@@ -81,4 +81,4 @@
         app:layout_constraintStart_toEndOf="@+id/reorder"
         app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</com.google.android.material.card.MaterialCardView>
+</com.google.android.material.card.MaterialCardView>

app/src/main/res/layout/manga_header_item.xml

@@ -16,7 +16,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.0"
-        tools:background="@color/material_red_400" />
+        tools:background="@color/md_red_400" />
 
     <ImageView
         android:id="@+id/backdrop"
@@ -78,7 +78,7 @@
             android:focusable="true"
             android:foreground="?android:attr/selectableItemBackground"
             android:maxHeight="300dp"
-            tools:background="@color/material_grey_700"
+            tools:background="@color/md_grey_700"
             tools:src="@mipmap/ic_launcher" />
     </com.google.android.material.card.MaterialCardView>
 
@@ -424,4 +424,4 @@
             app:layout_constraintTop_toTopOf="@id/filter_button"
             tools:text="Read, Unread, Bookmarked, Downloaded, All" />
     </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/recent_manga_item.xml

@@ -11,7 +11,7 @@
         android:id="@+id/end_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/material_green_800"
+        android:background="@color/md_green_800"
         android:layout_gravity="top"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"

app/src/main/res/layout/source_item.xml

@@ -9,7 +9,7 @@
         android:id="@+id/end_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/material_red_500"
+        android:background="@color/md_red_500"
         android:visibility="gone">
 
         <com.google.android.material.textview.MaterialTextView
@@ -30,7 +30,7 @@
         android:id="@+id/start_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/material_red_500">
+        android:background="@color/md_red_500">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/close_left"

app/src/main/res/values-night/colors.xml

@@ -41,7 +41,7 @@
     <color name="textColorPrimaryInverse">@color/md_black_1000_87</color>
     <color name="strong_divider">@color/md_white_1000_38</color>
     <color name="divider">@color/md_white_1000_12</color>
-    <color name="download">@color/material_green_700</color>
+    <color name="download">@color/md_green_700</color>
     <color name="holo_red">#cc4444</color>
     <color name="splashIcon">@color/md_white_1000</color>
     <color name="downloadBadgeDayNight">@color/download_badge_light</color>
@@ -121,4 +121,4 @@
     <color name="secondaryVariantYinYang">#FFFFFF</color>
     <color name="onSecondaryYinYang">@color/md_black_1000</color>
     <color name="primaryVariantYinYang">#2C2C2C</color>
-</resources>
+</resources>

app/src/main/res/values/colors.xml

@@ -44,7 +44,7 @@
     <color name="download_badge_text">@color/md_black_1000</color>
     <color name="download_badge_light">@color/strong_green</color>
     <color name="download_badge_light_text">@color/md_white_1000</color>
-    <color name="total_badge">@color/material_deep_purple_500</color>
+    <color name="total_badge">@color/md_deep_purple_500</color>
     <color name="total_badge_text">@color/md_white_1000</color>
 
     <color name="colorAmoledPrimary">@color/md_black_1000</color>
@@ -53,7 +53,7 @@
 
     <color name="strong_divider">@color/md_black_1000_38</color>
     <color name="divider">@color/md_black_1000_12</color>
-    <color name="download">@color/material_green_800</color>
+    <color name="download">@color/md_green_800</color>
 
     <color name="background">@color/md_grey_50</color>
     <color name="dialog">@color/md_white_1000</color>
@@ -82,10 +82,18 @@
     <color name="md_black_1000">#000000</color>
 
     <color name="md_grey_50">#FAFAFA</color>
+    <color name="md_grey_700">#616161</color>
 
     <color name="md_blue_A400">#2979FF</color>
 
+    <color name="md_red_400">#EF5350</color>
     <color name="md_red_500">#F44336</color>
+
+    <color name="md_green_700">#388E3C</color>
+    <color name="md_green_800">#2E7D32</color>
+
+    <color name="md_deep_purple_500">#673AB7</color>
+
     <color name="holo_red">#AA2200</color>
     <color name="primaryRed">#C14033</color>
 

app/src/main/res/values/dimens.xml

@@ -30,4 +30,18 @@
 
     <dimen name="appwidget_background_radius">16dp</dimen>
     <dimen name="appwidget_inner_radius">12dp</dimen>
+
+    <!-- REF: com.dmitrymalkovich.android:material-design-dimens -->
+    <dimen name="material_component_cards_space_between_cards">8dp</dimen>
+    <dimen name="material_component_cards_top_and_bottom_padding">16dp</dimen>
+    <dimen name="material_layout_avatar">40dp</dimen>
+    <dimen name="material_layout_keylines_screen_edge_margin">16dp</dimen>
+    <dimen name="material_component_lists_icon_left_padding">16dp</dimen>
+    <dimen name="material_component_dialogs_padding_around_content_area">24dp</dimen>
+    <dimen name="material_component_text_fields_floating_label_padding_between_label_and_input_text">8dp</dimen>
+    <dimen name="material_component_text_fields_padding_above_and_below_label">16dp</dimen>
+    <dimen name="material_component_lists_single_line_with_avatar_height">56dp</dimen>
+    <dimen name="material_component_lists_padding_above_list">8dp</dimen>
+    <dimen name="material_component_lists_two_line_height">56dp</dimen>
+    <dimen name="material_component_lists_text_left_padding">72dp</dimen>
 </resources>

gradle/libs.versions.toml

@@ -48,15 +48,14 @@ kermit = { module = "co.touchlab:kermit", version.ref = "kermit" }
 libarchive = { module = "me.zhanghai.android.libarchive:library", version = "1.1.0" }
 
 material = { module = "com.google.android.material:material", version = "1.12.0" }
-material-design-dimens = { module = "com.dmitrymalkovich.android:material-design-dimens", version = "1.4" }
 markwon = { module = "io.noties.markwon:core", version = "4.6.2" }
 mpandroidchart = { module = "com.github.PhilJay:MPAndroidChart", version = "v3.1.0" }
 java-nat-sort = { module = "com.github.gpanther:java-nat-sort", version = "natural-comparator-1.1" }
 jsoup = { module = "org.jsoup:jsoup", version = "1.17.1" }
 junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
 junit-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
 junit-android = { module = "androidx.test.ext:junit", version = "1.1.5" }
-loading-button = { module = "br.com.simplepass:loading-button-android", version = "2.2.0" }
+loading-button = { module = "com.github.leandroBorgesFerreira:LoadingButtonAndroid", version = "2.2.0" }  # FIXME: Don't depends on this
 mockk = { module = "io.mockk:mockk", version = "1.13.11" }
 
 moko-resources = { module = "dev.icerock.moko:resources", version.ref = "moko" }
@@ -91,7 +90,7 @@ shizuku-provider = { module = "dev.rikka.shizuku:provider", version.ref = "shizu
 taptargetview = { module = "com.getkeepsafe.taptargetview:taptargetview", version = "1.13.3" }
 unifile = { module = "com.github.tachiyomiorg:unifile", version = "a9de196cc7" }
 viewstatepageradapter = { module = "com.nightlynexus.viewstatepageradapter:viewstatepageradapter", version = "1.1.0" }
-viewtooltip = { module = "com.github.florent37:viewtooltip", version = "1.2.2" }
+viewtooltip = { module = "com.github.CarlosEsco:ViewTooltip", version = "f79a8955ef" }  # FIXME: Don't depends on this
 
 voyager-navigator = { module = "cafe.adriel.voyager:voyager-navigator", version.ref = "voyager" }
 voyager-transitions = { module = "cafe.adriel.voyager:voyager-transitions", version.ref = "voyager" }