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

fix header disappearing in some cases

Browse Source 
closes sk22#570
This commit is contained in:
sk
2023-06-12 15:39:38 +02:00
parent 871ada23ab
commit 6cf214f127
2 changed files with 70 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -399,6 +399,9 @@ public class HeaderStatusDisplayItem extends StatusDisplayItem{
else collapseBtnIcon.animate().scaleY(item.status.textExpanded ? -1 : 1).start(); else collapseBtnIcon.animate().scaleY(item.status.textExpanded ? -1 : 1).start();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) collapseBtn.setTooltipText(collapseText); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) collapseBtn.setTooltipText(collapseText);
} }
itemView.setPaddingRelative(itemView.getPaddingStart(), itemView.getPaddingTop(),
item.inset ? V.dp(10) : V.dp(4), itemView.getPaddingBottom());
} }
@Override @Override

78
mastodon/src/main/res/layout/display_item_header.xml
View File

@@ -6,50 +6,27 @@
android:paddingEnd="4dp" android:paddingEnd="4dp"
android:paddingStart="16dp"> android:paddingStart="16dp">
<ImageView <LinearLayout
android:id="@+id/more" android:id="@+id/buttons"
android:layout_width="36dp" android:layout_width="wrap_content"
android:layout_height="36dp" android:layout_height="wrap_content"
android:layout_marginTop="13dp" android:layout_marginTop="13dp"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true">
android:background="?android:actionBarItemBackground"
android:contentDescription="@string/more_options"
android:scaleType="center"
android:src="@drawable/ic_fluent_more_vertical_20_filled"
android:tint="?android:textColorSecondary" />
<ImageView <ImageView
android:id="@+id/delete_notification" android:id="@+id/unread_indicator"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_marginTop="13dp"
android:layout_toStartOf="@id/more"
android:visibility="gone" android:visibility="gone"
android:background="?android:actionBarItemBackground" android:tint="?android:colorAccent"
android:contentDescription="@string/sk_delete_notification"
android:tooltipText="@string/sk_delete_notification"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_fluent_dismiss_20_filled" android:src="@drawable/ic_fluent_circle_small_20_filled" />
android:tint="?android:textColorSecondary" />
<ImageView
android:id="@+id/visibility"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginTop="13dp"
android:layout_toStartOf="@id/delete_notification"
android:background="?android:actionBarItemBackground"
android:scaleType="center"
android:src="@drawable/ic_visibility"
android:tint="?android:textColorSecondary" />
<FrameLayout <FrameLayout
android:id="@+id/collapse_btn" android:id="@+id/collapse_btn"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_marginTop="13dp"
android:layout_toStartOf="@id/visibility"
android:background="?android:actionBarItemBackground" android:background="?android:actionBarItemBackground"
android:visibility="gone" android:visibility="gone"
android:importantForAccessibility="noHideDescendants"> android:importantForAccessibility="noHideDescendants">
@@ -70,15 +47,38 @@
</FrameLayout> </FrameLayout>
<ImageView <ImageView
android:id="@+id/unread_indicator" android:id="@+id/visibility"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_marginTop="13dp" android:background="?android:actionBarItemBackground"
android:layout_toStartOf="@id/collapse_btn"
android:visibility="gone"
android:tint="?android:colorAccent"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_fluent_circle_small_20_filled" /> android:src="@drawable/ic_visibility"
android:tint="?android:textColorSecondary" />
<ImageView
android:id="@+id/delete_notification"
android:layout_width="36dp"
android:layout_height="36dp"
android:visibility="gone"
android:background="?android:actionBarItemBackground"
android:contentDescription="@string/sk_delete_notification"
android:tooltipText="@string/sk_delete_notification"
android:scaleType="center"
android:src="@drawable/ic_fluent_dismiss_20_filled"
android:tint="?android:textColorSecondary" />
<ImageView
android:id="@+id/more"
android:layout_width="36dp"
android:layout_height="36dp"
android:background="?android:actionBarItemBackground"
android:contentDescription="@string/more_options"
android:scaleType="center"
android:src="@drawable/ic_fluent_more_vertical_20_filled"
android:tint="?android:textColorSecondary" />
</LinearLayout>
<ImageView <ImageView
android:id="@+id/avatar" android:id="@+id/avatar"
@@ -94,7 +94,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_toStartOf="@id/unread_indicator" android:layout_toStartOf="@id/buttons"
android:layout_toEndOf="@id/avatar" android:layout_toEndOf="@id/avatar"
android:layout_above="@+id/username_wrap"> android:layout_above="@+id/username_wrap">
@@ -127,7 +127,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_toStartOf="@id/unread_indicator" android:layout_toStartOf="@id/buttons"
android:layout_toEndOf="@id/avatar" android:layout_toEndOf="@id/avatar"
android:layout_alignBottom="@id/avatar" android:layout_alignBottom="@id/avatar"
android:layoutDirection="locale" android:layoutDirection="locale"