aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2015-12-04 23:19:33 +0100
committersteckbrief <steckbrief@chefmail.de>2015-12-04 23:19:33 +0100
commit734511b0fa15fa6ceb88c6b0ab4791139f7ffc8d (patch)
treeae49823ebe987a260a7432292700a5918b26953e /src/main/res
parent9265d6718e83e2d8d29809cbec4f8fb1f3a29960 (diff)
parent0086d5dc80dd95b1e8e4dcfe2d3d3090d260bb88 (diff)
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/layout/fragment_conversation.xml10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index 4776f3b8..a17cba72 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -1,17 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/grey200" >
+ android:background="@color/grey200">
- <android.support.v4.widget.SwipeRefreshLayout
+ <com.orangegangsters.github.swipyrefreshlayout.library.SwipyRefreshLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/snackbar"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
- android:id="@+id/swipe_refresh_container">
+ android:id="@+id/swipe_refresh_container"
+ app:direction="both">
<ListView
android:id="@+id/messages_view"
android:layout_width="fill_parent"
@@ -27,7 +29,7 @@
android:transcriptMode="normal"
tools:listitem="@layout/message_sent" >
</ListView>
- </android.support.v4.widget.SwipeRefreshLayout>
+ </com.orangegangsters.github.swipyrefreshlayout.library.SwipyRefreshLayout>
<RelativeLayout
android:id="@+id/textsend"