Pixelfed/PixelDroid-App-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reuse value from settings

Browse Source
This commit is contained in:
Matthieu 2023-06-11 23:02:30 +02:00
parent 43c4520316
commit 26e7588a75
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/pixeldroid/app/posts/AlbumActivity.kt
View File

@ -17,7 +17,9 @@ class AlbumActivity : BaseActivity() {
val index = intent.getIntExtra("index", 0)
binding.albumPager.adapter = AlbumViewPagerAdapter(mediaAttachments,
sensitive = false,
opened = true
opened = true,
//In the activity, we assume we want to show everything
alwaysShowNsfw = true
)
binding.albumPager.currentItem = index

8
app/src/main/java/org/pixeldroid/app/posts/StatusViewHolder.kt
View File

@ -173,7 +173,7 @@ class StatusViewHolder(val binding: PostFragmentBinding) : RecyclerView.ViewHold
binding.postPager.visibility = View.VISIBLE
//Attach the given tabs to the view pager
binding.postPager.adapter = AlbumViewPagerAdapter(status?.media_attachments ?: emptyList(), status?.sensitive, false)
binding.postPager.adapter = AlbumViewPagerAdapter(status?.media_attachments ?: emptyList(), status?.sensitive, false, alwaysShowNsfw)
if((status?.media_attachments?.size ?: 0) > 1) {
binding.postIndicator.setViewPager(binding.postPager)
@ -831,7 +831,7 @@ class StatusViewHolder(val binding: PostFragmentBinding) : RecyclerView.ViewHold
class AlbumViewPagerAdapter(
private val media_attachments: List<Attachment>, private var sensitive: Boolean?,
private val opened: Boolean,
private val opened: Boolean, private val alwaysShowNsfw: Boolean,
) :
RecyclerView.Adapter<AlbumViewPagerAdapter.ViewHolder>() {
@ -847,10 +847,6 @@ class AlbumViewPagerAdapter(
override fun getItemCount() = media_attachments.size
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
val alwaysShowNsfw =
PreferenceManager.getDefaultSharedPreferences(holder.binding.root.context)
.getBoolean("always_show_nsfw", false)
media_attachments[position].apply {
val video = type == Attachment.AttachmentType.video
val blurhashBitMap = blurhash?.let {