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

tweak content warning styles

Browse Source
This commit is contained in:
sk
2022-11-17 20:46:39 +01:00
parent 95b7dbfba3
commit c23df0c065
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
View File

@@ -78,6 +78,7 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
public void onBind(TextStatusDisplayItem item){ public void onBind(TextStatusDisplayItem item){
text.setText(item.text); text.setText(item.text);
text.setTextIsSelectable(item.textSelectable); text.setTextIsSelectable(item.textSelectable);
spoilerTitleInline.setTextIsSelectable(item.textSelectable);
text.setInvalidateOnEveryFrame(false); text.setInvalidateOnEveryFrame(false);
if(!TextUtils.isEmpty(item.status.spoilerText)){ if(!TextUtils.isEmpty(item.status.spoilerText)){
spoilerTitle.setText(item.parsedSpoilerText); spoilerTitle.setText(item.parsedSpoilerText);

6
mastodon/src/main/res/layout/display_item_text.xml
View File

@@ -14,6 +14,8 @@
<LinearLayout <LinearLayout
android:id="@+id/spoiler_header" android:id="@+id/spoiler_header"
android:orientation="vertical" android:orientation="vertical"
android:layout_marginTop="6dp"
android:layout_marginBottom="8dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<View <View
@@ -24,10 +26,9 @@
<TextView <TextView
android:id="@+id/spoiler_title_inline" android:id="@+id/spoiler_title_inline"
android:paddingHorizontal="16dp" android:paddingHorizontal="16dp"
android:paddingVertical="12dp" android:paddingVertical="14dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="0dp"
android:textAppearance="@style/m3_title_medium" android:textAppearance="@style/m3_title_medium"
android:background="?colorBackgroundLight" android:background="?colorBackgroundLight"
tools:text="CW title"/> tools:text="CW title"/>
@@ -35,7 +36,6 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0.5dp" android:layout_height="0.5dp"
android:layout_marginBottom="12dp"
android:background="?attr/colorPollVoted"/> android:background="?attr/colorPollVoted"/>
</LinearLayout> </LinearLayout>