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

move adding reactions to reactions item

Browse Source
This commit is contained in:
sk
2023-08-21 22:40:00 +02:00
parent 9634db9061
commit f50eac02d8
10 changed files with 283 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
mastodon/src/main/res/layout/display_item_emoji_reactions.xml Normal file
View File

@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/line"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageButton
android:id="@+id/add_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:minHeight="48dp"
android:minWidth="48dp"
android:background="@drawable/bg_button_m3_tonal_circle"
android:tooltipText="@string/sk_button_react"
android:contentDescription="@string/sk_button_react"
android:src="@drawable/ic_fluent_add_24_filled" />
<org.joinmastodon.android.ui.views.EmojiReactionsRecyclerView
android:id="@+id/list"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_marginStart="-4dp"
android:paddingStart="8dp"
android:clipToPadding="false"
android:requiresFadingEdge="horizontal"
android:fadingEdgeLength="24dp" />
</LinearLayout>
<Space
android:id="@+id/space"
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="8dp" />
</LinearLayout>

34
mastodon/src/main/res/layout/display_item_footer.xml
View File

@@ -126,40 +126,6 @@
</LinearLayout>
</FrameLayout>
<FrameLayout
android:id="@+id/react_layout"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="match_parent">
<FrameLayout
android:id="@+id/react_btn"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingVertical="12dp">
<ImageView
android:id="@+id/react"
android:layout_width="24sp"
android:layout_height="24sp"
android:layout_gravity="center_vertical"
android:layout_marginHorizontal="16dp"
android:src="@drawable/ic_fluent_emoji_laugh_24_regular"
android:tint="@color/bookmark_icon"
android:gravity="center_vertical"
android:textAppearance="@style/m3_label_large" />
</FrameLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone">
<EditText
android:layout_width="100dp"
android:layout_height="20dp"
android:focusable="true"
android:focusableInTouchMode="true"
android:id="@+id/react_input"/>
</LinearLayout>
</FrameLayout>
<FrameLayout
android:layout_weight="1"
android:layout_width="0dp"