diff --git a/app/src/main/java/ani/dantotsu/home/HomeFragment.kt b/app/src/main/java/ani/dantotsu/home/HomeFragment.kt index c3a154a2..b9b6862a 100644 --- a/app/src/main/java/ani/dantotsu/home/HomeFragment.kt +++ b/app/src/main/java/ani/dantotsu/home/HomeFragment.kt @@ -80,8 +80,8 @@ class HomeFragment : Fragment() { binding.homeUserEpisodesWatched.text = Anilist.episodesWatched.toString() binding.homeUserChaptersRead.text = Anilist.chapterRead.toString() binding.homeUserAvatar.loadImage(Anilist.avatar) - if (!(PrefManager.getVal(PrefName.BannerAnimations) as Boolean)) binding.homeUserBg.pause() - blurImage(binding.homeUserBg, Anilist.bg) + val bannerAnimations: Boolean = PrefManager.getVal(PrefName.BannerAnimations) + blurImage(if (bannerAnimations) binding.homeUserBg else binding.homeUserBgNoKen, Anilist.bg) binding.homeUserDataProgressBar.visibility = View.GONE binding.homeNotificationCount.isVisible = Anilist.unreadNotificationCount > 0 binding.homeNotificationCount.text = Anilist.unreadNotificationCount.toString() @@ -137,6 +137,7 @@ class HomeFragment : Fragment() { bottomMargin = navBarHeight } binding.homeUserBg.updateLayoutParams { height += statusBarHeight } + binding.homeUserBgNoKen.updateLayoutParams { height += statusBarHeight } binding.homeTopContainer.updatePadding(top = statusBarHeight) var reached = false diff --git a/app/src/main/java/ani/dantotsu/media/MediaAdaptor.kt b/app/src/main/java/ani/dantotsu/media/MediaAdaptor.kt index 78d264ee..8fa4e1fa 100644 --- a/app/src/main/java/ani/dantotsu/media/MediaAdaptor.kt +++ b/app/src/main/java/ani/dantotsu/media/MediaAdaptor.kt @@ -173,6 +173,7 @@ class MediaAdaptor( val b = (holder as MediaPageViewHolder).binding val media = mediaList?.get(position) if (media != null) { + val bannerAnimations: Boolean = PrefManager.getVal(PrefName.BannerAnimations) b.itemCompactImage.loadImage(media.cover) if (bannerAnimations) @@ -182,7 +183,7 @@ class MediaAdaptor( AccelerateDecelerateInterpolator() ) ) - blurImage(b.itemCompactBanner, media.banner ?: media.cover) + blurImage(if (bannerAnimations) b.itemCompactBanner else b.itemCompactBannerNoKen , media.banner ?: media.cover) b.itemCompactOngoing.isVisible = media.status == currActivity()!!.getString(R.string.status_releasing) b.itemCompactTitle.text = media.userPreferredName @@ -231,7 +232,7 @@ class MediaAdaptor( AccelerateDecelerateInterpolator() ) ) - blurImage(b.itemCompactBanner, media.banner ?: media.cover) + blurImage(if (bannerAnimations) b.itemCompactBanner else b.itemCompactBannerNoKen , media.banner ?: media.cover) b.itemCompactOngoing.isVisible = media.status == currActivity()!!.getString(R.string.status_releasing) b.itemCompactTitle.text = media.userPreferredName diff --git a/app/src/main/java/ani/dantotsu/profile/ProfileActivity.kt b/app/src/main/java/ani/dantotsu/profile/ProfileActivity.kt index abbe26e5..90fd0278 100644 --- a/app/src/main/java/ani/dantotsu/profile/ProfileActivity.kt +++ b/app/src/main/java/ani/dantotsu/profile/ProfileActivity.kt @@ -6,6 +6,7 @@ import android.content.res.Configuration import android.os.Bundle import android.view.View import android.view.ViewGroup +import android.widget.ImageView import android.widget.PopupMenu import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat @@ -189,9 +190,11 @@ class ProfileActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedListene val userLevelText = "${user.name} $userLevel" binding.profileUserName.text = userLevelText - if (!(PrefManager.getVal(PrefName.BannerAnimations) as Boolean)) binding.profileBannerImage.pause() - blurImage(binding.profileBannerImage, user.bannerImage ?: user.avatar?.medium) + val bannerAnimations: Boolean = PrefManager.getVal(PrefName.BannerAnimations) + + blurImage(if (bannerAnimations) binding.profileBannerImage else binding.profileBannerImageNoKen as ImageView, user.bannerImage ?: user.avatar?.medium) binding.profileBannerImage.updateLayoutParams { height += statusBarHeight } + binding.profileBannerImageNoKen?.updateLayoutParams { height += statusBarHeight } binding.profileBannerGradient.updateLayoutParams { height += statusBarHeight } binding.profileMenuButton.updateLayoutParams { topMargin += statusBarHeight } binding.profileButtonContainer.updateLayoutParams { topMargin += statusBarHeight } diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml index dcde0a9a..10efe6e4 100644 --- a/app/src/main/res/layout/activity_profile.xml +++ b/app/src/main/res/layout/activity_profile.xml @@ -46,6 +46,14 @@ tools:ignore="ContentDescription" tools:src="@tools:sample/backgrounds/scenic" /> + + + + + android:padding="32dp">