diff options
Diffstat (limited to 'src/main/res')
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 Binary files differdeleted file mode 100644 index c34dfa69..00000000 --- a/src/main/res/drawable/emo_im_angel.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_cool.png b/src/main/res/drawable/emo_im_cool.png Binary files differdeleted file mode 100644 index d8eeb34e..00000000 --- a/src/main/res/drawable/emo_im_cool.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_crying.png b/src/main/res/drawable/emo_im_crying.png Binary files differdeleted file mode 100644 index 1cafdb32..00000000 --- a/src/main/res/drawable/emo_im_crying.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_embarrassed.png b/src/main/res/drawable/emo_im_embarrassed.png Binary files differdeleted file mode 100644 index e4db9634..00000000 --- a/src/main/res/drawable/emo_im_embarrassed.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_foot_in_mouth.png b/src/main/res/drawable/emo_im_foot_in_mouth.png Binary files differdeleted file mode 100644 index 09d1fba6..00000000 --- a/src/main/res/drawable/emo_im_foot_in_mouth.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_happy.png b/src/main/res/drawable/emo_im_happy.png Binary files differdeleted file mode 100644 index b86602ae..00000000 --- a/src/main/res/drawable/emo_im_happy.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_heart.png b/src/main/res/drawable/emo_im_heart.png Binary files differdeleted file mode 100644 index d88bcccd..00000000 --- a/src/main/res/drawable/emo_im_heart.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_kissing.png b/src/main/res/drawable/emo_im_kissing.png Binary files differdeleted file mode 100644 index 56378f6a..00000000 --- a/src/main/res/drawable/emo_im_kissing.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_laughing.png b/src/main/res/drawable/emo_im_laughing.png Binary files differdeleted file mode 100644 index 980bf281..00000000 --- a/src/main/res/drawable/emo_im_laughing.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_lips_are_sealed.png b/src/main/res/drawable/emo_im_lips_are_sealed.png Binary files differdeleted file mode 100644 index f2de993b..00000000 --- a/src/main/res/drawable/emo_im_lips_are_sealed.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_money_mouth.png b/src/main/res/drawable/emo_im_money_mouth.png Binary files differdeleted file mode 100644 index 08c53fd6..00000000 --- a/src/main/res/drawable/emo_im_money_mouth.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_sad.png b/src/main/res/drawable/emo_im_sad.png Binary files differdeleted file mode 100644 index 31c08d06..00000000 --- a/src/main/res/drawable/emo_im_sad.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_surprised.png b/src/main/res/drawable/emo_im_surprised.png Binary files differdeleted file mode 100644 index abe8c7ad..00000000 --- a/src/main/res/drawable/emo_im_surprised.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_tongue_sticking_out.png b/src/main/res/drawable/emo_im_tongue_sticking_out.png Binary files differdeleted file mode 100644 index 6f0f47b0..00000000 --- a/src/main/res/drawable/emo_im_tongue_sticking_out.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_undecided.png b/src/main/res/drawable/emo_im_undecided.png Binary files differdeleted file mode 100644 index eb4f8c5b..00000000 --- a/src/main/res/drawable/emo_im_undecided.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_winking.png b/src/main/res/drawable/emo_im_winking.png Binary files differdeleted file mode 100644 index 568562ad..00000000 --- a/src/main/res/drawable/emo_im_winking.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_wtf.png b/src/main/res/drawable/emo_im_wtf.png Binary files differdeleted file mode 100644 index 41dd47fc..00000000 --- a/src/main/res/drawable/emo_im_wtf.png +++ /dev/null diff --git a/src/main/res/drawable/emo_im_yelling.png b/src/main/res/drawable/emo_im_yelling.png Binary files differdeleted file mode 100644 index c3c8612b..00000000 --- a/src/main/res/drawable/emo_im_yelling.png +++ /dev/null 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" |
