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

tweak no alt indicator

This commit is contained in:
sk 2023-01-25 15:32:51 +01:00 committed by LucasGGamerM
parent 1c98bba7d2
commit f8ecbb8936
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PhotoStatusDisplayItem.java
View File

@ -43,7 +43,7 @@ public class PhotoStatusDisplayItem extends ImageStatusDisplayItem{
private final ImageView noAltTextButton; private final ImageView noAltTextButton;
private final View altTextScroller; private final View altTextScroller;
private final ImageButton altTextClose; private final ImageButton altTextClose;
private final TextView altText; private final TextView altText, noAltText;
private View altOrNoAltButton; private View altOrNoAltButton;
private boolean altTextShown; private boolean altTextShown;
@ -57,6 +57,7 @@ public class PhotoStatusDisplayItem extends ImageStatusDisplayItem{
altTextScroller=findViewById(R.id.alt_text_scroller); altTextScroller=findViewById(R.id.alt_text_scroller);
altTextClose=findViewById(R.id.alt_text_close); altTextClose=findViewById(R.id.alt_text_close);
altText=findViewById(R.id.alt_text); altText=findViewById(R.id.alt_text);
noAltText=findViewById(R.id.no_alt_text);
altTextButton.setOnClickListener(this::onShowHideClick); altTextButton.setOnClickListener(this::onShowHideClick);
noAltTextButton.setOnClickListener(this::onShowHideClick); noAltTextButton.setOnClickListener(this::onShowHideClick);
@ -84,19 +85,21 @@ public class PhotoStatusDisplayItem extends ImageStatusDisplayItem{
if (altTextMissing){ if (altTextMissing){
if (GlobalUserPreferences.showNoAltIndicator) { if (GlobalUserPreferences.showNoAltIndicator) {
noAltTextButton.setVisibility(View.VISIBLE); noAltTextButton.setVisibility(View.VISIBLE);
noAltText.setVisibility(View.VISIBLE);
altTextWrapper.setBackgroundResource(R.drawable.bg_image_no_alt_overlay); altTextWrapper.setBackgroundResource(R.drawable.bg_image_no_alt_overlay);
altTextButton.setVisibility(View.GONE); altTextButton.setVisibility(View.GONE);
altText.setText(R.string.sk_no_alt_text); altText.setVisibility(View.GONE);
altText.setPadding(V.dp(8), 0, 0, 0);
} else { } else {
altTextWrapper.setVisibility(View.GONE); altTextWrapper.setVisibility(View.GONE);
} }
}else{ }else{
if (GlobalUserPreferences.showAltIndicator) { if (GlobalUserPreferences.showAltIndicator) {
noAltTextButton.setVisibility(View.GONE); noAltTextButton.setVisibility(View.GONE);
noAltText.setVisibility(View.GONE);
altTextWrapper.setBackgroundResource(R.drawable.bg_image_alt_overlay); altTextWrapper.setBackgroundResource(R.drawable.bg_image_alt_overlay);
altTextButton.setVisibility(View.VISIBLE); altTextButton.setVisibility(View.VISIBLE);
altTextButton.setText(R.string.sk_alt_button); altTextButton.setText(R.string.sk_alt_button);
altText.setVisibility(View.VISIBLE);
altText.setText(item.attachment.description); altText.setText(item.attachment.description);
altText.setPadding(0, 0, 0, 0); altText.setPadding(0, 0, 0, 0);
} else { } else {

2
mastodon/src/main/res/drawable/bg_image_no_alt_overlay.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#C7750606"/> <solid android:color="#D49E050A"/>
<corners android:radius="20dp"/> <corners android:radius="20dp"/>
</shape> </shape>

17
mastodon/src/main/res/layout/display_item_photo.xml
View File

@ -27,14 +27,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="4dp" android:padding="4dp"
android:src="@drawable/ic_fluent_important_20_filled" android:src="@drawable/ic_fluent_important_20_filled"
android:tint="@color/gray_25" /> android:tint="?colorGray25" />
<TextView <TextView
android:id="@+id/alt_button" android:id="@+id/alt_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="@style/m3_label_large" android:textAppearance="@style/m3_label_large"
android:textColor="@color/gray_25" android:textColor="?colorGray25"
android:gravity="center" android:gravity="center"
android:includeFontPadding="false" android:includeFontPadding="false"
android:paddingHorizontal="5dp" android:paddingHorizontal="5dp"
@ -68,9 +68,20 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="8dp"
android:textAppearance="@style/m3_body_medium" android:textAppearance="@style/m3_body_medium"
android:textColor="#FFF" android:textColor="?colorGray25"
tools:text="Alt text goes here"/> tools:text="Alt text goes here"/>
<TextView
android:id="@+id/no_alt_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginVertical="8dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="14dp"
android:textAppearance="@style/m3_label_large"
android:textColor="?colorGray25"
android:text="@string/sk_no_alt_text"/>
</LinearLayout> </LinearLayout>
</org.joinmastodon.android.ui.views.NestableScrollView> </org.joinmastodon.android.ui.views.NestableScrollView>