Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix showing/hiding of preview cards in timeline posts that are collapsed for length. (#1796) 

Also properly places the preview card after the "collapse for length" button.
This commit is contained in:
Levi Bard 2020-05-21 18:32:22 +02:00 committed by GitHub
parent e6b7d2ff9c
commit 1c09441c32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
View File

@ -973,7 +973,11 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
} }
protected void setupCard(StatusViewData.Concrete status, CardViewMode cardViewMode) { protected void setupCard(StatusViewData.Concrete status, CardViewMode cardViewMode) {
if (cardViewMode != CardViewMode.NONE && status.getAttachments().size() == 0 && status.getCard() != null && !TextUtils.isEmpty(status.getCard().getUrl())) { if (cardViewMode != CardViewMode.NONE &&
status.getAttachments().size() == 0 &&
status.getCard() != null &&
!TextUtils.isEmpty(status.getCard().getUrl()) &&
!status.isCollapsed()) {
final Card card = status.getCard(); final Card card = status.getCard();
cardView.setVisibility(View.VISIBLE); cardView.setVisibility(View.VISIBLE);
cardTitle.setText(card.getTitle()); cardTitle.setText(card.getTitle());

4
app/src/main/res/layout/item_status.xml
View File

@ -168,7 +168,7 @@
android:minHeight="80dp" android:minHeight="80dp"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintStart_toStartOf="@id/status_display_name" app:layout_constraintStart_toStartOf="@id/status_display_name"
app:layout_constraintTop_toBottomOf="@+id/status_content" app:layout_constraintTop_toBottomOf="@+id/button_toggle_content"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
tools:visibility="gone"> tools:visibility="gone">
@ -242,7 +242,7 @@
android:textSize="?attr/status_text_medium" android:textSize="?attr/status_text_medium"
android:visibility="gone" android:visibility="gone"
app:layout_constraintStart_toStartOf="@id/status_display_name" app:layout_constraintStart_toStartOf="@id/status_display_name"
app:layout_constraintTop_toBottomOf="@id/status_card_view" app:layout_constraintTop_toBottomOf="@id/status_content"
tools:text="@string/status_content_show_less" tools:text="@string/status_content_show_less"
tools:visibility="visible" /> tools:visibility="visible" />