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

New sensitive media design

Browse Source
This commit is contained in:
Grishka
2023-03-24 00:33:02 +03:00
parent 4492e940e5
commit e873dd7d0a
14 changed files with 180 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mastodon/src/main/res/layout/alt_text_badge.xml Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:layout_gravity="start|bottom"
android:layout_margin="8dp"
android:importantForAccessibility="no"
android:textAppearance="@style/m3_label_large"
android:textColor="#FFF"
android:gravity="center"
android:includeFontPadding="false"
android:background="@drawable/bg_image_alt_overlay"
android:text="ALT"
tools:ignore="HardcodedText"
tools:showIn="@layout/display_item_photo" />

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

@@ -12,21 +12,7 @@
android:scaleType="centerCrop"/>
<!-- This is hidden from screenreaders because that same alt text is set as content description on the ImageView -->
<TextView
android:id="@+id/alt_button"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:layout_gravity="start|bottom"
android:layout_margin="8dp"
android:importantForAccessibility="no"
android:textAppearance="@style/m3_label_large"
android:textColor="#FFF"
android:gravity="center"
android:includeFontPadding="false"
android:background="@drawable/bg_image_alt_overlay"
android:text="ALT"
tools:ignore="HardcodedText" />
<include layout="@layout/alt_text_badge"
android:id="@+id/alt_button"/>
</FrameLayout>

39
mastodon/src/main/res/layout/overlay_image_sensitive.xml Normal file
View File

@@ -0,0 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/sensitive_overlay"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="32dp"
android:paddingRight="32dp"
android:background="@drawable/bg_spoiler_overlay"
android:layerType="hardware"
android:gravity="center">
<ImageView
android:layout_width="32dp"
android:layout_height="32dp"
android:tint="?colorM3OnSurfaceVariant"
android:importantForAccessibility="no"
android:src="@drawable/ic_visibility_off_24px"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:gravity="center_horizontal"
android:maxLines="2"
android:textAppearance="@style/m3_body_large"
android:textColor="?colorM3OnSurfaceVariant"
android:text="@string/sensitive_content_explain"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="20dp"
android:textAppearance="@style/m3_label_large"
android:textColor="?colorM3Primary"
android:gravity="center_vertical"
android:text="@string/show"/>
</LinearLayout>