From 79c585144d0967a2e5d4b1cfb6c486332d0b0cfb Mon Sep 17 00:00:00 2001 From: steckbrief Date: Wed, 12 Aug 2015 23:01:37 +0200 Subject: - Introduction of SwipeRefreshLayout for conversation view - OnScrollListener for ListView of messages removed and replaced with swipe refresh - Loading of messages now possible even if no message is present in conversation --- src/main/res/layout/fragment_conversation.xml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/main/res') diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml index 3fd80aa2..321055e9 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" > + + Date: Sun, 16 Aug 2015 17:30:06 +0200 Subject: Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon module --- src/main/res/drawable/emo_im_angel.png | Bin 3592 -> 0 bytes src/main/res/drawable/emo_im_cool.png | Bin 3466 -> 0 bytes src/main/res/drawable/emo_im_crying.png | Bin 3558 -> 0 bytes src/main/res/drawable/emo_im_embarrassed.png | Bin 3619 -> 0 bytes src/main/res/drawable/emo_im_foot_in_mouth.png | Bin 3603 -> 0 bytes src/main/res/drawable/emo_im_happy.png | Bin 3591 -> 0 bytes src/main/res/drawable/emo_im_heart.png | Bin 684 -> 0 bytes src/main/res/drawable/emo_im_kissing.png | Bin 3492 -> 0 bytes src/main/res/drawable/emo_im_laughing.png | Bin 3624 -> 0 bytes src/main/res/drawable/emo_im_lips_are_sealed.png | Bin 3670 -> 0 bytes src/main/res/drawable/emo_im_money_mouth.png | Bin 3649 -> 0 bytes src/main/res/drawable/emo_im_sad.png | Bin 3572 -> 0 bytes src/main/res/drawable/emo_im_surprised.png | Bin 3490 -> 0 bytes src/main/res/drawable/emo_im_tongue_sticking_out.png | Bin 3653 -> 0 bytes src/main/res/drawable/emo_im_undecided.png | Bin 3552 -> 0 bytes src/main/res/drawable/emo_im_winking.png | Bin 3568 -> 0 bytes src/main/res/drawable/emo_im_wtf.png | Bin 3591 -> 0 bytes src/main/res/drawable/emo_im_yelling.png | Bin 3575 -> 0 bytes 18 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/res/drawable/emo_im_angel.png delete mode 100644 src/main/res/drawable/emo_im_cool.png delete mode 100644 src/main/res/drawable/emo_im_crying.png delete mode 100644 src/main/res/drawable/emo_im_embarrassed.png delete mode 100644 src/main/res/drawable/emo_im_foot_in_mouth.png delete mode 100644 src/main/res/drawable/emo_im_happy.png delete mode 100644 src/main/res/drawable/emo_im_heart.png delete mode 100644 src/main/res/drawable/emo_im_kissing.png delete mode 100644 src/main/res/drawable/emo_im_laughing.png delete mode 100644 src/main/res/drawable/emo_im_lips_are_sealed.png delete mode 100644 src/main/res/drawable/emo_im_money_mouth.png delete mode 100644 src/main/res/drawable/emo_im_sad.png delete mode 100644 src/main/res/drawable/emo_im_surprised.png delete mode 100644 src/main/res/drawable/emo_im_tongue_sticking_out.png delete mode 100644 src/main/res/drawable/emo_im_undecided.png delete mode 100644 src/main/res/drawable/emo_im_winking.png delete mode 100644 src/main/res/drawable/emo_im_wtf.png delete mode 100644 src/main/res/drawable/emo_im_yelling.png (limited to 'src/main/res') 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 Binary files a/src/main/res/drawable/emo_im_angel.png and /dev/null 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 Binary files a/src/main/res/drawable/emo_im_cool.png and /dev/null 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 Binary files a/src/main/res/drawable/emo_im_crying.png and /dev/null 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 Binary files a/src/main/res/drawable/emo_im_embarrassed.png and /dev/null 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 Binary files a/src/main/res/drawable/emo_im_foot_in_mouth.png and /dev/null 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 Binary files a/src/main/res/drawable/emo_im_happy.png and /dev/null 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 Binary files a/src/main/res/drawable/emo_im_heart.png and /dev/null 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 Binary files a/src/main/res/drawable/emo_im_kissing.png and /dev/null 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 Binary files a/src/main/res/drawable/emo_im_laughing.png and /dev/null 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 Binary files a/src/main/res/drawable/emo_im_lips_are_sealed.png and /dev/null 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 Binary files a/src/main/res/drawable/emo_im_money_mouth.png and /dev/null 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 Binary files a/src/main/res/drawable/emo_im_sad.png and /dev/null 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 Binary files a/src/main/res/drawable/emo_im_surprised.png and /dev/null 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 Binary files a/src/main/res/drawable/emo_im_tongue_sticking_out.png and /dev/null 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 Binary files a/src/main/res/drawable/emo_im_undecided.png and /dev/null 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 Binary files a/src/main/res/drawable/emo_im_winking.png and /dev/null 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 Binary files a/src/main/res/drawable/emo_im_wtf.png and /dev/null 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 Binary files a/src/main/res/drawable/emo_im_yelling.png and /dev/null differ -- cgit v1.2.3