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

Merge branch 'feature/filters_again'

Browse Source
This commit is contained in:
LucasGGamerM
2023-02-01 21:46:50 -03:00
parent 27ed78c293 562a5aae7d
commit 286b642101
17 changed files with 217 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
mastodon/src/main/res/layout/display_item_warning.xml Normal file
View File

@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="75dp"
android:id="@+id/warning_wrap"
android:background="@drawable/bg_timeline_gap">
<TextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_gravity="start|center_vertical"
android:textAppearance="@style/m3_title_medium"
android:textColor="?android:textColorSecondary"
android:text="@string/mo_filtered"/>
<Button
android:id="@+id/reveal_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_gravity="end|center_vertical"
android:text="@string/tap_to_reveal"
android:singleLine="true"
android:ellipsize="end"
android:visibility="visible"
/>
</FrameLayout>

5
mastodon/src/main/res/layout/place_holder_display_item.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="0dp">
</FrameLayout>

1
mastodon/src/main/res/values/strings_mo.xml
View File

@@ -22,6 +22,7 @@
<string name="mo_no_image_desc">The included images have no description. Please consider adding one, to allow visually impaired people to participate.</string>
<string name="mo_emoji_recent">Recently used</string>
<string name="mo_clear_recent_emoji">Clear recently used emoji</string>
<string name="mo_filtered">Filtered: %s</string>
<string name="mo_disable_relocate_publish_button_to_enable_customization">Disable "Relocate publish button" to allow customization</string>
<!-- accessibility labels-->