From 962c5df78e998837f3436e7b595654251df0ce8a Mon Sep 17 00:00:00 2001 From: Mateusz Hinc Date: Fri, 24 Jan 2020 19:07:03 +0100 Subject: [PATCH] fix layout --- .../viewholders/PostDetailsRecycler.kt | 47 ++++++++++++------- app/src/main/res/layout/item_post.xml | 3 +- 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/pl/edu/amu/wmi/socialaggregator/viewholders/PostDetailsRecycler.kt b/app/src/main/java/pl/edu/amu/wmi/socialaggregator/viewholders/PostDetailsRecycler.kt index ce42649..1403780 100644 --- a/app/src/main/java/pl/edu/amu/wmi/socialaggregator/viewholders/PostDetailsRecycler.kt +++ b/app/src/main/java/pl/edu/amu/wmi/socialaggregator/viewholders/PostDetailsRecycler.kt @@ -49,7 +49,7 @@ class PostDetailsRecycler( override fun onBindViewHolder(holder: ViewHolder, position: Int) { val post = posts[position] - holder.dateTime.text = post.dateTime + holder.dateTime.text = formatDate(post.dateTime) holder.postContent.text = post.content holder.postContent.visibility = if (post.content.isBlank()) View.GONE else View.VISIBLE @@ -57,27 +57,42 @@ class PostDetailsRecycler( holder.imagesContainer.apply { removeAllViews() - post.images.forEach { - val imageView = ImageView(context) - addView(imageView) - imageView.apply { - (layoutParams as ViewGroup.MarginLayoutParams) - .apply { - marginEnd = 10 - } + + post { + + val imgWidth = (parent as ConstraintLayout).width / post.images.size - 10 + post.images.forEach { + val imageView = ImageView(context) + addView(imageView) + + imageView.apply { + (layoutParams as ViewGroup.MarginLayoutParams) + .apply { + marginEnd = 10 + } + } + + + Picasso.with(context) + .load(it) + .placeholder(android.R.drawable.ic_menu_gallery) + .resize(imgWidth, imgWidth) + .centerCrop() + .into(imageView) } - - Picasso.with(context) - .load(it) - .placeholder(android.R.drawable.ic_menu_gallery) - .resize(250, 250) - .centerCrop() - .into(imageView) } } } + private fun formatDate(str: String): String { + val regex = """(\d+-\d+-\d+)T(\d+:\d+:\d+)""".toRegex() + val matchResult = regex.find(str) + val (date, time) = matchResult!!.destructured + + return "$date $time" + } + class ViewHolder( root: ConstraintLayout, val dateTime: TextView, diff --git a/app/src/main/res/layout/item_post.xml b/app/src/main/res/layout/item_post.xml index 65d7229..75709b5 100644 --- a/app/src/main/res/layout/item_post.xml +++ b/app/src/main/res/layout/item_post.xml @@ -46,10 +46,11 @@