diff --git a/app/src/main/java/ani/dantotsu/media/MediaAdaptor.kt b/app/src/main/java/ani/dantotsu/media/MediaAdaptor.kt index aebd8dbf..188849f6 100644 --- a/app/src/main/java/ani/dantotsu/media/MediaAdaptor.kt +++ b/app/src/main/java/ani/dantotsu/media/MediaAdaptor.kt @@ -152,25 +152,22 @@ class MediaAdaptor( (if (media.userScore != 0) R.drawable.item_user_score else R.drawable.item_score) ) if (media.anime != null) { - b.itemTotal.text = " " + if ((media.anime.totalEpisodes - ?: 0) != 1 - ) currActivity()!!.getString(R.string.episode_plural) - else currActivity()!!.getString(R.string.episode_singular) + val itemTotal = " " + if ((media.anime.totalEpisodes ?: 0) != 1) currActivity()!!.getString(R.string.episode_plural) else currActivity()!!.getString(R.string.episode_singular) + b.itemTotal.text = itemTotal b.itemCompactTotal.text = if (media.anime.nextAiringEpisode != null) (media.anime.nextAiringEpisode.toString() + " / " + (media.anime.totalEpisodes ?: "??").toString()) else (media.anime.totalEpisodes ?: "??").toString() } else if (media.manga != null) { - b.itemTotal.text = " " + if ((media.manga.totalChapters - ?: 0) != 1 - ) currActivity()!!.getString(R.string.chapter_plural) - else currActivity()!!.getString(R.string.chapter_singular) + val itemTotal = " " + if ((media.manga.totalChapters ?: 0) != 1) currActivity()!!.getString(R.string.chapter_plural) else currActivity()!!.getString(R.string.chapter_singular) + b.itemTotal.text = itemTotal b.itemCompactTotal.text = "${media.manga.totalChapters ?: "??"}" } - @SuppressLint("NotifyDataSetChanged") if (position == mediaList!!.size - 2 && viewPager != null) viewPager.post { + val start = mediaList.size mediaList.addAll(mediaList) - notifyDataSetChanged() + val end = mediaList.size - start + notifyItemRangeInserted(start, end) } } } diff --git a/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt b/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt index 022ebe2d..a7b8858f 100644 --- a/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt +++ b/app/src/main/java/ani/dantotsu/media/MediaDetailsActivity.kt @@ -367,6 +367,16 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi navBar.addTab(infoTab) navBar.addTab(watchTab) navBar.addTab(commentTab) + if (model.continueMedia == null && media.cameFromContinue) { + model.continueMedia = PrefManager.getVal(PrefName.ContinueMedia) + selected = 1 + } + if (intent.getStringExtra("FRAGMENT_TO_LOAD") != null) selected = 2 + if (viewPager.currentItem != selected) viewPager.post { + viewPager.setCurrentItem(selected, false) + } + binding.commentInputLayout.isVisible = selected == 2 + navBar.selectTabAt(selected) navBar.setOnTabSelectListener(object : AnimatedBottomBar.OnTabSelectListener { override fun onTabSelected( lastIndex: Int, @@ -383,18 +393,6 @@ class MediaDetailsActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedLi } }) - if (model.continueMedia == null && media.cameFromContinue) { - model.continueMedia = PrefManager.getVal(PrefName.ContinueMedia) - selected = 1 - } - val frag = intent.getStringExtra("FRAGMENT_TO_LOAD") - if (frag != null) { - selected = 2 - } - navBar.selectTabAt(selected) - binding.commentInputLayout.isVisible = selected == 2 - viewPager.setCurrentItem(selected, false) - val live = Refresh.activity.getOrPut(this.hashCode()) { MutableLiveData(true) } live.observe(this) { if (it) { diff --git a/app/src/main/java/ani/dantotsu/profile/ProfileActivity.kt b/app/src/main/java/ani/dantotsu/profile/ProfileActivity.kt index c754059b..d5c2f0c7 100644 --- a/app/src/main/java/ani/dantotsu/profile/ProfileActivity.kt +++ b/app/src/main/java/ani/dantotsu/profile/ProfileActivity.kt @@ -9,6 +9,7 @@ import android.view.ViewGroup import android.widget.PopupMenu import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat +import androidx.core.view.isGone import androidx.core.view.updateLayoutParams import androidx.core.view.updateMargins import androidx.fragment.app.Fragment @@ -108,8 +109,7 @@ class ProfileActivity : AppCompatActivity(), AppBarLayout.OnOffsetChangedListene } }) val userLevel = intent.getStringExtra("userLVL") ?: "" - binding.followButton.visibility = - if (user.id == Anilist.userid || Anilist.userid == null) View.GONE else View.VISIBLE + binding.followButton.isGone = user.id == Anilist.userid || Anilist.userid == null binding.followButton.text = getString( when { user.isFollowing -> R.string.unfollow diff --git a/app/src/main/res/layout-land/activity_profile.xml b/app/src/main/res/layout-land/activity_profile.xml index 6af1527b..0aefbb9d 100644 --- a/app/src/main/res/layout-land/activity_profile.xml +++ b/app/src/main/res/layout-land/activity_profile.xml @@ -7,7 +7,7 @@ android:orientation="horizontal"> @@ -292,6 +292,7 @@ android:id="@+id/profileNavBar" android:layout_width="wrap_content" android:layout_height="match_parent" + android:layout_weight="0" android:layout_gravity="center_horizontal|bottom" android:background="?attr/colorSurface" android:padding="0dp"