owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: 'origin/feat/hide-empty-link-previews' into feat/merge-commits

Browse Source
This commit is contained in:
FineFindus
2023-11-08 18:36:36 +01:00
parent 288043cf49 022e61b2d0
commit d8b932c9ad
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/LinkCardStatusDisplayItem.java
View File

@@ -88,7 +88,10 @@ public class LinkCardStatusDisplayItem extends StatusDisplayItem{
crossfadeDrawable.setBlurhashDrawable(card.blurhashPlaceholder); crossfadeDrawable.setBlurhashDrawable(card.blurhashPlaceholder);
crossfadeDrawable.setCrossfadeAlpha(item.status.spoilerRevealed ? 0f : 1f); crossfadeDrawable.setCrossfadeAlpha(item.status.spoilerRevealed ? 0f : 1f);
photo.setImageDrawable(crossfadeDrawable); photo.setImageDrawable(crossfadeDrawable);
photo.setVisibility(View.VISIBLE);
didClear=false; didClear=false;
} else {
photo.setVisibility(View.GONE);
} }
// if there's no image, we don't want to cover the inset borders // if there's no image, we don't want to cover the inset borders

4
mastodon/src/main/res/layout/display_item_link_card.xml
View File

@@ -8,14 +8,14 @@
<org.joinmastodon.android.ui.views.MaxWidthFrameLayout <org.joinmastodon.android.ui.views.MaxWidthFrameLayout
android:id="@+id/inner" android:id="@+id/inner"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="250dp" android:layout_height="match_parent"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:foreground="?android:selectableItemBackground" android:foreground="?android:selectableItemBackground"
android:maxWidth="@dimen/layout_max_width"> android:maxWidth="@dimen/layout_max_width">
<ImageView <ImageView
android:id="@+id/photo" android:id="@+id/photo"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="250dp"
android:scaleType="centerCrop" android:scaleType="centerCrop"
tools:src="#0f0"/> tools:src="#0f0"/>
<LinearLayout <LinearLayout