rebelonion/Dantotsu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: small bug fix

Browse source
This commit is contained in:
aayush262 2024-05-26 23:48:40 +05:30
parent 72fe910c59
commit 46c17dced1
4 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt
View file

@ -435,7 +435,7 @@ class AnilistQueries {
response.data.page2.activities response.data.page2.activities
).asSequence().flatten() ).asSequence().flatten()
.filter { it.typename != "MessageActivity" } .filter { it.typename != "MessageActivity" }
.filter { if (Anilist.adult) true else it.media?.isAdult == false } .filter { if (Anilist.adult) true else it.media?.isAdult != true }
.filter { it.createdAt * 1000L > threeDaysAgo }.toList() .filter { it.createdAt * 1000L > threeDaysAgo }.toList()
.sortedByDescending { it.createdAt } .sortedByDescending { it.createdAt }
val anilistActivities = mutableListOf<User>() val anilistActivities = mutableListOf<User>()

3
app/src/main/java/ani/dantotsu/home/AnimePageAdapter.kt
View file

@ -268,8 +268,9 @@ class AnimePageAdapter : RecyclerView.Adapter<AnimePageAdapter.AnimePageViewHold
LinearLayoutManager.HORIZONTAL, LinearLayoutManager.HORIZONTAL,
false false
) )
MediaListViewActivity.passedMedia = media.toCollection(ArrayList())
more.setOnClickListener { more.setOnClickListener {
MediaListViewActivity.passedMedia = media.toCollection(ArrayList())
ContextCompat.startActivity( ContextCompat.startActivity(
it.context, Intent(it.context, MediaListViewActivity::class.java) it.context, Intent(it.context, MediaListViewActivity::class.java)
.putExtra("title", string), .putExtra("title", string),

10
app/src/main/java/ani/dantotsu/profile/activity/ActivityFragment.kt
View file

@ -12,6 +12,7 @@ import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import ani.dantotsu.R
import ani.dantotsu.connections.anilist.Anilist import ani.dantotsu.connections.anilist.Anilist
import ani.dantotsu.connections.anilist.api.Activity import ani.dantotsu.connections.anilist.api.Activity
import ani.dantotsu.databinding.FragmentFeedBinding import ani.dantotsu.databinding.FragmentFeedBinding
@ -54,6 +55,7 @@ class ActivityFragment(
binding.feedRefresh.updateLayoutParams<ViewGroup.MarginLayoutParams> { binding.feedRefresh.updateLayoutParams<ViewGroup.MarginLayoutParams> {
bottomMargin = navBarHeight bottomMargin = navBarHeight
} }
binding.emptyTextView.text = getString(R.string.no_notifications)
lifecycleScope.launch { lifecycleScope.launch {
getList() getList()
if (adapter.itemCount == 0) { if (adapter.itemCount == 0) {
@ -102,10 +104,10 @@ class ActivityFragment(
): List<Activity> { ): List<Activity> {
val res = Anilist.query.getFeed(userId, global, page, activityId)?.data?.page?.activities val res = Anilist.query.getFeed(userId, global, page, activityId)?.data?.page?.activities
page += 1 page += 1
return res?.filter { return res
if (Anilist.adult) true else it.media?.isAdult == false && ?.filter { if (Anilist.adult) true else it.media?.isAdult != true }
(it.recipient?.id == null || it.recipient.id == Anilist.userid) ?.filterNot { it.recipient?.id != null && it.recipient.id != Anilist.userid }
} ?: emptyList() ?: emptyList()
} }
private fun shouldLoadMore(): Boolean { private fun shouldLoadMore(): Boolean {

4
app/src/main/res/layout/item_profile_app_bar.xml
View file

@ -90,14 +90,14 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:backgroundTint="?attr/colorSecondaryContainer" android:backgroundTint="?attr/colorOnPrimary"
android:enabled="true" android:enabled="true"
android:fontFamily="@font/poppins_bold" android:fontFamily="@font/poppins_bold"
android:text="@string/follow" android:text="@string/follow"
android:textColor="@color/bg_opp" android:textColor="@color/bg_opp"
android:textSize="14sp" android:textSize="14sp"
app:cornerRadius="8dp" app:cornerRadius="8dp"
app:strokeColor="?attr/colorSecondaryContainer" app:strokeColor="?attr/colorOnPrimary"
tools:ignore="SpeakableTextPresentCheck" /> tools:ignore="SpeakableTextPresentCheck" />
</LinearLayout> </LinearLayout>