Lightemerald/Dantotsu
1
0
Fork 0
mirror of https://github.com/rebelonion/Dantotsu.git synced 2026-01-29 20:41:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: random things

Browse Source
This commit is contained in:
aayush262
2024-06-11 20:56:59 +05:30
parent 3ae59b8d22
commit 903423b842
6 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/ani/dantotsu/profile/activity/ActivityFragment.kt
View File

@@ -48,9 +48,11 @@ class ActivityFragment : Fragment() {
userId = it.getInt("userId")
activityId = it.getInt("activityId")
}
binding.titleBar.visibility = if (type == ActivityType.OTHER_USER) View.VISIBLE else View.GONE
binding.titleText.text = if (userId == Anilist.userid) getString(R.string.create_new_activity) else getString(R.string.write_a_message)
binding.titleImage.setOnClickListener{handleTitleImageClick() }
binding.titleBar.visibility =
if (type == ActivityType.OTHER_USER) View.VISIBLE else View.GONE
binding.titleText.text =
if (userId == Anilist.userid) getString(R.string.create_new_activity) else getString(R.string.write_a_message)
binding.titleImage.setOnClickListener { handleTitleImageClick() }
binding.listRecyclerView.adapter = adapter
binding.listRecyclerView.layoutManager = LinearLayoutManager(context)
binding.listProgressBar.isVisible = true
@@ -88,6 +90,7 @@ class ActivityFragment : Fragment() {
}
})
}
private fun handleTitleImageClick() {
val intent = Intent(context, ActivityMarkdownCreator::class.java).apply {
putExtra("type", if (userId == Anilist.userid) "activity" else "message")
@@ -103,14 +106,14 @@ class ActivityFragment : Fragment() {
ActivityType.OTHER_USER -> getActivities(userId = userId)
ActivityType.ONE -> getActivities(activityId = activityId)
}
adapter.addAll(list.map { ActivityItem(it, ::onActivityClick, adapter ,requireActivity()) })
adapter.addAll(list.map { ActivityItem(it, adapter, ::onActivityClick) })
}
private suspend fun getActivities(
global: Boolean = false,
userId: Int? = null,
activityId: Int? = null,
filter:Boolean = false
filter: Boolean = false
): List<Activity> {
val res = Anilist.query.getFeed(userId, global, page, activityId)?.data?.page?.activities
page += 1
@@ -133,7 +136,11 @@ class ActivityFragment : Fragment() {
private fun onActivityClick(id: Int, type: String) {
val intent = when (type) {
"USER" -> Intent(requireContext(), ProfileActivity::class.java).putExtra("userId", id)
"MEDIA" -> Intent(requireContext(), MediaDetailsActivity::class.java).putExtra("mediaId", id)
"MEDIA" -> Intent(
requireContext(),
MediaDetailsActivity::class.java
).putExtra("mediaId", id)
else -> return
}
ContextCompat.startActivity(requireContext(), intent, null)
@@ -149,7 +156,11 @@ class ActivityFragment : Fragment() {
companion object {
enum class ActivityType { GLOBAL, USER, OTHER_USER, ONE }
fun newInstance(type: ActivityType, userId: Int? = null, activityId: Int? = null): ActivityFragment {
fun newInstance(
type: ActivityType,
userId: Int? = null,
activityId: Int? = null
): ActivityFragment {
return ActivityFragment().apply {
arguments = Bundle().apply {
putSerializable("type", type)

7
app/src/main/java/ani/dantotsu/profile/activity/ActivityItem.kt
View File

@@ -29,9 +29,8 @@ import kotlinx.coroutines.withContext
class ActivityItem(
private val activity: Activity,
val clickCallback: (Int, type: String) -> Unit,
private val parentAdapter: GroupieAdapter,
private val fragActivity: FragmentActivity
val clickCallback: (Int, type: String) -> Unit,
) : BindableItem<ItemActivityBinding>() {
private lateinit var binding: ItemActivityBinding
@@ -54,14 +53,14 @@ class ActivityItem(
}
binding.activityRepliesContainer.setOnClickListener {
RepliesBottomDialog.newInstance(activity.id)
.show(fragActivity.supportFragmentManager, "replies")
.show((context as FragmentActivity).supportFragmentManager, "replies")
}
binding.replyCount.text = activity.replyCount.toString()
binding.activityReplies.setColorFilter(ContextCompat.getColor(binding.root.context, R.color.bg_opp))
binding.activityLikeContainer.setOnLongClickListener {
UsersDialogFragment().apply {
userList(userList)
show(fragActivity.supportFragmentManager, "dialog")
show((context as FragmentActivity).supportFragmentManager, "dialog")
}
true
}