diff --git a/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt b/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt index 797e6191..aa6db416 100644 --- a/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt +++ b/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt @@ -435,7 +435,7 @@ class AnilistQueries { response.data.page2.activities ).asSequence().flatten() .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() .sortedByDescending { it.createdAt } val anilistActivities = mutableListOf() diff --git a/app/src/main/java/ani/dantotsu/home/AnimePageAdapter.kt b/app/src/main/java/ani/dantotsu/home/AnimePageAdapter.kt index df0e0939..9c61920b 100644 --- a/app/src/main/java/ani/dantotsu/home/AnimePageAdapter.kt +++ b/app/src/main/java/ani/dantotsu/home/AnimePageAdapter.kt @@ -268,8 +268,9 @@ class AnimePageAdapter : RecyclerView.Adapter { bottomMargin = navBarHeight } + binding.emptyTextView.text = getString(R.string.no_notifications) lifecycleScope.launch { getList() if (adapter.itemCount == 0) { @@ -102,10 +104,10 @@ class ActivityFragment( ): List { val res = Anilist.query.getFeed(userId, global, page, activityId)?.data?.page?.activities page += 1 - return res?.filter { - if (Anilist.adult) true else it.media?.isAdult == false && - (it.recipient?.id == null || it.recipient.id == Anilist.userid) - } ?: emptyList() + return res + ?.filter { if (Anilist.adult) true else it.media?.isAdult != true } + ?.filterNot { it.recipient?.id != null && it.recipient.id != Anilist.userid } + ?: emptyList() } private fun shouldLoadMore(): Boolean { diff --git a/app/src/main/res/layout/item_profile_app_bar.xml b/app/src/main/res/layout/item_profile_app_bar.xml index e96af0e8..6ad761f9 100644 --- a/app/src/main/res/layout/item_profile_app_bar.xml +++ b/app/src/main/res/layout/item_profile_app_bar.xml @@ -90,14 +90,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:backgroundTint="?attr/colorSecondaryContainer" + android:backgroundTint="?attr/colorOnPrimary" android:enabled="true" android:fontFamily="@font/poppins_bold" android:text="@string/follow" android:textColor="@color/bg_opp" android:textSize="14sp" app:cornerRadius="8dp" - app:strokeColor="?attr/colorSecondaryContainer" + app:strokeColor="?attr/colorOnPrimary" tools:ignore="SpeakableTextPresentCheck" />