Merge branch 'fix_no_previews' into 'master'

Fix regex and remove unused code

Closes #300

See merge request pixeldroid/PixelDroid!401
This commit is contained in:
Matthieu 2021-11-28 19:38:23 +00:00
commit 5d8d36b10d
2 changed files with 1 additions and 57 deletions

View File

@ -1,65 +1,9 @@
package org.pixeldroid.app.profile
import android.content.Intent
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import androidx.appcompat.content.res.AppCompatResources.getDrawable
import androidx.recyclerview.widget.RecyclerView
import org.pixeldroid.app.posts.PostActivity
import org.pixeldroid.app.R
import org.pixeldroid.app.utils.api.objects.Status
import org.pixeldroid.app.utils.ImageConverter.Companion.setSquareImageFromDrawable
import org.pixeldroid.app.utils.ImageConverter.Companion.setSquareImageFromURL
/**
* [RecyclerView.Adapter] that can display a list of [Status]s
*/
class ProfilePostsRecyclerViewAdapter: RecyclerView.Adapter<ProfilePostViewHolder>() {
private val posts: ArrayList<Status> = ArrayList()
fun addPosts(newPosts : List<Status>) {
posts.clear()
posts.addAll(newPosts)
notifyDataSetChanged()
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ProfilePostViewHolder {
val view = LayoutInflater.from(parent.context)
.inflate(R.layout.fragment_profile_posts, parent, false)
return ProfilePostViewHolder(view)
}
override fun onBindViewHolder(holder: ProfilePostViewHolder, position: Int) {
val post = posts[position]
if(post.sensitive!!) {
setSquareImageFromDrawable(
holder.postView,
getDrawable(holder.postView.context, R.drawable.ic_sensitive),
holder.postPreview
)
} else {
setSquareImageFromURL(holder.postView, post.getPostPreviewURL(), holder.postPreview)
}
if(post.media_attachments?.size ?: 0 > 1) {
holder.albumIcon.visibility = View.VISIBLE
} else {
holder.albumIcon.visibility = View.GONE
}
holder.postPreview.setOnClickListener {
val intent = Intent(holder.postPreview.context, PostActivity::class.java)
intent.putExtra(Status.POST_TAG, post)
holder.postPreview.context.startActivity(intent)
}
}
override fun getItemCount(): Int = posts.size
}
class ProfilePostViewHolder(val postView: View) : RecyclerView.ViewHolder(postView) {
val postPreview: ImageView = postView.findViewById(R.id.postPreview)

View File

@ -40,6 +40,6 @@ data class Attachment(
}
val previewNoPlaceholder: String?
get() = if (preview_url?.contains(Regex("public/no-preview\\.(png|jpg|webp)")) == true) url else preview_url
get() = if (preview_url?.contains(Regex("no-preview\\.(png|jpg|webp)$")) == true) url else preview_url
}