diff options
author | Thomas <tschneider.ac@gmail.com> | 2022-07-19 15:49:47 +0200 |
---|---|---|
committer | Thomas <tschneider.ac@gmail.com> | 2022-07-19 15:49:47 +0200 |
commit | 8a0460536cdd4e3489bf64a858ca3bab6efb2201 (patch) | |
tree | 7b20a29f697f53da92ecaea3bf1e2aedbc49c48b /app/src/main/res/layout | |
parent | cf1a1b3e53040e3ffef67052e85b35b3fda95f70 (diff) |
Add emoji reactions for Pleroma
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r-- | app/src/main/res/layout/drawer_announcement.xml | 61 | ||||
-rw-r--r-- | app/src/main/res/layout/drawer_status.xml | 6 | ||||
-rw-r--r-- | app/src/main/res/layout/layout_reactions.xml | 60 |
3 files changed, 69 insertions, 58 deletions
diff --git a/app/src/main/res/layout/drawer_announcement.xml b/app/src/main/res/layout/drawer_announcement.xml index fdb2d27e0..c0c408076 100644 --- a/app/src/main/res/layout/drawer_announcement.xml +++ b/app/src/main/res/layout/drawer_announcement.xml @@ -59,64 +59,9 @@ tools:maxLines="10" tools:text="@tools:sample/lorem/random" /> - <androidx.appcompat.widget.LinearLayoutCompat - android:id="@+id/status_reactions" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_marginTop="10dp" - android:layout_marginBottom="10dp" - android:paddingBottom="10dp" - android:orientation="horizontal" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/content"> - - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/reactions_view" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" /> - - <androidx.appcompat.widget.AppCompatImageView - android:id="@+id/status_add_custom_emoji" - android:layout_width="30dp" - android:layout_height="30dp" - android:layout_marginStart="10dp" - android:layout_marginEnd="5dp" - android:contentDescription="@string/add_reaction" - android:src="@drawable/ic_baseline_emoji_emotions_24" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:tint="?attr/iconColor" /> - - <androidx.appcompat.widget.AppCompatImageView - android:id="@+id/status_emoji" - android:layout_width="30dp" - android:layout_height="30dp" - android:layout_marginStart="10dp" - android:layout_marginEnd="5dp" - android:contentDescription="@string/add_reaction" - android:src="@drawable/ic_baseline_add_reaction_24" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:tint="?attr/iconColor" /> - - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:visibility="gone"> - - <app.fedilab.android.helper.FedilabAutoCompleteTextView - android:id="@+id/fake_edittext" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:importantForAutofill="noExcludeDescendants" - android:inputType="text" /> - </LinearLayout> - </androidx.appcompat.widget.LinearLayoutCompat> + <include + android:id="@+id/layout_reactions" + layout="@layout/layout_reactions" /> </androidx.constraintlayout.widget.ConstraintLayout> </com.google.android.material.card.MaterialCardView>
\ No newline at end of file diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml index c73a3c890..b6caece7a 100644 --- a/app/src/main/res/layout/drawer_status.xml +++ b/app/src/main/res/layout/drawer_status.xml @@ -601,6 +601,12 @@ </androidx.appcompat.widget.LinearLayoutCompat> + <include + android:id="@+id/layout_reactions" + layout="@layout/layout_reactions" + android:visibility="gone" + tools:visibility="visible" /> + </androidx.appcompat.widget.LinearLayoutCompat> </com.google.android.material.card.MaterialCardView> diff --git a/app/src/main/res/layout/layout_reactions.xml b/app/src/main/res/layout/layout_reactions.xml new file mode 100644 index 000000000..46e4b1a0a --- /dev/null +++ b/app/src/main/res/layout/layout_reactions.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/status_reactions" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_marginTop="10dp" + android:layout_marginBottom="10dp" + android:orientation="horizontal" + android:paddingBottom="10dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/content"> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/reactions_view" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" /> + + <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/status_add_custom_emoji" + android:layout_width="30dp" + android:layout_height="30dp" + android:layout_marginStart="10dp" + android:layout_marginEnd="5dp" + android:contentDescription="@string/add_reaction" + android:src="@drawable/ic_baseline_emoji_emotions_24" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:tint="?attr/iconColor" /> + + <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/status_emoji" + android:layout_width="30dp" + android:layout_height="30dp" + android:layout_marginStart="10dp" + android:layout_marginEnd="5dp" + android:contentDescription="@string/add_reaction" + android:src="@drawable/ic_baseline_add_reaction_24" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:tint="?attr/iconColor" /> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone"> + + <app.fedilab.android.helper.FedilabAutoCompleteTextView + android:id="@+id/fake_edittext" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:importantForAutofill="noExcludeDescendants" + android:inputType="text" /> + </LinearLayout> +</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file |