diff --git a/app/build.gradle b/app/build.gradle index f3b11dd3..5f2f0777 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,7 +27,7 @@ android { buildTypes { alpha { - applicationIdSuffix ".alpha" + applicationIdSuffix ".beta" // keep as the same application by popular request versionNameSuffix "-alpha01" manifestPlaceholders = [icon_placeholder: "@mipmap/ic_launcher_alpha", icon_placeholder_round: "@mipmap/ic_launcher_alpha_round"] debuggable System.getenv("CI") == null diff --git a/app/src/main/java/ani/dantotsu/download/anime/AnimeDownloaderService.kt b/app/src/main/java/ani/dantotsu/download/anime/AnimeDownloaderService.kt index 5dc2a3d1..1652443c 100644 --- a/app/src/main/java/ani/dantotsu/download/anime/AnimeDownloaderService.kt +++ b/app/src/main/java/ani/dantotsu/download/anime/AnimeDownloaderService.kt @@ -85,7 +85,7 @@ class AnimeDownloaderService : Service() { builder = NotificationCompat.Builder(this, Notifications.CHANNEL_DOWNLOADER_PROGRESS).apply { setContentTitle("Anime Download Progress") - setSmallIcon(R.drawable.ic_round_download_24) + setSmallIcon(R.drawable.ic_download_24) priority = NotificationCompat.PRIORITY_DEFAULT setOnlyAlertOnce(true) } diff --git a/app/src/main/java/ani/dantotsu/download/manga/MangaDownloaderService.kt b/app/src/main/java/ani/dantotsu/download/manga/MangaDownloaderService.kt index 0a1337df..014e2abb 100644 --- a/app/src/main/java/ani/dantotsu/download/manga/MangaDownloaderService.kt +++ b/app/src/main/java/ani/dantotsu/download/manga/MangaDownloaderService.kt @@ -76,7 +76,7 @@ class MangaDownloaderService : Service() { notificationManager = NotificationManagerCompat.from(this) builder = NotificationCompat.Builder(this, CHANNEL_DOWNLOADER_PROGRESS).apply { setContentTitle("Manga Download Progress") - setSmallIcon(R.drawable.ic_round_download_24) + setSmallIcon(R.drawable.ic_download_24) priority = NotificationCompat.PRIORITY_DEFAULT setOnlyAlertOnce(true) setProgress(0, 0, false) diff --git a/app/src/main/java/ani/dantotsu/download/novel/NovelDownloaderService.kt b/app/src/main/java/ani/dantotsu/download/novel/NovelDownloaderService.kt index d729ef57..3df22fda 100644 --- a/app/src/main/java/ani/dantotsu/download/novel/NovelDownloaderService.kt +++ b/app/src/main/java/ani/dantotsu/download/novel/NovelDownloaderService.kt @@ -75,7 +75,7 @@ class NovelDownloaderService : Service() { builder = NotificationCompat.Builder(this, Notifications.CHANNEL_DOWNLOADER_PROGRESS).apply { setContentTitle("Novel Download Progress") - setSmallIcon(R.drawable.ic_round_download_24) + setSmallIcon(R.drawable.ic_download_24) priority = NotificationCompat.PRIORITY_DEFAULT setOnlyAlertOnce(true) setProgress(0, 0, false) diff --git a/app/src/main/java/ani/dantotsu/media/anime/EpisodeAdapters.kt b/app/src/main/java/ani/dantotsu/media/anime/EpisodeAdapters.kt index 53278072..78f4fbef 100644 --- a/app/src/main/java/ani/dantotsu/media/anime/EpisodeAdapters.kt +++ b/app/src/main/java/ani/dantotsu/media/anime/EpisodeAdapters.kt @@ -390,7 +390,7 @@ class EpisodeAdapter( binding.itemEpisodeDesc.visibility = if (desc != null && desc.trim(' ') != "") View.VISIBLE else View.GONE // Show download icon - binding.itemDownload.setImageResource(R.drawable.ic_circle_add) + binding.itemDownload.setImageResource(R.drawable.ic_download_24) binding.itemDownload.rotation = 0f } diff --git a/app/src/main/java/ani/dantotsu/media/manga/MangaChapterAdapter.kt b/app/src/main/java/ani/dantotsu/media/manga/MangaChapterAdapter.kt index 73229660..54676765 100644 --- a/app/src/main/java/ani/dantotsu/media/manga/MangaChapterAdapter.kt +++ b/app/src/main/java/ani/dantotsu/media/manga/MangaChapterAdapter.kt @@ -166,7 +166,7 @@ class MangaChapterAdapter( }, 1000) } else { // Show download icon - binding.itemDownload.setImageResource(R.drawable.ic_circle_add) + binding.itemDownload.setImageResource(R.drawable.ic_download_24) binding.itemDownload.rotation = 0f } diff --git a/app/src/main/java/ani/dantotsu/settings/AnimeExtensionsFragment.kt b/app/src/main/java/ani/dantotsu/settings/AnimeExtensionsFragment.kt index b0f20da1..2bed9224 100644 --- a/app/src/main/java/ani/dantotsu/settings/AnimeExtensionsFragment.kt +++ b/app/src/main/java/ani/dantotsu/settings/AnimeExtensionsFragment.kt @@ -114,7 +114,7 @@ class AnimeExtensionsFragment : Fragment(), context, Notifications.CHANNEL_DOWNLOADER_PROGRESS ) - .setSmallIcon(R.drawable.ic_round_download_24) + .setSmallIcon(R.drawable.ic_download_24) .setContentTitle("Installation complete") .setContentText("The extension has been successfully installed.") .setPriority(NotificationCompat.PRIORITY_LOW) diff --git a/app/src/main/java/ani/dantotsu/settings/FAQActivity.kt b/app/src/main/java/ani/dantotsu/settings/FAQActivity.kt index 8e994999..d91f4a4a 100644 --- a/app/src/main/java/ani/dantotsu/settings/FAQActivity.kt +++ b/app/src/main/java/ani/dantotsu/settings/FAQActivity.kt @@ -31,7 +31,7 @@ class FAQActivity : AppCompatActivity() { currContext()?.getString(R.string.answer_17) ?: "" ), Triple( - R.drawable.ic_round_download_24, + R.drawable.ic_download_24, currContext()?.getString(R.string.question_3) ?: "", currContext()?.getString(R.string.answer_3) ?: "" ), diff --git a/app/src/main/java/ani/dantotsu/settings/MangaExtensionsFragment.kt b/app/src/main/java/ani/dantotsu/settings/MangaExtensionsFragment.kt index be65cc95..7aa30a6b 100644 --- a/app/src/main/java/ani/dantotsu/settings/MangaExtensionsFragment.kt +++ b/app/src/main/java/ani/dantotsu/settings/MangaExtensionsFragment.kt @@ -115,7 +115,7 @@ class MangaExtensionsFragment : Fragment(), context, Notifications.CHANNEL_DOWNLOADER_PROGRESS ) - .setSmallIcon(R.drawable.ic_round_download_24) + .setSmallIcon(R.drawable.ic_download_24) .setContentTitle("Installation complete") .setContentText("The extension has been successfully installed.") .setPriority(NotificationCompat.PRIORITY_LOW) diff --git a/app/src/main/java/ani/dantotsu/settings/NovelExtensionsFragment.kt b/app/src/main/java/ani/dantotsu/settings/NovelExtensionsFragment.kt index 1148cdc3..a06505d0 100644 --- a/app/src/main/java/ani/dantotsu/settings/NovelExtensionsFragment.kt +++ b/app/src/main/java/ani/dantotsu/settings/NovelExtensionsFragment.kt @@ -116,7 +116,7 @@ class NovelExtensionsFragment : Fragment(), context, Notifications.CHANNEL_DOWNLOADER_PROGRESS ) - .setSmallIcon(R.drawable.ic_round_download_24) + .setSmallIcon(R.drawable.ic_download_24) .setContentTitle("Installation complete") .setContentText("The extension has been successfully installed.") .setPriority(NotificationCompat.PRIORITY_LOW) diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/anime/util/AnimeExtensionInstallService.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/anime/util/AnimeExtensionInstallService.kt index 33b09352..87e6ab6a 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/anime/util/AnimeExtensionInstallService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/anime/util/AnimeExtensionInstallService.kt @@ -24,7 +24,7 @@ class AnimeExtensionInstallService : Service() { override fun onCreate() { val notification = notificationBuilder(Notifications.CHANNEL_EXTENSIONS_UPDATE) { - setSmallIcon(R.drawable.ic_round_download_24) + setSmallIcon(R.drawable.ic_download_24) setAutoCancel(false) setOngoing(true) setShowWhen(false) diff --git a/app/src/main/java/eu/kanade/tachiyomi/extension/manga/util/MangaExtensionInstallService.kt b/app/src/main/java/eu/kanade/tachiyomi/extension/manga/util/MangaExtensionInstallService.kt index eb9118a7..f6cc24cc 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/extension/manga/util/MangaExtensionInstallService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/extension/manga/util/MangaExtensionInstallService.kt @@ -24,7 +24,7 @@ class MangaExtensionInstallService : Service() { override fun onCreate() { val notification = notificationBuilder(Notifications.CHANNEL_EXTENSIONS_UPDATE) { - setSmallIcon(R.drawable.ic_round_download_24) + setSmallIcon(R.drawable.ic_download_24) setAutoCancel(false) setOngoing(true) setShowWhen(false) diff --git a/app/src/main/res/drawable/ic_round_download_24.xml b/app/src/main/res/drawable/ic_download_24.xml similarity index 100% rename from app/src/main/res/drawable/ic_round_download_24.xml rename to app/src/main/res/drawable/ic_download_24.xml diff --git a/app/src/main/res/layout/activity_manga_reader.xml b/app/src/main/res/layout/activity_manga_reader.xml index f1869d98..b9ffade1 100644 --- a/app/src/main/res/layout/activity_manga_reader.xml +++ b/app/src/main/res/layout/activity_manga_reader.xml @@ -289,7 +289,7 @@ android:layout_width="wrap_content" android:layout_height="48dp" android:backgroundTint="#00FFFFFF" - android:src="@drawable/ic_round_download_24" + android:src="@drawable/ic_download_24" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/activity_novel_reader.xml b/app/src/main/res/layout/activity_novel_reader.xml index 9bf9e9ae..d3ab8b90 100644 --- a/app/src/main/res/layout/activity_novel_reader.xml +++ b/app/src/main/res/layout/activity_novel_reader.xml @@ -105,7 +105,7 @@ android:layout_width="wrap_content" android:layout_height="48dp" android:backgroundTint="#00FFFFFF" - android:src="@drawable/ic_round_download_24" + android:src="@drawable/ic_download_24" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 5d148b42..23648143 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -827,7 +827,7 @@ android:textAllCaps="false" android:textColor="?attr/colorOnBackground" app:cornerRadius="0dp" - app:icon="@drawable/ic_round_download_24" + app:icon="@drawable/ic_download_24" app:iconPadding="16dp" app:iconSize="24dp" app:iconTint="?attr/colorPrimary" /> @@ -858,7 +858,7 @@ android:textAllCaps="false" android:textColor="?attr/colorOnBackground" app:cornerRadius="0dp" - app:icon="@drawable/ic_round_download_24" + app:icon="@drawable/ic_download_24" app:iconPadding="16dp" app:iconSize="24dp" app:iconTint="?attr/colorPrimary" /> diff --git a/app/src/main/res/layout/bottom_sheet_settings.xml b/app/src/main/res/layout/bottom_sheet_settings.xml index 0cdc88ed..dc80c37d 100644 --- a/app/src/main/res/layout/bottom_sheet_settings.xml +++ b/app/src/main/res/layout/bottom_sheet_settings.xml @@ -109,7 +109,7 @@ android:textAllCaps="false" android:textColor="?attr/colorOnBackground" app:cornerRadius="0dp" - android:drawableStart="@drawable/ic_round_download_24" + android:drawableStart="@drawable/ic_download_24" android:drawablePadding="16dp" android:layout_marginBottom="8dp" app:drawableTint="?attr/colorPrimary" diff --git a/app/src/main/res/layout/dialog_layout.xml b/app/src/main/res/layout/dialog_layout.xml index 06f9469b..476c7ea4 100644 --- a/app/src/main/res/layout/dialog_layout.xml +++ b/app/src/main/res/layout/dialog_layout.xml @@ -193,7 +193,7 @@ android:layout_width="48dp" android:layout_height="48dp" android:background="?android:attr/selectableItemBackground" - app:srcCompat="@drawable/ic_round_download_24" + app:srcCompat="@drawable/ic_download_24" app:tint="?attr/colorOnBackground" tools:ignore="ContentDescription,ImageContrastCheck" /> diff --git a/app/src/main/res/layout/item_chapter_list.xml b/app/src/main/res/layout/item_chapter_list.xml index 24609e85..e4b748af 100644 --- a/app/src/main/res/layout/item_chapter_list.xml +++ b/app/src/main/res/layout/item_chapter_list.xml @@ -51,7 +51,7 @@ android:layout_marginEnd="5dp" android:background="?android:attr/selectableItemBackground" app:tint="?attr/colorOnBackground" - app:srcCompat="@drawable/ic_round_download_24" /> + app:srcCompat="@drawable/ic_download_24" /> diff --git a/app/src/main/res/layout/item_extension_all.xml b/app/src/main/res/layout/item_extension_all.xml index 55f3c198..0d367b95 100644 --- a/app/src/main/res/layout/item_extension_all.xml +++ b/app/src/main/res/layout/item_extension_all.xml @@ -44,7 +44,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:src="@drawable/ic_round_download_24" + android:src="@drawable/ic_download_24" android:textSize="14sp" app:tint="?attr/colorOnBackground"/> diff --git a/app/src/main/res/layout/item_url.xml b/app/src/main/res/layout/item_url.xml index cdd0b625..e562236e 100644 --- a/app/src/main/res/layout/item_url.xml +++ b/app/src/main/res/layout/item_url.xml @@ -72,7 +72,7 @@ android:layout_height="48dp" android:layout_marginEnd="16dp" android:backgroundTint="#00FFFFFF" - android:src="@drawable/ic_round_download_24" + android:src="@drawable/ic_download_24" app:tint="?attr/colorOnBackground" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent"