Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'quick_reply_tom' of framagit.org:tom79/fedilab into quick_reply_tom

This commit is contained in:
tom79 2019-06-27 16:20:12 +02:00
parent 33b43c0d72 5aadfb286e
commit b69db8aa71
5 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/res/layout/drawer_notification.xml
View File

@ -426,10 +426,20 @@
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:src="@drawable/emoji_one_category_smileysandpeople"
android:tint="@color/white"
app:layout_constraintEnd_toStartOf="@id/quick_reply_privacy"
app:layout_constraintTop_toBottomOf="@id/quick_reply_text" />
<ImageView
android:id="@+id/quick_reply_privacy"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:src="@drawable/ic_public"
app:layout_constraintEnd_toStartOf="@id/quick_reply_button"
app:layout_constraintTop_toBottomOf="@id/quick_reply_text" />
<Button
android:id="@+id/quick_reply_button"
android:layout_width="wrap_content"

11
app/src/main/res/layout/drawer_status.xml
View File

@ -1117,7 +1117,16 @@
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:src="@drawable/emoji_one_category_smileysandpeople"
android:tint="@color/white"
app:layout_constraintEnd_toStartOf="@id/quick_reply_privacy"
app:layout_constraintTop_toBottomOf="@id/quick_reply_text" />
<ImageView
android:id="@+id/quick_reply_privacy"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:src="@drawable/ic_public"
app:layout_constraintEnd_toStartOf="@id/quick_reply_button"
app:layout_constraintTop_toBottomOf="@id/quick_reply_text" />

13
app/src/main/res/layout/drawer_status_compact.xml
View File

@ -885,8 +885,17 @@
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:src="@drawable/emoji_one_category_smileysandpeople"
android:tint="@color/white"
app:layout_constraintEnd_toStartOf="@id/quick_reply_button"
app:layout_constraintEnd_toStartOf="@id/quick_reply_privacy"
app:layout_constraintTop_toBottomOf="@id/quick_reply_text" />
<ImageView
android:id="@+id/quick_reply_privacy"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:src="@drawable/ic_public"
app:layout_constraintEnd_toStartOf="@id/quick_reply_privacy"
app:layout_constraintTop_toBottomOf="@id/quick_reply_text" />
<Button

11
app/src/main/res/layout/drawer_status_console.xml
View File

@ -875,7 +875,16 @@
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:src="@drawable/emoji_one_category_smileysandpeople"
android:tint="@color/white"
app:layout_constraintEnd_toStartOf="@id/quick_reply_privacy"
app:layout_constraintTop_toBottomOf="@id/quick_reply_text" />
<ImageView
android:id="@+id/quick_reply_privacy"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:src="@drawable/ic_public"
app:layout_constraintEnd_toStartOf="@id/quick_reply_button"
app:layout_constraintTop_toBottomOf="@id/quick_reply_text" />

11
app/src/main/res/layout/drawer_status_focused.xml
View File

@ -806,7 +806,16 @@
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:src="@drawable/emoji_one_category_smileysandpeople"
android:tint="@color/white"
app:layout_constraintEnd_toStartOf="@id/quick_reply_privacy"
app:layout_constraintTop_toBottomOf="@id/quick_reply_text" />
<ImageView
android:id="@+id/quick_reply_privacy"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:src="@drawable/ic_public"
app:layout_constraintEnd_toStartOf="@id/quick_reply_button"
app:layout_constraintTop_toBottomOf="@id/quick_reply_text" />