Merge branch 'dev-5.0.0' of git.ghzs.com:halo/android/assistant-android into dev-5.0.0
This commit is contained in:
@ -215,6 +215,7 @@ class ImageContainerView : LinearLayout {
|
||||
}
|
||||
|
||||
if (url.endsWith(".gif")) {
|
||||
binding.gifBorder.visibility = View.VISIBLE
|
||||
binding.labelIcon.visibility = View.VISIBLE
|
||||
binding.labelIcon.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_gif_label))
|
||||
}
|
||||
|
||||
@ -16,18 +16,30 @@
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<com.facebook.drawee.view.SimpleDraweeView
|
||||
android:id="@+id/image"
|
||||
style="@style/frescoStyle"
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:roundingBorderWidth="1px"
|
||||
app:roundingBorderColor="@color/black_alpha_5"
|
||||
app:roundedCornerRadius="4dp" />
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<com.facebook.drawee.view.SimpleDraweeView
|
||||
android:id="@+id/image"
|
||||
style="@style/frescoStyle"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:roundingBorderWidth="1dp"
|
||||
app:roundingBorderColor="@color/black_alpha_5"
|
||||
app:roundedCornerRadius="4dp" />
|
||||
|
||||
<View
|
||||
android:visibility="gone"
|
||||
android:id="@+id/gifBorder"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@drawable/bg_forum_image_border" />
|
||||
</RelativeLayout>
|
||||
</androidx.cardview.widget.CardView>
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user