diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2951d4f5c2..76d291ecae 100644
--- a/CHANGELOG.md
+++ b/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
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f94ae44a58..5cb5b6076c 100644
--- a/app/build.gradle.kts
+++ b/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)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadButton.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadButton.kt
index 32ab2f874e..ae1cc1f28d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/download/DownloadButton.kt
+++ b/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()
}
diff --git a/app/src/main/res/drawable/unread_angled_badge.xml b/app/src/main/res/drawable/unread_angled_badge.xml
index 0b39045cbf..38a0bce3ee 100644
--- a/app/src/main/res/drawable/unread_angled_badge.xml
+++ b/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">
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout-sw600dp-land/manga_header_item.xml b/app/src/main/res/layout-sw600dp-land/manga_header_item.xml
index cbfe0b3f0c..04213ee8c6 100644
--- a/app/src/main/res/layout-sw600dp-land/manga_header_item.xml
+++ b/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" />
@@ -424,4 +424,4 @@
app:layout_constraintTop_toTopOf="@id/filter_button"
tools:text="Read, Unread, Bookmarked, Downloaded, All" />
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout-sw600dp-port/manga_header_item.xml b/app/src/main/res/layout-sw600dp-port/manga_header_item.xml
index 35d4626b55..4784dc52d8 100644
--- a/app/src/main/res/layout-sw600dp-port/manga_header_item.xml
+++ b/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" />
@@ -428,4 +428,4 @@
app:layout_constraintTop_toTopOf="@id/filter_button"
tools:text="Read, Unread, Bookmarked, Downloaded, All" />
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/chapters_item.xml b/app/src/main/res/layout/chapters_item.xml
index 97a8369229..b76f7a73ec 100644
--- a/app/src/main/res/layout/chapters_item.xml
+++ b/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" />
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/download_item.xml b/app/src/main/res/layout/download_item.xml
index d5773868ac..3d9b0a3707 100644
--- a/app/src/main/res/layout/download_item.xml
+++ b/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">
+ android:background="@color/md_red_500">
+ android:background="@color/md_red_500">
+ android:background="@color/md_red_500">
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/manga_header_item.xml b/app/src/main/res/layout/manga_header_item.xml
index add4b44eea..7dbc6577a0 100644
--- a/app/src/main/res/layout/manga_header_item.xml
+++ b/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" />
@@ -424,4 +424,4 @@
app:layout_constraintTop_toTopOf="@id/filter_button"
tools:text="Read, Unread, Bookmarked, Downloaded, All" />
-
\ No newline at end of file
+
diff --git a/app/src/main/res/layout/recent_manga_item.xml b/app/src/main/res/layout/recent_manga_item.xml
index 4077b9ed31..25fddd4bb2 100644
--- a/app/src/main/res/layout/recent_manga_item.xml
+++ b/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"
diff --git a/app/src/main/res/layout/source_item.xml b/app/src/main/res/layout/source_item.xml
index 06adbe413e..14b8eabafc 100644
--- a/app/src/main/res/layout/source_item.xml
+++ b/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">
+ android:background="@color/md_red_500">
@color/md_black_1000_87
@color/md_white_1000_38
@color/md_white_1000_12
- @color/material_green_700
+ @color/md_green_700
#cc4444
@color/md_white_1000
@color/download_badge_light
@@ -121,4 +121,4 @@
#FFFFFF
@color/md_black_1000
#2C2C2C
-
\ No newline at end of file
+
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6f5dcacd1d..3db2731347 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -44,7 +44,7 @@
@color/md_black_1000
@color/strong_green
@color/md_white_1000
- @color/material_deep_purple_500
+ @color/md_deep_purple_500
@color/md_white_1000
@color/md_black_1000
@@ -53,7 +53,7 @@
@color/md_black_1000_38
@color/md_black_1000_12
- @color/material_green_800
+ @color/md_green_800
@color/md_grey_50
@color/md_white_1000
@@ -82,10 +82,18 @@
#000000
#FAFAFA
+ #616161
#2979FF
+ #EF5350
#F44336
+
+ #388E3C
+ #2E7D32
+
+ #673AB7
+
#AA2200
#C14033
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 4446867e33..66c01d7511 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -30,4 +30,18 @@
16dp
12dp
+
+
+ 8dp
+ 16dp
+ 40dp
+ 16dp
+ 16dp
+ 24dp
+ 8dp
+ 16dp
+ 56dp
+ 8dp
+ 56dp
+ 72dp
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ff6fdd28f9..205848b049 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -48,7 +48,6 @@ 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" }
@@ -56,7 +55,7 @@ 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" }