diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/res/layout/activity_channel_discovery.xml | 1 | ||||
| -rw-r--r-- | src/main/res/layout/fragment_conversation.xml | 28 |
2 files changed, 13 insertions, 16 deletions
diff --git a/src/main/res/layout/activity_channel_discovery.xml b/src/main/res/layout/activity_channel_discovery.xml index ee253f3dd..5dd0f4be3 100644 --- a/src/main/res/layout/activity_channel_discovery.xml +++ b/src/main/res/layout/activity_channel_discovery.xml @@ -32,6 +32,7 @@ android:layout_height="match_parent" android:background="?attr/color_background_secondary" android:orientation="vertical" + android:scrollbars="vertical" android:visibility="gone" app:layoutManager="android.support.v7.widget.LinearLayoutManager" /> </android.support.design.widget.CoordinatorLayout> diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml index 5603ca974..de16ae5c4 100644 --- a/src/main/res/layout/fragment_conversation.xml +++ b/src/main/res/layout/fragment_conversation.xml @@ -86,22 +86,6 @@ android:src="@drawable/ic_send_voice_offline" android:visibility="gone" /> - <android.support.v7.widget.RecyclerView - android:id="@+id/media_preview" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentStart="true" - android:layout_alignParentLeft="true" - android:layout_toStartOf="@+id/textSendButton" - android:layout_toLeftOf="@+id/textSendButton" - android:background="@drawable/message_bubble_sent" - android:orientation="horizontal" - android:paddingTop="8dp" - android:requiresFadingEdge="horizontal" - android:visibility="gone" - app:layoutManager="android.support.v7.widget.LinearLayoutManager" - tools:listitem="@layout/media_preview" /> - <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -124,6 +108,18 @@ android:textAppearance="@style/TextAppearance.Conversations.Caption.Highlight" android:visibility="gone" /> + <android.support.v7.widget.RecyclerView + android:id="@+id/media_preview" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@drawable/message_bubble_sent" + android:orientation="horizontal" + android:paddingTop="8dp" + android:requiresFadingEdge="horizontal" + android:visibility="gone" + app:layoutManager="android.support.v7.widget.LinearLayoutManager" + tools:listitem="@layout/media_preview" /> + <de.pixart.messenger.ui.widget.EditMessage android:id="@+id/textinput" style="@style/Widget.Conversations.EditText" |