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

Merge branch 'quick_reply' into 'develop' 

add warning to quick reply

See merge request tom79/fedilab!252
This commit is contained in:
Thomas 2019-06-28 16:20:27 +02:00
parent 9c9c7416d7 45017529b1
commit 7d832ace3b
5 changed files with 70 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -385,15 +385,28 @@
android:padding="10dp"
android:visibility="gone">
<TextView
android:id="@+id/warning_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/red_border"
android:gravity="center"
android:text="@string/reply_might_be_useless"
android:textColor="@color/red_1"
android:visibility="gone"
app:layout_constraintTop_toTopOf="parent" />
<app.fedilab.android.helper.MastalabAutoCompleteTextView
android:id="@+id/quick_reply_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:gravity="top|start"
android:hint="@string/toot_placeholder"
android:inputType="textMultiLine|textCapSentences"
android:minLines="4"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toBottomOf="@id/warning_message"
app:layout_goneMarginTop="0dp" />
<ImageView
android:id="@+id/quick_reply_switch_to_full"

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

@ -1076,15 +1076,28 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/status_action_container">
<TextView
android:id="@+id/warning_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/red_border"
android:gravity="center"
android:text="@string/reply_might_be_useless"
android:textColor="@color/red_1"
android:visibility="gone"
app:layout_constraintTop_toTopOf="parent" />
<app.fedilab.android.helper.MastalabAutoCompleteTextView
android:id="@+id/quick_reply_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:gravity="top|start"
android:hint="@string/toot_placeholder"
android:inputType="textMultiLine|textCapSentences"
android:minLines="4"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toBottomOf="@id/warning_message"
app:layout_goneMarginTop="0dp" />
<ImageView
android:id="@+id/quick_reply_switch_to_full"

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

@ -844,15 +844,28 @@
android:padding="10dp"
android:visibility="gone">
<TextView
android:id="@+id/warning_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/red_border"
android:gravity="center"
android:text="@string/reply_might_be_useless"
android:textColor="@color/red_1"
android:visibility="gone"
app:layout_constraintTop_toTopOf="parent" />
<app.fedilab.android.helper.MastalabAutoCompleteTextView
android:id="@+id/quick_reply_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:gravity="top|start"
android:hint="@string/toot_placeholder"
android:inputType="textMultiLine|textCapSentences"
android:minLines="4"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toBottomOf="@id/warning_message"
app:layout_goneMarginTop="0dp" />
<ImageView
android:id="@+id/quick_reply_switch_to_full"

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

@ -834,15 +834,28 @@
android:padding="10dp"
android:visibility="gone">
<TextView
android:id="@+id/warning_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/red_border"
android:gravity="center"
android:text="@string/reply_might_be_useless"
android:textColor="@color/red_1"
android:visibility="gone"
app:layout_constraintTop_toTopOf="parent" />
<app.fedilab.android.helper.MastalabAutoCompleteTextView
android:id="@+id/quick_reply_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:gravity="top|start"
android:hint="@string/toot_placeholder"
android:inputType="textMultiLine|textCapSentences"
android:minLines="4"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toBottomOf="@id/warning_message"
app:layout_goneMarginTop="0dp" />
<ImageView
android:id="@+id/quick_reply_switch_to_full"

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

@ -765,15 +765,28 @@
android:padding="10dp"
android:visibility="gone">
<TextView
android:id="@+id/warning_message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/red_border"
android:gravity="center"
android:text="@string/reply_might_be_useless"
android:textColor="@color/red_1"
android:visibility="gone"
app:layout_constraintTop_toTopOf="parent" />
<app.fedilab.android.helper.MastalabAutoCompleteTextView
android:id="@+id/quick_reply_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:gravity="top|start"
android:hint="@string/toot_placeholder"
android:inputType="textMultiLine|textCapSentences"
android:minLines="4"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toBottomOf="@id/warning_message"
app:layout_goneMarginTop="0dp" />
<ImageView
android:id="@+id/quick_reply_switch_to_full"