From 3b61f13abd5ed00593baf124452c9de116bcca1e Mon Sep 17 00:00:00 2001 From: InfinityDeltaX Date: Thu, 21 Apr 2016 19:47:57 -0400 Subject: [PATCH 1/4] Refactored MessageListAdapter.bindGrouping() --- .../ui/messagelist/MessageListAdapter.java | 38 ++++++++++++++----- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java index eaa8cf03..63c0e295 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java @@ -21,6 +21,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.RelativeLayout; + import com.android.mms.transaction.Transaction; import com.android.mms.transaction.TransactionBundle; import com.android.mms.transaction.TransactionService; @@ -44,13 +45,14 @@ import com.moez.QKSMS.ui.base.RecyclerCursorAdapter; import com.moez.QKSMS.ui.mms.MmsThumbnailPresenter; import com.moez.QKSMS.ui.settings.SettingsFragment; import com.moez.QKSMS.ui.view.AvatarView; -import ezvcard.Ezvcard; -import ezvcard.VCard; import java.util.ArrayList; import java.util.regex.Matcher; import java.util.regex.Pattern; +import ezvcard.Ezvcard; +import ezvcard.VCard; + public class MessageListAdapter extends RecyclerCursorAdapter { private final String TAG = "MessageListAdapter"; @@ -273,12 +275,8 @@ public class MessageListAdapter extends RecyclerCursorAdapter { if (messageItem.isMe()) { From dfb849d60209208800fd6f525449882fd9ff4bb0 Mon Sep 17 00:00:00 2001 From: InfinityDeltaX Date: Thu, 21 Apr 2016 20:20:51 -0400 Subject: [PATCH 2/4] Cleaned up more code in MessageListAdapter --- .../ui/messagelist/MessageListAdapter.java | 71 +++++++++---------- 1 file changed, 34 insertions(+), 37 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java index 63c0e295..c844dfe4 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java @@ -275,59 +275,56 @@ public class MessageListAdapter extends RecyclerCursorAdapter= MAX_DURATION; - - - if (messageItem.mAddress != null && messageItem2.mAddress != null && - !messageItem.mAddress.equals(messageItem2.mAddress) && - !messageItem.isOutgoingMessage() && !messageItem2.isOutgoingMessage()) { - showTimestamp = true; - } + return (messageItem2.mDate - messageItem.mDate >= MAX_DURATION); } - return showTimestamp; } - private boolean shouldShowAvatar(MessageItem messageItem, int position){ - boolean showAvatar; - + private boolean shouldShowAvatar(MessageItem messageItem, int position) { if (position == 0) { - showAvatar = true; - } else { - int MAX_DURATION = 60 * 60 * 1000; - MessageItem messageItem2 = getItem(position - 1); - showAvatar = messageItem.getBoxId() != messageItem2.getBoxId() || messageItem.mDate - messageItem2.mDate >= MAX_DURATION; + return true; + } + MessageItem messageItem2 = getItem(position - 1); + + if (messagesFromDifferentPeople(messageItem, messageItem2)) { // If the messages are from different people, then we don't care about any of the other checks, // we need to show the avatar/timestamp. This is used for group chats, which is why we want // both to be incoming messages - if (messageItem.mAddress != null && messageItem2.mAddress != null && - !messageItem.mAddress.equals(messageItem2.mAddress) && - !messageItem.isOutgoingMessage() && !messageItem2.isOutgoingMessage()) { - showAvatar = true; - } + return true; + } else { + int MAX_DURATION = 60 * 60 * 1000; + return (messageItem.getBoxId() != messageItem2.getBoxId() || messageItem.mDate - messageItem2.mDate >= MAX_DURATION); } - - return showAvatar; } - private int getBubbleBackgroundResource(boolean showAvatar, boolean isMine){ - if(showAvatar && isMine) return ThemeManager.getSentBubbleRes(); - else if(showAvatar && !isMine) return ThemeManager.getReceivedBubbleRes(); - else if(!showAvatar && isMine) return ThemeManager.getSentBubbleAltRes(); - else if(!showAvatar && !isMine) return ThemeManager.getReceivedBubbleAltRes(); + private boolean messagesFromDifferentPeople(MessageItem a, MessageItem b) { + return (a.mAddress != null && b.mAddress != null && + !a.mAddress.equals(b.mAddress) && + !a.isOutgoingMessage() && !b.isOutgoingMessage()); + } + + private int getBubbleBackgroundResource(boolean showAvatar, boolean isMine) { + if (showAvatar && isMine) return ThemeManager.getSentBubbleRes(); + else if (showAvatar && !isMine) return ThemeManager.getReceivedBubbleRes(); + else if (!showAvatar && isMine) return ThemeManager.getSentBubbleAltRes(); + else if (!showAvatar && !isMine) return ThemeManager.getReceivedBubbleAltRes(); else return -1; } From 3ae6840cb63474d17cbedebcd7dfbc81de15e31f Mon Sep 17 00:00:00 2001 From: InfinityDeltaX Date: Thu, 21 Apr 2016 21:04:00 -0400 Subject: [PATCH 3/4] Added preferences for controlling the delay for a new timestamp and force-enabling timestamps for all messages. --- .../QKSMS/ui/messagelist/MessageListAdapter.java | 10 +++++++--- .../moez/QKSMS/ui/settings/SettingsFragment.java | 2 ++ QKSMS/src/main/res/values/strings.xml | 4 ++++ QKSMS/src/main/res/xml/settings_general.xml | 16 ++++++++++++++++ 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java index c844dfe4..cff56028 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java @@ -282,7 +282,9 @@ public class MessageListAdapter extends RecyclerCursorAdapter= MAX_DURATION); } } @@ -317,7 +319,9 @@ public class MessageListAdapter extends RecyclerCursorAdapterSent timestamps Show the timestamp for when a message was sent, not received + Force timestamps + Enable timestamps for all messages + New timestamp delay + The number of minutes which must elapse between two messages in order for a new timestamp to be shown. Starred contacts Show your starred contacts in the QK Compose window, making them only a tap away Proximity sensor diff --git a/QKSMS/src/main/res/xml/settings_general.xml b/QKSMS/src/main/res/xml/settings_general.xml index 31e8204a..c968353f 100644 --- a/QKSMS/src/main/res/xml/settings_general.xml +++ b/QKSMS/src/main/res/xml/settings_general.xml @@ -137,6 +137,22 @@ android:summary="@string/pref_sent_timestamps_summary" android:title="@string/pref_sent_timestamps" android:widgetLayout="@layout/view_switch" /> + + Date: Thu, 28 Apr 2016 21:08:32 -0400 Subject: [PATCH 4/4] Changed the default timestamp delay from 60 minutes to 5. --- .../java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java index cff56028..f5b800d5 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java @@ -293,7 +293,7 @@ public class MessageListAdapter extends RecyclerCursorAdapter= MAX_DURATION); } }