aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2015-08-16 18:45:08 +0200
committerlookshe <github@lookshe.org>2015-08-16 18:45:08 +0200
commit89b28a496542b1995f60efb6b8937d11adf8e425 (patch)
tree2039e26dd5d3fdd8ce3ce277ff1bff8324f32f6e /src/main/res
parenta76de90fe7a53220e9358d38fa7b47b63f7694fe (diff)
parent0321ebb7a6785b4673376f9e6458e41dd96b2230 (diff)
Merge branch 'trz/rebase' into trz/rename
Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/drawable/emo_im_angel.pngbin3592 -> 0 bytes
-rw-r--r--src/main/res/drawable/emo_im_cool.pngbin3466 -> 0 bytes
-rw-r--r--src/main/res/drawable/emo_im_crying.pngbin3558 -> 0 bytes
-rw-r--r--src/main/res/drawable/emo_im_embarrassed.pngbin3619 -> 0 bytes
-rw-r--r--src/main/res/drawable/emo_im_foot_in_mouth.pngbin3603 -> 0 bytes
-rw-r--r--src/main/res/drawable/emo_im_happy.pngbin3591 -> 0 bytes
-rw-r--r--src/main/res/drawable/emo_im_heart.pngbin684 -> 0 bytes
-rw-r--r--src/main/res/drawable/emo_im_kissing.pngbin3492 -> 0 bytes
-rw-r--r--src/main/res/drawable/emo_im_laughing.pngbin3624 -> 0 bytes
-rw-r--r--src/main/res/drawable/emo_im_lips_are_sealed.pngbin3670 -> 0 bytes
-rw-r--r--src/main/res/drawable/emo_im_money_mouth.pngbin3649 -> 0 bytes
-rw-r--r--src/main/res/drawable/emo_im_sad.pngbin3572 -> 0 bytes
-rw-r--r--src/main/res/drawable/emo_im_surprised.pngbin3490 -> 0 bytes
-rw-r--r--src/main/res/drawable/emo_im_tongue_sticking_out.pngbin3653 -> 0 bytes
-rw-r--r--src/main/res/drawable/emo_im_undecided.pngbin3552 -> 0 bytes
-rw-r--r--src/main/res/drawable/emo_im_winking.pngbin3568 -> 0 bytes
-rw-r--r--src/main/res/drawable/emo_im_wtf.pngbin3591 -> 0 bytes
-rw-r--r--src/main/res/drawable/emo_im_yelling.pngbin3575 -> 0 bytes
-rw-r--r--src/main/res/layout/fragment_conversation.xml8
19 files changed, 8 insertions, 0 deletions
diff --git a/src/main/res/drawable/emo_im_angel.png b/src/main/res/drawable/emo_im_angel.png
deleted file mode 100644
index c34dfa69..00000000
--- a/src/main/res/drawable/emo_im_angel.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable/emo_im_cool.png b/src/main/res/drawable/emo_im_cool.png
deleted file mode 100644
index d8eeb34e..00000000
--- a/src/main/res/drawable/emo_im_cool.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable/emo_im_crying.png b/src/main/res/drawable/emo_im_crying.png
deleted file mode 100644
index 1cafdb32..00000000
--- a/src/main/res/drawable/emo_im_crying.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable/emo_im_embarrassed.png b/src/main/res/drawable/emo_im_embarrassed.png
deleted file mode 100644
index e4db9634..00000000
--- a/src/main/res/drawable/emo_im_embarrassed.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable/emo_im_foot_in_mouth.png b/src/main/res/drawable/emo_im_foot_in_mouth.png
deleted file mode 100644
index 09d1fba6..00000000
--- a/src/main/res/drawable/emo_im_foot_in_mouth.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable/emo_im_happy.png b/src/main/res/drawable/emo_im_happy.png
deleted file mode 100644
index b86602ae..00000000
--- a/src/main/res/drawable/emo_im_happy.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable/emo_im_heart.png b/src/main/res/drawable/emo_im_heart.png
deleted file mode 100644
index d88bcccd..00000000
--- a/src/main/res/drawable/emo_im_heart.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable/emo_im_kissing.png b/src/main/res/drawable/emo_im_kissing.png
deleted file mode 100644
index 56378f6a..00000000
--- a/src/main/res/drawable/emo_im_kissing.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable/emo_im_laughing.png b/src/main/res/drawable/emo_im_laughing.png
deleted file mode 100644
index 980bf281..00000000
--- a/src/main/res/drawable/emo_im_laughing.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable/emo_im_lips_are_sealed.png b/src/main/res/drawable/emo_im_lips_are_sealed.png
deleted file mode 100644
index f2de993b..00000000
--- a/src/main/res/drawable/emo_im_lips_are_sealed.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable/emo_im_money_mouth.png b/src/main/res/drawable/emo_im_money_mouth.png
deleted file mode 100644
index 08c53fd6..00000000
--- a/src/main/res/drawable/emo_im_money_mouth.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable/emo_im_sad.png b/src/main/res/drawable/emo_im_sad.png
deleted file mode 100644
index 31c08d06..00000000
--- a/src/main/res/drawable/emo_im_sad.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable/emo_im_surprised.png b/src/main/res/drawable/emo_im_surprised.png
deleted file mode 100644
index abe8c7ad..00000000
--- a/src/main/res/drawable/emo_im_surprised.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable/emo_im_tongue_sticking_out.png b/src/main/res/drawable/emo_im_tongue_sticking_out.png
deleted file mode 100644
index 6f0f47b0..00000000
--- a/src/main/res/drawable/emo_im_tongue_sticking_out.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable/emo_im_undecided.png b/src/main/res/drawable/emo_im_undecided.png
deleted file mode 100644
index eb4f8c5b..00000000
--- a/src/main/res/drawable/emo_im_undecided.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable/emo_im_winking.png b/src/main/res/drawable/emo_im_winking.png
deleted file mode 100644
index 568562ad..00000000
--- a/src/main/res/drawable/emo_im_winking.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable/emo_im_wtf.png b/src/main/res/drawable/emo_im_wtf.png
deleted file mode 100644
index 41dd47fc..00000000
--- a/src/main/res/drawable/emo_im_wtf.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable/emo_im_yelling.png b/src/main/res/drawable/emo_im_yelling.png
deleted file mode 100644
index c3c8612b..00000000
--- a/src/main/res/drawable/emo_im_yelling.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index bb706e5b..0a69f508 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -5,6 +5,13 @@
android:layout_height="match_parent"
android:background="@color/grey200" >
+ <android.support.v4.widget.SwipeRefreshLayout
+ 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">
<ListView
android:id="@+id/messages_view"
android:layout_width="fill_parent"
@@ -20,6 +27,7 @@
android:transcriptMode="normal"
tools:listitem="@layout/message_sent" >
</ListView>
+ </android.support.v4.widget.SwipeRefreshLayout>
<RelativeLayout
android:id="@+id/textsend"