Change summary
src/main/res/layout/activity_channel_discovery.xml | 7 ++-
src/main/res/layout/fragment_conversation.xml | 30 ++++++---------
2 files changed, 17 insertions(+), 20 deletions(-)
Detailed changes
@@ -13,26 +13,27 @@
android:id="@+id/toolbar"
layout="@layout/toolbar" />
-
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:layout_anchor="@+id/list"
- android:layout_gravity="center_horizontal"/>
+ android:layout_gravity="center_horizontal"
+ app:layout_anchor="@+id/list" />
<android.support.design.widget.CoordinatorLayout
android:id="@+id/coordinator"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/color_background_primary">
+
<android.support.v7.widget.RecyclerView
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/color_background_primary"
android:orientation="vertical"
+ android:scrollbars="vertical"
android:visibility="gone"
app:layoutManager="android.support.v7.widget.LinearLayoutManager" />
</android.support.design.widget.CoordinatorLayout>
@@ -61,23 +61,6 @@
android:layout_alignParentBottom="true"
android:background="?attr/color_background_primary">
- <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:orientation="horizontal"
- android:paddingTop="8dp"
- android:requiresFadingEdge="horizontal"
- android:visibility="gone"
- app:layoutManager="android.support.v7.widget.LinearLayoutManager"
- tools:listitem="@layout/media_preview">
-
- </android.support.v7.widget.RecyclerView>
-
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -98,6 +81,19 @@
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:orientation="horizontal"
+ android:paddingTop="8dp"
+ android:requiresFadingEdge="horizontal"
+ android:visibility="gone"
+ app:layoutManager="android.support.v7.widget.LinearLayoutManager"
+ tools:listitem="@layout/media_preview">
+
+ </android.support.v7.widget.RecyclerView>
+
<eu.siacs.conversations.ui.widget.EditMessage
android:id="@+id/textinput"
style="@style/Widget.Conversations.EditText"