diff --git a/app/src/main/java/ani/dantotsu/home/StatusActivity.kt b/app/src/main/java/ani/dantotsu/home/StatusActivity.kt index 3c665fbd..bb872def 100644 --- a/app/src/main/java/ani/dantotsu/home/StatusActivity.kt +++ b/app/src/main/java/ani/dantotsu/home/StatusActivity.kt @@ -13,6 +13,7 @@ import ani.dantotsu.initActivity import ani.dantotsu.others.getSerialized import ani.dantotsu.themes.ThemeManager import ani.dantotsu.home.status.listener.StoriesCallback +import ani.dantotsu.media.Media import ani.dantotsu.navBarHeight import ani.dantotsu.profile.User import ani.dantotsu.settings.saving.PrefManager @@ -32,7 +33,7 @@ class StatusActivity : AppCompatActivity(), StoriesCallback { initActivity(this) binding = ActivityStatusBinding.inflate(layoutInflater) setContentView(binding.root) - activity = intent.getSerialized("user")!! + activity = user position = intent.getIntExtra("position", -1) binding.root.updateLayoutParams { topMargin = statusBarHeight @@ -85,5 +86,7 @@ class StatusActivity : AppCompatActivity(), StoriesCallback { finish() } } - + companion object { + var user: ArrayList = arrayListOf() + } } \ No newline at end of file diff --git a/app/src/main/java/ani/dantotsu/home/UserStatus.kt b/app/src/main/java/ani/dantotsu/home/UserStatus.kt index 1f6282a8..7601f851 100644 --- a/app/src/main/java/ani/dantotsu/home/UserStatus.kt +++ b/app/src/main/java/ani/dantotsu/home/UserStatus.kt @@ -11,22 +11,21 @@ import ani.dantotsu.profile.ProfileActivity import ani.dantotsu.profile.User import ani.dantotsu.setAnimation import ani.dantotsu.settings.saving.PrefManager -import java.io.Serializable class UserStatus(private val user: ArrayList) : - RecyclerView.Adapter< UserStatus.UsersViewHolder>() { + RecyclerView.Adapter() { inner class UsersViewHolder(val binding: ItemUserStatusBinding) : RecyclerView.ViewHolder(binding.root) { init { itemView.setOnClickListener { - ContextCompat.startActivity( + StatusActivity.user = user + ContextCompat.startActivity( itemView.context, Intent( itemView.context, StatusActivity::class.java - ).putExtra("user", user as Serializable) - .putExtra("position", bindingAdapterPosition), + ).putExtra("position", bindingAdapterPosition), null ) } @@ -61,7 +60,8 @@ class UserStatus(private val user: ArrayList) : b.profileUserAvatar.loadImage(user.pfp) b.profileUserName.text = user.name - val watchedActivityIds = PrefManager.getCustomVal>("${user.id}_activities", setOf()) + val watchedActivityIds = + PrefManager.getCustomVal>("${user.id}_activities", setOf()) val activityIdToStatusList = user.activity.map { watchedActivityIds.contains(it.id) } b.profileUserStatusIndicator.setParts(user.activity.size, activityIdToStatusList) diff --git a/app/src/main/java/ani/dantotsu/home/status/Stories.kt b/app/src/main/java/ani/dantotsu/home/status/Stories.kt index fae1c31f..b67626b6 100644 --- a/app/src/main/java/ani/dantotsu/home/status/Stories.kt +++ b/app/src/main/java/ani/dantotsu/home/status/Stories.kt @@ -31,6 +31,7 @@ import ani.dantotsu.profile.User import ani.dantotsu.profile.UsersDialogFragment import ani.dantotsu.profile.activity.ActivityItemBuilder import ani.dantotsu.settings.saving.PrefManager +import ani.dantotsu.settings.saving.PrefName import ani.dantotsu.snackString import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -52,6 +53,7 @@ constructor( private lateinit var rightTouchPanel: FrameLayout private lateinit var statusUserContainer: LinearLayout private lateinit var imageContentView: ImageView + private lateinit var imageContentViewKen: ImageView private lateinit var loadingView: ProgressBar private lateinit var activityLikeCount: TextView private lateinit var activityLike: ImageView @@ -84,6 +86,7 @@ constructor( leftTouchPanel = findViewById(R.id.leftTouchPanel) rightTouchPanel = findViewById(R.id.rightTouchPanel) imageContentView = findViewById(R.id.contentImageView) + imageContentViewKen = findViewById(R.id.contentImageViewKen) statusUserContainer = findViewById(R.id.statusUserContainer) loadingView = findViewById(R.id.androidStoriesLoadingView) coverImage = findViewById(R.id.coverImage) @@ -369,7 +372,9 @@ constructor( private fun loadStory(story: Activity) { loadingView.visibility = View.GONE animation.start() - blurImage(imageContentView, story.media?.bannerImage ?: story.media?.coverImage?.extraLarge) + val bannerAnimations: Boolean = PrefManager.getVal(PrefName.BannerAnimations) + + blurImage(if (bannerAnimations)imageContentViewKen else imageContentView, story.media?.bannerImage ?: story.media?.coverImage?.extraLarge) userAvatar.loadImage(story.user?.avatar?.large) coverImage.loadImage(story.media?.coverImage?.extraLarge) userName.text = story.user?.name @@ -381,7 +386,12 @@ constructor( else { it.toString() } - }} ${story.progress ?: story.media?.title?.userPreferred}" + }} ${story.progress ?: story.media?.title?.userPreferred} " + + if (story.status?.contains("Completed") != false) { + "of ${story.media?.title?.userPreferred}" + }else { + "" + } infoText.text = text statusUserContainer.setOnClickListener { diff --git a/app/src/main/res/layout/fragment_status.xml b/app/src/main/res/layout/fragment_status.xml index a612923f..2dda0b8b 100644 --- a/app/src/main/res/layout/fragment_status.xml +++ b/app/src/main/res/layout/fragment_status.xml @@ -6,6 +6,14 @@ android:layout_height="match_parent" tools:ignore="ContentDescription"> + + + - - - - - @@ -143,10 +133,10 @@ android:id="@+id/itemCompactCard" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginBottom="124dp" android:translationZ="8dp" app:cardCornerRadius="16dp" app:cardElevation="4dp" - android:layout_marginBottom="124dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -163,39 +153,63 @@ tools:srcCompat="@tools:sample/backgrounds/scenic" /> - + app:layout_constraintStart_toStartOf="parent"> - + + + + + + +