Skip to content

Commit 31a5764

Browse files
committed
Fix image missing height in BaseNoteVH
1 parent d2f9033 commit 31a5764

File tree

2 files changed

+38
-33
lines changed

2 files changed

+38
-33
lines changed

app/src/main/java/com/philkes/notallyx/presentation/view/main/BaseNoteVH.kt

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -290,42 +290,45 @@ class BaseNoteVH(
290290
private fun setImages(images: List<FileAttachment>, mediaRoot: File?) {
291291
binding.apply {
292292
if (images.isNotEmpty() && !preferences.hideImages) {
293-
ImageView.visibility = VISIBLE
294293
Message.visibility = GONE
295-
296294
val image = images[0]
297295
val file = if (mediaRoot != null) File(mediaRoot, image.localName) else null
296+
if (file?.exists() == true) {
297+
ImageView.visibility = VISIBLE
298+
Glide.with(ImageView)
299+
.load(file)
300+
.centerCrop()
301+
.transition(DrawableTransitionOptions.withCrossFade())
302+
.diskCacheStrategy(DiskCacheStrategy.NONE)
303+
.listener(
304+
object : RequestListener<Drawable> {
305+
306+
override fun onLoadFailed(
307+
e: GlideException?,
308+
model: Any?,
309+
target: Target<Drawable>?,
310+
isFirstResource: Boolean,
311+
): Boolean {
312+
Message.visibility = VISIBLE
313+
return false
314+
}
298315

299-
Glide.with(ImageView)
300-
.load(file)
301-
.centerCrop()
302-
.transition(DrawableTransitionOptions.withCrossFade())
303-
.diskCacheStrategy(DiskCacheStrategy.NONE)
304-
.listener(
305-
object : RequestListener<Drawable> {
306-
307-
override fun onLoadFailed(
308-
e: GlideException?,
309-
model: Any?,
310-
target: Target<Drawable>?,
311-
isFirstResource: Boolean,
312-
): Boolean {
313-
Message.visibility = VISIBLE
314-
return false
315-
}
316-
317-
override fun onResourceReady(
318-
resource: Drawable?,
319-
model: Any?,
320-
target: Target<Drawable>?,
321-
dataSource: DataSource?,
322-
isFirstResource: Boolean,
323-
): Boolean {
324-
return false
316+
override fun onResourceReady(
317+
resource: Drawable?,
318+
model: Any?,
319+
target: Target<Drawable>?,
320+
dataSource: DataSource?,
321+
isFirstResource: Boolean,
322+
): Boolean {
323+
return false
324+
}
325325
}
326-
}
327-
)
328-
.into(ImageView)
326+
)
327+
.into(ImageView)
328+
} else {
329+
ImageView.visibility = GONE
330+
Message.visibility = VISIBLE
331+
}
329332
if (images.size > 1) {
330333
ImageViewMore.apply {
331334
text = images.size.toString()
@@ -335,7 +338,7 @@ class BaseNoteVH(
335338
ImageViewMore.visibility = GONE
336339
}
337340
} else {
338-
ImageView.visibility = GONE
341+
ImageLayout.visibility = GONE
339342
Message.visibility = GONE
340343
ImageViewMore.visibility = GONE
341344
Glide.with(ImageView).clear(ImageView)

app/src/main/res/layout/recycler_base_note.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,14 @@
5353
<TextView
5454
android:id="@+id/Message"
5555
android:layout_width="match_parent"
56-
android:layout_height="0dp"
56+
android:layout_height="wrap_content"
5757
android:gravity="center"
5858
android:clickable="false"
5959
android:textIsSelectable="false"
6060
android:paddingStart="16dp"
6161
android:paddingEnd="16dp"
62+
android:paddingTop="16dp"
63+
android:paddingBottom="16dp"
6264
android:text="@string/cant_load_image"
6365
android:textAppearance="?attr/textAppearanceBodyMedium"
6466
app:layout_constraintDimensionRatio="4:3"

0 commit comments

Comments
 (0)