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

fix edit history header lines

Browse Source
This commit is contained in:
sk
2023-07-21 00:03:11 +02:00
parent d74313f996
commit e2df320d00
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java
View File

@@ -143,7 +143,9 @@ public class StatusEditHistoryFragment extends StatusListFragment{
} }
} }
String sep = getString(R.string.sk_separator); String sep = getString(R.string.sk_separator);
items.add(0, new ReblogOrReplyLineStatusDisplayItem(s.id, this, action+" "+sep+" "+date, Collections.emptyList(), 0, null, null)); ReblogOrReplyLineStatusDisplayItem line=new ReblogOrReplyLineStatusDisplayItem(s.id, this, action+" "+sep+" "+date, Collections.emptyList(), 0, null, null);
line.needBottomPadding=true;
items.add(0, line);
} }
return items; return items;
} }

2
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java
View File

@@ -40,7 +40,7 @@ public class ReblogOrReplyLineStatusDisplayItem extends StatusDisplayItem{
private int iconEnd; private int iconEnd;
private CustomEmojiHelper emojiHelper=new CustomEmojiHelper(), fullTextEmojiHelper; private CustomEmojiHelper emojiHelper=new CustomEmojiHelper(), fullTextEmojiHelper;
private View.OnClickListener handleClick; private View.OnClickListener handleClick;
boolean needBottomPadding; public boolean needBottomPadding;
ReblogOrReplyLineStatusDisplayItem extra; ReblogOrReplyLineStatusDisplayItem extra;
CharSequence fullText; CharSequence fullText;

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

@@ -5,14 +5,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingHorizontal="16dp" android:paddingHorizontal="16dp"
android:layout_marginBottom="-12dp"> android:layout_marginBottom="-4dp">
<TextView <TextView
android:id="@+id/extra_text" android:id="@+id/extra_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="16dp" android:paddingTop="16dp"
android:paddingBottom="6dp"
android:textAppearance="@style/m3_title_small" android:textAppearance="@style/m3_title_small"
android:textColor="?colorM3OnSurface" android:textColor="?colorM3OnSurface"
android:drawableStart="@drawable/ic_fluent_arrow_reply_20sp_filled" android:drawableStart="@drawable/ic_fluent_arrow_reply_20sp_filled"
@@ -40,7 +39,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="16dp" android:paddingTop="16dp"
android:paddingBottom="6dp"
android:textAppearance="@style/m3_title_small" android:textAppearance="@style/m3_title_small"
android:textColor="?colorM3OnSurface" android:textColor="?colorM3OnSurface"
android:drawableStart="@drawable/ic_fluent_arrow_repeat_all_20_filled" android:drawableStart="@drawable/ic_fluent_arrow_repeat_all_20_filled"