From 3567b8dcedbdd70fb5b099bc8b3db95b16bf9593 Mon Sep 17 00:00:00 2001 From: Finnley Somdahl <87634197+rebelonion@users.noreply.github.com> Date: Wed, 25 Oct 2023 01:22:40 -0500 Subject: [PATCH] hotfix --- .../dantotsu/media/MediaDetailsActivity.kt | 46 +++++++++++++++---- .../dantotsu/media/anime/AnimeWatchAdapter.kt | 1 + stable.md | 15 +----- 3 files changed, 39 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt b/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt index 373283d3..46d57ebd 100644 --- a/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt +++ b/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt @@ -169,13 +169,28 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi R.drawable.ic_round_favorite_24 ) ) + val typedValue = TypedValue() + this.theme.resolveAttribute( + com.google.android.material.R.attr.colorSecondary, + typedValue, + true + ) + val color = typedValue.data + val typedValue2 = TypedValue() + this.theme.resolveAttribute( + com.google.android.material.R.attr.colorSecondary, + typedValue2, + true + ) + val color2 = typedValue.data + PopImageButton( scope, binding.mediaFav, R.drawable.ic_round_favorite_24, R.drawable.ic_round_favorite_border_24, - com.google.android.material.R.attr.colorSecondary, - com.google.android.material.R.attr.colorSecondary, + R.color.bg_opp, + R.color.violet_400, media.isFav ) { media.isFav = it @@ -191,7 +206,11 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi fun total() { val text = SpannableStringBuilder().apply { val typedValue = TypedValue() - this@MediaDetailsActivity.theme.resolveAttribute(com.google.android.material.R.attr.colorOnBackground, typedValue, true) + this@MediaDetailsActivity.theme.resolveAttribute( + com.google.android.material.R.attr.colorOnBackground, + typedValue, + true + ) val white = typedValue.data if (media.userStatus != null) { append(if (media.anime != null) getString(R.string.watched_num) else getString(R.string.read_num)) @@ -401,7 +420,11 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi if (binding.mediaCover.scaleX == 0f) View.GONE else View.VISIBLE val duration = (200 * uiSettings.animationSpeed).toLong() val typedValue = TypedValue() - this@MediaDetailsActivity.theme.resolveAttribute(com.google.android.material.R.attr.colorSecondary, typedValue, true) + this@MediaDetailsActivity.theme.resolveAttribute( + com.google.android.material.R.attr.colorSecondary, + typedValue, + true + ) val color = typedValue.data if (percentage >= percent && !isCollapsed) { isCollapsed = true @@ -473,6 +496,7 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi ObjectAnimator.ofFloat(image, "scaleX", 1f, 0f).setDuration(69).start() ObjectAnimator.ofFloat(image, "scaleY", 1f, 0f).setDuration(100).start() delay(100) + if (clicked) { ObjectAnimator.ofArgb( image, @@ -488,12 +512,14 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi ObjectAnimator.ofFloat(image, "scaleX", 1.5f, 1f).setDuration(100).start() ObjectAnimator.ofFloat(image, "scaleY", 1.5f, 1f).setDuration(100).start() delay(200) - if (clicked) ObjectAnimator.ofArgb( - image, - "ColorFilter", - ContextCompat.getColor(context, c2), - ContextCompat.getColor(context, c1) - ).setDuration(200).start() + if (clicked) { + ObjectAnimator.ofArgb( + image, + "ColorFilter", + ContextCompat.getColor(context, c2), + ContextCompat.getColor(context, c1) + ).setDuration(200).start() + } } fun enabled(enabled: Boolean) { diff --git a/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchAdapter.kt b/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchAdapter.kt index 4b214418..04886529 100644 --- a/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchAdapter.kt +++ b/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchAdapter.kt @@ -3,6 +3,7 @@ package ani.dantotsu.media.anime import android.annotation.SuppressLint import android.content.Intent import android.net.Uri +import android.util.TypedValue import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/stable.md b/stable.md index f06c8743..20ea5695 100644 --- a/stable.md +++ b/stable.md @@ -1,14 +1,3 @@ -# 0.1.3 +# 0.1.4 -- **Bugfixes:** - - Fixes for manga and anime extensions - - Fixed softsubs not showing - - Fixed various crashes - - Fixed manga continue button not showing - - Fixed calendar/anime list page not following Material You - - probably other stuff I forgor - -- **New Features:** - - App coloring rework - - Themes! 4 themes added - - Added Extension-specific DNS +- hotfix for those who crashed when opening an anime/manga \ No newline at end of file